commit ced58d038c012c2bd2ff6cfe3c378522fd16225b parent ba84eaaeccba8035fe3175b625a35797611b8b84 Author: Dan Baker <dbaker@mozilla.com> Date: Fri, 24 Oct 2025 12:23:07 -0600 Bug 1995393 - Vendor libwebrtc from 21dcf62eda Upstream commit: https://webrtc.googlesource.com/src/+/21dcf62edaefdc909a12c47725a7317a20fc7b21 Use injected clock in video_receive_stream2 Stops using the global clock methods from time_utils. This CL was uploaded by an experimental version of git cl split (https://crbug.com/389069356). R=danilchap@webrtc.org, hta@webrtc.org Bug: webrtc:42223992 Change-Id: Ibbec39b2a5e37cd1bb3383be05a076c002e381d7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/404944 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Evan Shrubsole <eshr@webrtc.org> Auto-Submit: Evan Shrubsole <eshr@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45388} Diffstat:
5 files changed, 9 insertions(+), 10 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-24T17:40:16.519528+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-24T18:22:57.305862+00:00. # base of lastest vendoring -c5360ff72e +21dcf62eda diff --git a/third_party/libwebrtc/moz-patch-stack/s0037.patch b/third_party/libwebrtc/moz-patch-stack/s0037.patch @@ -53,10 +53,10 @@ index 18ee7ffa46..7e358c3c13 100644 // Implements RtpVideoFrameReceiver. void ManageFrame(std::unique_ptr<RtpFrameObject> frame) override; diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc -index 4dff35605c..45ae484b40 100644 +index eccec79bb3..ce63bc1fc8 100644 --- a/video/video_receive_stream2.cc +++ b/video/video_receive_stream2.cc -@@ -627,6 +627,14 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const { +@@ -626,6 +626,14 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const { stats.sender_reports_bytes_sent = rtcp_sr_stats->bytes_sent; stats.sender_reports_reports_count = rtcp_sr_stats->reports_count; } diff --git a/third_party/libwebrtc/moz-patch-stack/s0042.patch b/third_party/libwebrtc/moz-patch-stack/s0042.patch @@ -153,10 +153,10 @@ index 7e358c3c13..05498bd640 100644 private: // Implements RtpVideoFrameReceiver. diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc -index 45ae484b40..92c45e1dda 100644 +index ce63bc1fc8..78f5a62bbb 100644 --- a/video/video_receive_stream2.cc +++ b/video/video_receive_stream2.cc -@@ -633,7 +633,8 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const { +@@ -632,7 +632,8 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const { // seem to be any support for these stats right now. So, we hack this in. rtp_video_stream_receiver_.RemoteRTCPSenderInfo( &stats.rtcp_sender_packets_sent, &stats.rtcp_sender_octets_sent, diff --git a/third_party/libwebrtc/moz-patch-stack/s0057.patch b/third_party/libwebrtc/moz-patch-stack/s0057.patch @@ -272,10 +272,10 @@ index 05498bd640..e35711dc8b 100644 RTC_GUARDED_BY(packet_sequence_checker_); // h26x_packet_buffer_ is applicable to H.264 and H.265. For H.265 it is diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc -index 92c45e1dda..d7310d4d73 100644 +index 78f5a62bbb..ad2ecf5da9 100644 --- a/video/video_receive_stream2.cc +++ b/video/video_receive_stream2.cc -@@ -257,6 +257,7 @@ VideoReceiveStream2::VideoReceiveStream2( +@@ -256,6 +256,7 @@ VideoReceiveStream2::VideoReceiveStream2( &stats_proxy_, &stats_proxy_, nack_periodic_processor, diff --git a/third_party/libwebrtc/video/video_receive_stream2.cc b/third_party/libwebrtc/video/video_receive_stream2.cc @@ -81,7 +81,6 @@ #include "rtc_base/strings/string_builder.h" #include "rtc_base/synchronization/mutex.h" #include "rtc_base/system/file_wrapper.h" -#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/ntp_time.h" @@ -588,7 +587,7 @@ void VideoReceiveStream2::CreateAndRegisterExternalDecoder( char filename_buffer[256]; SimpleStringBuilder ssb(filename_buffer); ssb << decoded_output_file << "/webrtc_receive_stream_" << remote_ssrc() - << "-" << TimeMicros() << ".ivf"; + << "-" << env_.clock().TimeInMicroseconds() << ".ivf"; video_decoder = CreateFrameDumpingDecoderWrapper( std::move(video_decoder), FileWrapper::OpenWriteOnly(ssb.str())); }