Remove tests associated to WebRTC-LibvpxVp{8,9}TrustedRateController.
The field trial has been removed from the codebase by https://webrtc-review.googlesource.com/c/src/+/173479. Bug: chromium:1131805, webrtc:9722 Change-Id: I467c7193f61dca75b11f7f942ed6341744e61f90 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/185185 Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32216}
This commit is contained in:
Mirko Bonadei
Commit Bot
parent
fbb31dff0c
commit
e39b378d4a
@ -48,8 +48,6 @@ namespace webrtc {
|
||||
|
||||
namespace {
|
||||
static const int kFullStackTestDurationSecs = 45;
|
||||
const char kVp8TrustedRateControllerFieldTrial[] =
|
||||
"WebRTC-LibvpxVp8TrustedRateController/Enabled/";
|
||||
|
||||
struct ParamsWithLogging : public VideoQualityTest::Params {
|
||||
public:
|
||||
@ -232,28 +230,6 @@ TEST(GenericDescriptorTest,
|
||||
fixture->RunWithAnalyzer(foreman_cif);
|
||||
}
|
||||
|
||||
// TODO(webrtc:9722): Remove when experiment is cleaned up.
|
||||
TEST(GenericDescriptorTest,
|
||||
Foreman_Cif_30kbps_Net_Delay_0_0_Plr_0_Trusted_Rate_Ctrl) {
|
||||
test::ScopedFieldTrials override_field_trials(
|
||||
AppendFieldTrials(kVp8TrustedRateControllerFieldTrial));
|
||||
auto fixture = CreateVideoQualityTestFixture();
|
||||
|
||||
ParamsWithLogging foreman_cif;
|
||||
foreman_cif.call.send_side_bwe = true;
|
||||
foreman_cif.video[0] = {
|
||||
true, 352, 288, 10,
|
||||
30000, 30000, 30000, false,
|
||||
"VP8", 1, 0, 0,
|
||||
false, false, true, ClipNameToClipPath("foreman_cif")};
|
||||
foreman_cif.analyzer = {
|
||||
"foreman_cif_30kbps_net_delay_0_0_plr_0_trusted_rate_ctrl_generic_"
|
||||
"descriptor",
|
||||
0.0, 0.0, kFullStackTestDurationSecs};
|
||||
foreman_cif.call.generic_descriptor = true;
|
||||
fixture->RunWithAnalyzer(foreman_cif);
|
||||
}
|
||||
|
||||
// Link capacity below default start rate.
|
||||
TEST(FullStackTest, Foreman_Cif_Link_150kbps_Net_Delay_0_0_Plr_0) {
|
||||
auto fixture = CreateVideoQualityTestFixture();
|
||||
@ -631,34 +607,6 @@ TEST(FullStackTest, Conference_Motion_Hd_2000kbps_100ms_32pkts_Queue) {
|
||||
fixture->RunWithAnalyzer(conf_motion_hd);
|
||||
}
|
||||
|
||||
// TODO(webrtc:9722): Remove when experiment is cleaned up.
|
||||
TEST(FullStackTest,
|
||||
Conference_Motion_Hd_1tl_Moderate_Limits_Trusted_Rate_Ctrl) {
|
||||
test::ScopedFieldTrials override_field_trials(
|
||||
AppendFieldTrials(kVp8TrustedRateControllerFieldTrial));
|
||||
auto fixture = CreateVideoQualityTestFixture();
|
||||
|
||||
ParamsWithLogging conf_motion_hd;
|
||||
conf_motion_hd.call.send_side_bwe = true;
|
||||
conf_motion_hd.video[0] = {
|
||||
true, 1280,
|
||||
720, 50,
|
||||
30000, 3000000,
|
||||
3000000, false,
|
||||
"VP8", 1,
|
||||
-1, 0,
|
||||
false, false,
|
||||
false, ClipNameToClipPath("ConferenceMotion_1280_720_50")};
|
||||
conf_motion_hd.analyzer = {
|
||||
"conference_motion_hd_1tl_moderate_limits_trusted_rate_ctrl", 0.0, 0.0,
|
||||
kFullStackTestDurationSecs};
|
||||
conf_motion_hd.config->queue_length_packets = 50;
|
||||
conf_motion_hd.config->loss_percent = 3;
|
||||
conf_motion_hd.config->queue_delay_ms = 100;
|
||||
conf_motion_hd.config->link_capacity_kbps = 2000;
|
||||
fixture->RunWithAnalyzer(conf_motion_hd);
|
||||
}
|
||||
|
||||
TEST(GenericDescriptorTest,
|
||||
Conference_Motion_Hd_2tl_Moderate_Limits_Generic_Descriptor) {
|
||||
auto fixture = CreateVideoQualityTestFixture();
|
||||
@ -1065,8 +1013,7 @@ TEST(FullStackTest, Vp9ksvc_3sl_Medium_Network_Restricted) {
|
||||
// TODO(webrtc:9722): Remove when experiment is cleaned up.
|
||||
TEST(FullStackTest, Vp9ksvc_3sl_Medium_Network_Restricted_Trusted_Rate) {
|
||||
webrtc::test::ScopedFieldTrials override_trials(
|
||||
AppendFieldTrials("WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/"
|
||||
"WebRTC-LibvpxVp9TrustedRateController/Enabled/"));
|
||||
AppendFieldTrials("WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/"));
|
||||
auto fixture = CreateVideoQualityTestFixture();
|
||||
ParamsWithLogging simulcast;
|
||||
simulcast.call.send_side_bwe = true;
|
||||
|
||||
@ -49,8 +49,6 @@ using VideoCodecConfig =
|
||||
namespace {
|
||||
|
||||
constexpr int kTestDurationSec = 45;
|
||||
constexpr char kVp8TrustedRateControllerFieldTrial[] =
|
||||
"WebRTC-LibvpxVp8TrustedRateController/Enabled/";
|
||||
|
||||
EmulatedNetworkNode* CreateEmulatedNodeWithConfig(
|
||||
NetworkEmulationManager* emulation,
|
||||
@ -305,40 +303,6 @@ TEST(PCGenericDescriptorTest,
|
||||
fixture->Run(std::move(run_params));
|
||||
}
|
||||
|
||||
// TODO(webrtc:9722): Remove when experiment is cleaned up.
|
||||
TEST(PCGenericDescriptorTest,
|
||||
Pc_Foreman_Cif_30kbps_Net_Delay_0_0_Plr_0_Trusted_Rate_Ctrl) {
|
||||
test::ScopedFieldTrials override_field_trials(
|
||||
AppendFieldTrials(kVp8TrustedRateControllerFieldTrial));
|
||||
std::unique_ptr<NetworkEmulationManager> network_emulation_manager =
|
||||
CreateNetworkEmulationManager();
|
||||
BuiltInNetworkBehaviorConfig config;
|
||||
auto fixture = CreateTestFixture(
|
||||
"pc_foreman_cif_30kbps_net_delay_0_0_plr_0_trusted_rate_ctrl_generic_"
|
||||
"descriptor",
|
||||
*network_emulation_manager->time_controller(),
|
||||
CreateTwoNetworkLinks(network_emulation_manager.get(), config),
|
||||
[](PeerConfigurer* alice) {
|
||||
VideoConfig video(352, 288, 10);
|
||||
video.stream_label = "alice-video";
|
||||
auto frame_generator = CreateFromYuvFileFrameGenerator(
|
||||
video, ClipNameToClipPath("foreman_cif"));
|
||||
alice->AddVideoConfig(std::move(video), std::move(frame_generator));
|
||||
|
||||
BitrateSettings bitrate_settings;
|
||||
bitrate_settings.min_bitrate_bps = 30000;
|
||||
bitrate_settings.start_bitrate_bps = 30000;
|
||||
bitrate_settings.max_bitrate_bps = 30000;
|
||||
alice->SetBitrateSettings(bitrate_settings);
|
||||
},
|
||||
[](PeerConfigurer* bob) {});
|
||||
RunParams run_params(TimeDelta::Seconds(kTestDurationSec));
|
||||
run_params.video_codecs = {VideoCodecConfig(cricket::kVp8CodecName)};
|
||||
run_params.use_flex_fec = false;
|
||||
run_params.use_ulp_fec = false;
|
||||
fixture->Run(std::move(run_params));
|
||||
}
|
||||
|
||||
// Link capacity below default start rate.
|
||||
TEST(PCFullStackTest, Pc_Foreman_Cif_Link_150kbps_Net_Delay_0_0_Plr_0) {
|
||||
std::unique_ptr<NetworkEmulationManager> network_emulation_manager =
|
||||
@ -944,37 +908,6 @@ TEST(PCFullStackTest, Pc_Conference_Motion_Hd_2000kbps_100ms_32pkts_Queue) {
|
||||
fixture->Run(std::move(run_params));
|
||||
}
|
||||
|
||||
// TODO(webrtc:9722): Remove when experiment is cleaned up.
|
||||
TEST(PCFullStackTest,
|
||||
Pc_Conference_Motion_Hd_1tl_Moderate_Limits_Trusted_Rate_Ctrl) {
|
||||
test::ScopedFieldTrials override_field_trials(
|
||||
AppendFieldTrials(kVp8TrustedRateControllerFieldTrial));
|
||||
std::unique_ptr<NetworkEmulationManager> network_emulation_manager =
|
||||
CreateNetworkEmulationManager();
|
||||
BuiltInNetworkBehaviorConfig config;
|
||||
config.queue_length_packets = 50;
|
||||
config.loss_percent = 3;
|
||||
config.queue_delay_ms = 100;
|
||||
config.link_capacity_kbps = 2000;
|
||||
auto fixture = CreateTestFixture(
|
||||
"pc_conference_motion_hd_1tl_moderate_limits_trusted_rate_ctrl",
|
||||
*network_emulation_manager->time_controller(),
|
||||
CreateTwoNetworkLinks(network_emulation_manager.get(), config),
|
||||
[](PeerConfigurer* alice) {
|
||||
VideoConfig video(1280, 720, 50);
|
||||
video.stream_label = "alice-video";
|
||||
auto frame_generator = CreateFromYuvFileFrameGenerator(
|
||||
video, ClipNameToClipPath("ConferenceMotion_1280_720_50"));
|
||||
alice->AddVideoConfig(std::move(video), std::move(frame_generator));
|
||||
},
|
||||
[](PeerConfigurer* bob) {});
|
||||
RunParams run_params(TimeDelta::Seconds(kTestDurationSec));
|
||||
run_params.video_codecs = {VideoCodecConfig(cricket::kVp8CodecName)};
|
||||
run_params.use_flex_fec = false;
|
||||
run_params.use_ulp_fec = false;
|
||||
fixture->Run(std::move(run_params));
|
||||
}
|
||||
|
||||
/*
|
||||
// TODO(bugs.webrtc.org/10639) requires simulcast/SVC support in PC framework
|
||||
TEST(PCGenericDescriptorTest, ConferenceMotionHd2TLModerateLimits) {
|
||||
@ -1573,8 +1506,7 @@ TEST(PCFullStackTest, VP9KSVC_3SL_Medium_Network_Restricted) {
|
||||
// TODO(webrtc:9722): Remove when experiment is cleaned up.
|
||||
TEST(PCFullStackTest, VP9KSVC_3SL_Medium_Network_Restricted_Trusted_Rate) {
|
||||
webrtc::test::ScopedFieldTrials override_trials(
|
||||
AppendFieldTrials("WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/"
|
||||
"WebRTC-LibvpxVp9TrustedRateController/Enabled/"));
|
||||
AppendFieldTrials("WebRTC-Vp9IssueKeyFrameOnLayerDeactivation/Enabled/"));
|
||||
auto fixture = CreateVideoQualityTestFixture();
|
||||
ParamsWithLogging simulcast;
|
||||
simulcast.call.send_side_bwe = true;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user