commit 9dd6998de89a48e2b2d6ca2a0a058300b8a6e160 parent e0e4055de4dc8e1af4577a771e812e18a3429336 Author: Dan Baker <dbaker@mozilla.com> Date: Mon, 1 Dec 2025 22:09:12 -0700 Bug 2000941 - Vendor libwebrtc from b1cb4509fc Upstream commit: https://webrtc.googlesource.com/src/+/b1cb4509fc744b22590e3c9692ff5042efc2cafb Use propagated clock in AudioReceiveStream Bug: webrtc:42223992 Change-Id: Ib093755b65fc1df11fdaf1ae8ff6aebec30c3206 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/410480 Auto-Submit: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org> Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45685} Diffstat:
6 files changed, 12 insertions(+), 9 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-12-02T05:06:36.728612+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T05:08:58.016839+00:00. # base of lastest vendoring -9d96efa663 +b1cb4509fc diff --git a/third_party/libwebrtc/audio/audio_receive_stream.cc b/third_party/libwebrtc/audio/audio_receive_stream.cc @@ -115,12 +115,13 @@ AudioReceiveStreamImpl::AudioReceiveStreamImpl( } AudioReceiveStreamImpl::AudioReceiveStreamImpl( - const Environment& /* env */, + const Environment& env, PacketRouter* packet_router, const AudioReceiveStreamInterface::Config& config, const scoped_refptr<AudioState>& audio_state, std::unique_ptr<voe::ChannelReceiveInterface> channel_receive) - : config_(config), + : env_(env), + config_(config), audio_state_(audio_state), channel_receive_(std::move(channel_receive)) { RTC_LOG(LS_INFO) << "AudioReceiveStreamImpl: " << config.rtp.remote_ssrc; @@ -313,7 +314,8 @@ AudioReceiveStreamInterface::Stats AudioReceiveStreamImpl::GetStats( stats.total_output_energy = channel_receive_->GetTotalOutputEnergy(); stats.total_output_duration = channel_receive_->GetTotalOutputDuration(); stats.estimated_playout_ntp_timestamp_ms = - channel_receive_->GetCurrentEstimatedPlayoutNtpTimestampMs(TimeMillis()); + channel_receive_->GetCurrentEstimatedPlayoutNtpTimestampMs( + env_.clock().TimeInMilliseconds()); // Get jitter buffer and total delay (alg + jitter + playout) stats. auto ns = channel_receive_->GetNetworkStatistics(get_and_clear_legacy_stats); diff --git a/third_party/libwebrtc/audio/audio_receive_stream.h b/third_party/libwebrtc/audio/audio_receive_stream.h @@ -163,6 +163,7 @@ class AudioReceiveStreamImpl final : public webrtc::AudioReceiveStreamInterface, private: internal::AudioState* audio_state() const; + const Environment env_; RTC_NO_UNIQUE_ADDRESS SequenceChecker worker_thread_checker_; // TODO(bugs.webrtc.org/11993): This checker conceptually represents // operations that belong to the network thread. The Call class is currently diff --git a/third_party/libwebrtc/moz-patch-stack/s0035.patch b/third_party/libwebrtc/moz-patch-stack/s0035.patch @@ -20,7 +20,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/d0b311007c033e838 11 files changed, 56 insertions(+), 11 deletions(-) diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc -index 3a4ae1702a..84ea0c996b 100644 +index be8adc0bf6..578a6f42c2 100644 --- a/audio/audio_receive_stream.cc +++ b/audio/audio_receive_stream.cc @@ -61,6 +61,8 @@ std::string AudioReceiveStreamInterface::Config::Rtp::ToString() const { diff --git a/third_party/libwebrtc/moz-patch-stack/s0039.patch b/third_party/libwebrtc/moz-patch-stack/s0039.patch @@ -16,10 +16,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/c186df8a088e46285 1 file changed, 1 deletion(-) diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc -index 84ea0c996b..e3601315cb 100644 +index 578a6f42c2..35ae6b3906 100644 --- a/audio/audio_receive_stream.cc +++ b/audio/audio_receive_stream.cc -@@ -389,7 +389,6 @@ int AudioReceiveStreamImpl::GetBaseMinimumPlayoutDelayMs() const { +@@ -391,7 +391,6 @@ int AudioReceiveStreamImpl::GetBaseMinimumPlayoutDelayMs() const { } std::vector<RtpSource> AudioReceiveStreamImpl::GetSources() const { diff --git a/third_party/libwebrtc/moz-patch-stack/s0125.patch b/third_party/libwebrtc/moz-patch-stack/s0125.patch @@ -15,7 +15,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/9c487a574d218cc1c 1 file changed, 12 insertions(+) diff --git a/audio/audio_receive_stream.h b/audio/audio_receive_stream.h -index 4b6c57b871..3f054776d2 100644 +index ef4d74f772..ff5c210dd8 100644 --- a/audio/audio_receive_stream.h +++ b/audio/audio_receive_stream.h @@ -34,7 +34,11 @@