Nico Grunbaum
3b3a29acfa
Upstream commit: https://webrtc.googlesource.com/src/+/7e3a9ce99d832687d1eef3eaa270754970a761b0 Rely on TaskQueueBase interface in modules/rtp_rtcp Instead of requiring Thread to be passed to the RtpVideoStreamReceiverFrameTransformerDelegate. This class already uses it only though the TaskQueueBase interface. In tests rely on RunLoop helper when test makes calls that are required to be done on the same task queue, and rely on TaskQueueForTests where test does not make such calls. Bug: webrtc:42225410 Change-Id: I7aba5c696436d8ce43c85ccba5b9448e852ea81d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/470880 Auto-Submit: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Erik Språng <sprang@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47662}
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 46878860e2..811110323e 100644
|
|
--- a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
|
|
+++ b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
|
|
@@ -1354,7 +1354,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.
|