commit 246c25e017d9723b8290d624e914b583410931f7 parent cda8f7cb97f871fe7b72bebafa7422346d1a18e8 Author: Dan Baker <dbaker@mozilla.com> Date: Fri, 24 Oct 2025 14:25:24 -0600 Bug 1995393 - Vendor libwebrtc from 54aeeeb6f8 Upstream commit: https://webrtc.googlesource.com/src/+/54aeeeb6f8ae5794b2667de65e75de56a5449eb3 Add environment accessor to call This will make it easier to propograte the clock where needed. R=danilchap@webrtc.org, hta@webrtc.org Bug: webrtc:42223992 Change-Id: I528d3e180aad884ebeca13768f41b17fa8e76c67 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/405520 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Evan Shrubsole <eshr@webrtc.org> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Auto-Submit: Evan Shrubsole <eshr@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45409} Diffstat:
5 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-24T20:23:06.773457+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-24T20:25:09.476036+00:00. # base of lastest vendoring -682769419f +54aeeeb6f8 diff --git a/third_party/libwebrtc/call/call.cc b/third_party/libwebrtc/call/call.cc @@ -283,6 +283,7 @@ class Call final : public webrtc::Call, int FeedbackAccordingToTransportCcCount() override; const FieldTrialsView& trials() const override; + const Environment& env() const override; TaskQueueBase* network_thread() const override; TaskQueueBase* worker_thread() const override; @@ -1175,6 +1176,10 @@ const FieldTrialsView& Call::trials() const { return env_.field_trials(); } +const Environment& Call::env() const { + return env_; +} + TaskQueueBase* Call::network_thread() const { return network_thread_; } diff --git a/third_party/libwebrtc/call/call.h b/third_party/libwebrtc/call/call.h @@ -16,6 +16,7 @@ #include "absl/strings/string_view.h" #include "api/adaptation/resource.h" +#include "api/environment/environment.h" #include "api/fec_controller.h" #include "api/field_trials_view.h" #include "api/media_types.h" @@ -150,7 +151,9 @@ class Call { virtual int FeedbackAccordingToRfc8888Count() = 0; virtual int FeedbackAccordingToTransportCcCount() = 0; + // TODO(bugs.webrtc.org/440271885): Use env() instead. virtual const FieldTrialsView& trials() const = 0; + virtual const Environment& env() const = 0; virtual TaskQueueBase* network_thread() const = 0; virtual TaskQueueBase* worker_thread() const = 0; diff --git a/third_party/libwebrtc/media/engine/fake_webrtc_call.h b/third_party/libwebrtc/media/engine/fake_webrtc_call.h @@ -433,6 +433,7 @@ class FakeCall final : public Call, public PacketReceiver { void SetClientBitratePreferences( const BitrateSettings& /* preferences */) override {} const FieldTrialsView& trials() const override { return env_.field_trials(); } + const Environment& env() const override { return env_; } void EnableSendCongestionControlFeedbackAccordingToRfc8888() override {} int FeedbackAccordingToRfc8888Count() { return 0; } int FeedbackAccordingToTransportCcCount() { return 0; } diff --git a/third_party/libwebrtc/moz-patch-stack/s0119.patch b/third_party/libwebrtc/moz-patch-stack/s0119.patch @@ -12,10 +12,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/19164e58323d59c1f 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/call/call.cc b/call/call.cc -index dc1e44995c..827991c4d1 100644 +index 9a78aa6fb1..8423297fac 100644 --- a/call/call.cc +++ b/call/call.cc -@@ -514,19 +514,6 @@ class Call final : public webrtc::Call, +@@ -515,19 +515,6 @@ class Call final : public webrtc::Call, }; } // namespace internal @@ -36,10 +36,10 @@ index dc1e44995c..827991c4d1 100644 std::unique_ptr<RtpTransportControllerSendInterface> transport_send; if (config.rtp_transport_controller_send_factory != nullptr) { diff --git a/call/call.h b/call/call.h -index 87e1884583..420a754edd 100644 +index 08e883da06..c3119cc18c 100644 --- a/call/call.h +++ b/call/call.h -@@ -25,6 +25,7 @@ +@@ -26,6 +26,7 @@ #include "api/transport/bitrate_settings.h" #include "call/audio_receive_stream.h" #include "call/audio_send_stream.h" @@ -47,7 +47,7 @@ index 87e1884583..420a754edd 100644 #include "call/call_config.h" #include "call/flexfec_receive_stream.h" #include "call/packet_receiver.h" -@@ -50,15 +51,7 @@ namespace webrtc { +@@ -51,15 +52,7 @@ namespace webrtc { class Call { public: