commit c55246fb5b540bd6875da1c8460665bc2861e2c3
parent eec0e8c1f825ca0d669fa0e031ffd4911d324b7a
Author: Dan Baker <dbaker@mozilla.com>
Date: Mon, 27 Oct 2025 12:46:13 -0600
Bug 1995393 - Vendor libwebrtc from 61fc8743a9
Upstream commit: https://webrtc.googlesource.com/src/+/61fc8743a95da1f4097ff2a86fd5ccd357a34d66
Use injected clock in video_send_stream_tests
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).
Bug: webrtc:42223992
Change-Id: Ie77f4eebb9f605cf98a8fa39199e83d2796bfb03
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/405525
Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45436}
Diffstat:
2 files changed, 4 insertions(+), 5 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-27T18:43:12.991669+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-27T18:45:59.485019+00:00.
# base of lastest vendoring
-179e05f6ae
+61fc8743a9
diff --git a/third_party/libwebrtc/video/video_send_stream_tests.cc b/third_party/libwebrtc/video/video_send_stream_tests.cc
@@ -101,7 +101,6 @@
#include "rtc_base/task_queue_for_test.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
-#include "rtc_base/time_utils.h"
#include "rtc_base/unique_id_generator.h"
#include "test/call_test.h"
#include "test/configurable_frame_size_encoder.h"
@@ -2813,7 +2812,7 @@ TEST_F(VideoSendStreamTest, ReconfigureBitratesSetsEncoderBitratesCorrectly) {
// more than one update pending, in which case we keep waiting
// until the correct value has been observed.
// The target_bitrate_ is reduced by the calculated packet overhead.
- const int64_t start_time = TimeMillis();
+ const Timestamp start_time = env_.clock().CurrentTime();
do {
MutexLock lock(&mutex_);
@@ -2825,7 +2824,7 @@ TEST_F(VideoSendStreamTest, ReconfigureBitratesSetsEncoderBitratesCorrectly) {
} while (bitrate_changed_event_.Wait(
std::max(TimeDelta::Millis(1),
test::VideoTestConstants::kDefaultTimeout -
- TimeDelta::Millis(TimeMillis() - start_time))));
+ (env_.clock().CurrentTime() - start_time))));
MutexLock lock(&mutex_);
EXPECT_NEAR(target_bitrate_, expected_bitrate, abs_error)
<< "Timed out while waiting encoder rate to be set.";