Google Git Google Git
Sign in
webrtc/src/60f506109e^!/.
commit
60f506109ec4e3b97a255acd2453dadb3daeff46
[log]
author
Evan Shrubsole <eshr@webrtc.org>
Mon Mar 16 10:15:28 2026
committer
WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com>
Tue Mar 17 14:40:46 2026
tree
7d88de9e5a8ac0663118c00702910f97a56a7100
parent
ae5414e8464c440b7f6fca85705ad3351156a95f [diff] 
Remove use of ScopedFakeClock in video_encoder_software_fallback_wrapper_unittest

The fake clock was not used so was completely removed.

Bug: webrtc:469327588,webrtc:42223992
Change-Id: I5cd06b94801fc0f3d5fc91734719ce636a6a6964
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/457241
Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#47181}

diff --git a/api/video_codecs/test/BUILD.gn b/api/video_codecs/test/BUILD.gn
index d905633..f1861c7 100644
--- a/api/video_codecs/test/BUILD.gn
+++ b/api/video_codecs/test/BUILD.gn

@@ -41,13 +41,13 @@
       "../../../modules/video_coding:webrtc_vp8",
       "../../../rtc_base:checks",
       "../../../rtc_base:rtc_base_tests_utils",
+      "../../../test:create_test_environment",
       "../../../test:create_test_field_trials",
       "../../../test:fake_video_codecs",
       "../../../test:test_support",
       "../../../test:video_test_common",
       "../../environment",
       "../../environment:environment_factory",
-      "../../units:timestamp",
       "../../video:encoded_image",
       "../../video:resolution",
       "../../video:video_bitrate_allocation",
@@ -56,6 +56,7 @@
       "../../video:video_frame_type",
       "../../video:video_rtp_headers",
       "//testing/gtest",
+      "//third_party/abseil-cpp/absl/strings:string_view",
     ]
   }
 

diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
index 542b194..e69c9c1 100644
--- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
+++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc

@@ -18,12 +18,11 @@
 #include <utility>
 #include <vector>
 
+#include "absl/strings/string_view.h"
 #include "api/environment/environment.h"
-#include "api/environment/environment_factory.h"
 #include "api/fec_controller_override.h"
 #include "api/scoped_refptr.h"
 #include "api/test/mock_video_encoder.h"
-#include "api/units/timestamp.h"
 #include "api/video/encoded_image.h"
 #include "api/video/i420_buffer.h"
 #include "api/video/video_bitrate_allocator.h"
@@ -38,8 +37,7 @@
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "modules/video_coding/utility/simulcast_rate_allocator.h"
-#include "rtc_base/fake_clock.h"
-#include "test/create_test_field_trials.h"
+#include "test/create_test_environment.h"
 #include "test/fake_encoder.h"
 #include "test/fake_texture_frame.h"
 #include "test/gmock.h"
