Remove InjectionComponents::field_trials string.
Change-Id: If331685b482600f1448ea9a044e63e6c1811afc9
Bug: b/448299476
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/415100
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#45865}
diff --git a/api/test/video_quality_test_fixture.h b/api/test/video_quality_test_fixture.h
index a7f37dd..f577e8c 100644
--- a/api/test/video_quality_test_fixture.h
+++ b/api/test/video_quality_test_fixture.h
@@ -129,10 +129,7 @@
std::unique_ptr<NetworkBehaviorInterface> sender_network;
std::unique_ptr<NetworkBehaviorInterface> receiver_network;
- // TODO: b/448299476 - Keep only the field_trials_ptr member.
- std::string field_trials;
std::unique_ptr<FieldTrials> field_trials_ptr;
-
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory;
std::unique_ptr<VideoEncoderFactory> video_encoder_factory;
std::unique_ptr<VideoDecoderFactory> video_decoder_factory;
diff --git a/video/BUILD.gn b/video/BUILD.gn
index e1236c1..605cee4 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -671,6 +671,7 @@
"../api/units:data_rate",
"../api/video_codecs:video_codecs_api",
"../modules/video_coding:webrtc_vp9",
+ "../test:create_test_field_trials",
"../test:fileutils",
"../test:test_support",
"config:encoder_config",
diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc
index be5e46a..1acfcc4 100644
--- a/video/full_stack_tests.cc
+++ b/video/full_stack_tests.cc
@@ -21,6 +21,7 @@
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/vp9_profile.h"
#include "modules/video_coding/codecs/vp9/include/vp9.h"
+#include "test/create_test_field_trials.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
#include "video/config/video_encoder_config.h"
@@ -623,9 +624,8 @@
}
TEST(FullStackTest, Foreman_Cif_Delay_50_0_Plr_5_H264_Sps_Pps_Idr) {
- VideoQualityTest fixture(
- {.field_trials = "WebRTC-SpsPpsIdrIsH264Keyframe/Enabled/"});
-
+ VideoQualityTest fixture({.field_trials_ptr = CreateTestFieldTrialsPtr(
+ "WebRTC-SpsPpsIdrIsH264Keyframe/Enabled/")});
ParamsWithLogging foreman_cif;
foreman_cif.call.send_side_bwe = true;
foreman_cif.video[0] = {.enabled = true,
@@ -1574,7 +1574,8 @@
TEST(FullStackTest, Vp9ksvc_3sl_High) {
VideoQualityTest fixture(
- {.field_trials = "WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/"});
+ {.field_trials_ptr = CreateTestFieldTrialsPtr(
+ "WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/")});
ParamsWithLogging simulcast;
simulcast.call.send_side_bwe = true;
simulcast.video[0] = SvcVp9Video();
@@ -1594,7 +1595,8 @@
TEST(FullStackTest, Vp9ksvc_3sl_Low) {
VideoQualityTest fixture(
- {.field_trials = "WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/"});
+ {.field_trials_ptr = CreateTestFieldTrialsPtr(
+ "WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/")});
ParamsWithLogging simulcast;
simulcast.call.send_side_bwe = true;
simulcast.video[0] = SvcVp9Video();
@@ -1614,7 +1616,8 @@
TEST(FullStackTest, Vp9ksvc_3sl_Low_Bw_Limited) {
VideoQualityTest fixture(
- {.field_trials = "WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/"});
+ {.field_trials_ptr = CreateTestFieldTrialsPtr(
+ "WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/")});
ParamsWithLogging simulcast;
simulcast.config->link_capacity = DataRate::KilobitsPerSec(500);
simulcast.call.send_side_bwe = true;
@@ -1635,7 +1638,8 @@
TEST(FullStackTest, Vp9ksvc_3sl_Medium_Network_Restricted) {
VideoQualityTest fixture(
- {.field_trials = "WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/"});
+ {.field_trials_ptr = CreateTestFieldTrialsPtr(
+ "WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/")});
ParamsWithLogging simulcast;
simulcast.call.send_side_bwe = true;
simulcast.video[0] = SvcVp9Video();
@@ -1658,7 +1662,8 @@
// TODO(webrtc:9722): Remove when experiment is cleaned up.
TEST(FullStackTest, Vp9ksvc_3sl_Medium_Network_Restricted_Trusted_Rate) {
VideoQualityTest fixture(
- {.field_trials = "WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/"});
+ {.field_trials_ptr = CreateTestFieldTrialsPtr(
+ "WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/")});
ParamsWithLogging simulcast;
simulcast.call.send_side_bwe = true;
simulcast.video[0] = SvcVp9Video();
@@ -1692,8 +1697,8 @@
TEST(FullStackTest, MAYBE_Simulcast_HD_High) {
VideoQualityTest fixture(
- {.field_trials =
- "WebRTC-ForceSimulatedOveruseIntervalMs/1000-50000-300/"});
+ {.field_trials_ptr = CreateTestFieldTrialsPtr(
+ "WebRTC-ForceSimulatedOveruseIntervalMs/1000-50000-300/")});
ParamsWithLogging simulcast;
simulcast.call.send_side_bwe = true;
simulcast.video[0] = {.enabled = true,
diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index 9487a06..a2d4678 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -408,7 +408,7 @@
VideoQualityTest::VideoQualityTest(InjectionComponents injection_components)
: CallTest(injection_components.field_trials_ptr
? *injection_components.field_trials_ptr
- : CreateTestFieldTrials(injection_components.field_trials)),
+ : CreateTestFieldTrials("")),
video_decoder_factory_(
[this](const Environment& env, const SdpVideoFormat& format) {
return this->CreateVideoDecoder(env, format);
