e9dd8333f4
Upstream commit: https://webrtc.googlesource.com/src/+/75b82775e96ed7b462aa4cd1dcf2079cee2e59a0 Don't use SvcRateAllocator for in VP9 encoder in simulcast case Bug: webrtc:399577686 Change-Id: I76b0baf052b2fb2862cc7604634aa3d538401c24 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379402 Reviewed-by: Henrik Boström <hbos@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#44017} Differential Revision: https://phabricator.services.mozilla.com/D244028
24 lines
1.2 KiB
Diff
24 lines
1.2 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Tue, 15 Oct 2024 16:46:00 -0500
|
|
Subject: Bug 1924098 - (fix-e432503389) upstream changed signature of
|
|
LibvpxVp9Encoder::InitAndSetControlSettings
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/fadad7695efe0d9cc6b999a613b9e1f536e660bd
|
|
---
|
|
modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
|
|
index 3d185a48c2..9bf9b015f7 100644
|
|
--- a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
|
|
+++ b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
|
|
@@ -1291,7 +1291,7 @@ int LibvpxVp9Encoder::UpdateCodecFrameSize(
|
|
// bugs in trying to do it the "right" way, we basically re-do
|
|
// the initialization.
|
|
vpx_codec_destroy(encoder_); // clean up old state
|
|
- int result = InitAndSetControlSettings(&codec_);
|
|
+ int result = InitAndSetControlSettings();
|
|
if (result == WEBRTC_VIDEO_CODEC_OK) {
|
|
// TODO: Mozilla rates have become much more complicated, we need to store
|
|
// more state or find another way of doing this.
|