@@ -205,7 +203,7 @@
   explicit VideoEncoderSoftwareFallbackWrapperTest(
       CountingFakeEncoder* fake_sw_encoder)
       : VideoEncoderSoftwareFallbackWrapperTestBase(
-            CreateEnvironment(),
+            CreateTestEnvironment(),
             std::unique_ptr<VideoEncoder>(fake_sw_encoder)),
         fake_sw_encoder_(fake_sw_encoder) {
     fake_sw_encoder_->implementation_name_ = "fake_sw_encoder";
@@ -495,17 +493,15 @@
 
 class ForcedFallbackTest : public VideoEncoderSoftwareFallbackWrapperTestBase {
  public:
-  explicit ForcedFallbackTest(const Environment& env)
-      : VideoEncoderSoftwareFallbackWrapperTestBase(env,
-                                                    CreateVp8Encoder(env)) {}
+  explicit ForcedFallbackTest(absl::string_view field_trials)
+      : VideoEncoderSoftwareFallbackWrapperTestBase(
+            CreateTestEnvironment({.field_trials = field_trials}),
+            CreateVp8Encoder(
+                CreateTestEnvironment({.field_trials = field_trials}))) {}
 
   ~ForcedFallbackTest() override {}
 
- protected:
-  void SetUp() override {
-    clock_.SetTime(Timestamp::Micros(1234));
-    ConfigureVp8Codec();
-  }
+  void SetUp() override { ConfigureVp8Codec(); }
 
   void TearDown() override {
     if (wrapper_initialized_) {
@@ -553,24 +549,20 @@
     EncodeFrame(expected_ret);
     CheckLastEncoderName(expected_name);
   }
-
-  ScopedFakeClock clock_;
 };
 
 class ForcedFallbackTestEnabled : public ForcedFallbackTest {
  public:
   ForcedFallbackTestEnabled()
-      : ForcedFallbackTest(CreateEnvironment(CreateTestFieldTrialsPtr(
-            std::string(kFieldTrial) + "/Enabled-" +
-            std::to_string(kMinPixelsPerFrame) + "," +
-            std::to_string(kWidth * kHeight) + ",30000/"))) {}
+      : ForcedFallbackTest(std::string(kFieldTrial) + "/Enabled-" +
+                           std::to_string(kMinPixelsPerFrame) + "," +
+                           std::to_string(kWidth * kHeight) + ",30000/") {}
 };
 
 class ForcedFallbackTestDisabled : public ForcedFallbackTest {
  public:
   ForcedFallbackTestDisabled()
-      : ForcedFallbackTest(CreateEnvironment(CreateTestFieldTrialsPtr(
-            std::string(kFieldTrial) + "/Disabled/"))) {}
+      : ForcedFallbackTest(std::string(kFieldTrial) + "/Disabled/") {}
 };
 
 TEST_F(ForcedFallbackTestDisabled, NoFallbackWithoutFieldTrial) {
@@ -716,7 +708,7 @@
 
   std::unique_ptr<VideoEncoder> wrapper =
       CreateVideoEncoderSoftwareFallbackWrapper(
-          CreateEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
+          CreateTestEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
           std::unique_ptr<VideoEncoder>(hw_encoder),
           /*prefer_temporal_support=*/false);
   EXPECT_FALSE(wrapper->GetEncoderInfo().has_trusted_rate_controller);
@@ -732,7 +724,7 @@
 
   std::unique_ptr<VideoEncoder> wrapper =
       CreateVideoEncoderSoftwareFallbackWrapper(
-          CreateEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
+          CreateTestEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
           std::unique_ptr<VideoEncoder>(hw_encoder),
           /*prefer_temporal_support=*/false);
   EXPECT_FALSE(wrapper->GetEncoderInfo().has_trusted_rate_controller);
@@ -748,7 +740,7 @@
 
   std::unique_ptr<VideoEncoder> wrapper =
       CreateVideoEncoderSoftwareFallbackWrapper(
-          CreateEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
+          CreateTestEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
           std::unique_ptr<VideoEncoder>(hw_encoder),
           /*prefer_temporal_support=*/false);
   EXPECT_TRUE(wrapper->GetEncoderInfo().has_trusted_rate_controller);
@@ -779,7 +771,7 @@
 
   std::unique_ptr<VideoEncoder> wrapper =
       CreateVideoEncoderSoftwareFallbackWrapper(
-          CreateEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
+          CreateTestEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
           std::unique_ptr<VideoEncoder>(hw_encoder),
           /*prefer_temporal_support=*/false);
   EXPECT_TRUE(wrapper->GetEncoderInfo().has_trusted_rate_controller);
@@ -795,7 +787,7 @@
 
   std::unique_ptr<VideoEncoder> wrapper =
       CreateVideoEncoderSoftwareFallbackWrapper(
-          CreateEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
+          CreateTestEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
           std::unique_ptr<VideoEncoder>(hw_encoder),
           /*prefer_temporal_support=*/false);
   EXPECT_TRUE(wrapper->GetEncoderInfo().is_hardware_accelerated);
@@ -825,7 +817,7 @@
 
   std::unique_ptr<VideoEncoder> wrapper =
       CreateVideoEncoderSoftwareFallbackWrapper(
-          CreateEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
+          CreateTestEnvironment(), std::unique_ptr<VideoEncoder>(sw_encoder),
           std::unique_ptr<VideoEncoder>(hw_encoder),
           /*prefer_temporal_support=*/false);
   EXPECT_TRUE(wrapper->GetEncoderInfo().is_hardware_accelerated);
@@ -868,7 +860,7 @@
         .WillRepeatedly(Return(WEBRTC_VIDEO_CODEC_OK));
 
     wrapper_ = CreateVideoEncoderSoftwareFallbackWrapper(
-        CreateEnvironment(), std::unique_ptr<VideoEncoder>(sw_),
+        CreateTestEnvironment(), std::unique_ptr<VideoEncoder>(sw_),
         std::unique_ptr<VideoEncoder>(hw_),
         /*prefer_temporal_support=*/true);
 
@@ -1143,7 +1135,7 @@
 TEST_P(ResolutionBasedFallbackTest, VerifyForcedEncoderFallback) {
   const ResolutionBasedFallbackTestParams& params = GetParam();
   const Environment env =
-      CreateEnvironment(CreateTestFieldTrialsPtr(params.field_trials));
+      CreateTestEnvironment({.field_trials = params.field_trials});
   auto primary = std::make_unique<test::FakeEncoder>(env);
   primary->SetImplementationName("primary");
   auto fallback = std::make_unique<test::FakeEncoder>(env);