diff --git a/modules/pacing/alr_detector.cc b/modules/pacing/alr_detector.cc index c26225162e..52fa2bc98e 100644 --- a/modules/pacing/alr_detector.cc +++ b/modules/pacing/alr_detector.cc @@ -24,6 +24,7 @@ const char AlrDetector::kScreenshareProbingBweExperimentName[] = "WebRTC-ProbingScreenshareBwe"; const char AlrDetector::kStrictPacingAndProbingExperimentName[] = "WebRTC-StrictPacingAndProbing"; +const char kDefaultProbingScreenshareBweSettings[] = "1.0,2875,80,40,-60,3"; AlrDetector::AlrDetector() : bandwidth_usage_percent_(kDefaultAlrBandwidthUsagePercent), @@ -89,6 +90,14 @@ AlrDetector::ParseAlrSettingsFromFieldTrial(const char* experiment_name) { group_name.resize(group_name.length() - kIgnoredSuffix.length()); } + if (experiment_name == kScreenshareProbingBweExperimentName) { + // This experiment is now default-on with fixed settings. + // TODO(sprang): Remove this kill-switch and clean up experiment code. + if (group_name != "Disabled") { + group_name = kDefaultProbingScreenshareBweSettings; + } + } + if (group_name.empty()) return ret; diff --git a/modules/pacing/alr_detector_unittest.cc b/modules/pacing/alr_detector_unittest.cc index 927015615c..506add506b 100644 --- a/modules/pacing/alr_detector_unittest.cc +++ b/modules/pacing/alr_detector_unittest.cc @@ -93,7 +93,7 @@ TEST_F(AlrDetectorTest, AlrDetection) { // Verify that ALR ends when usage is above 65%. SimulateOutgoingTrafficIn(&alr_detector_) - .ForTimeMs(1000) + .ForTimeMs(4000) .AtPercentOfEstimatedBitrate(100); EXPECT_FALSE(alr_detector_.GetApplicationLimitedRegionStartTime()); } @@ -116,7 +116,7 @@ TEST_F(AlrDetectorTest, ShortSpike) { // ALR ends when usage is above 65%. SimulateOutgoingTrafficIn(&alr_detector_) - .ForTimeMs(1000) + .ForTimeMs(3000) .AtPercentOfEstimatedBitrate(100); EXPECT_FALSE(alr_detector_.GetApplicationLimitedRegionStartTime()); } diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc index 52699db3c2..98a32cc858 100644 --- a/video/video_send_stream_tests.cc +++ b/video/video_send_stream_tests.cc @@ -3542,7 +3542,7 @@ TEST_F(VideoSendStreamTest, SendsKeepAlive) { TEST_F(VideoSendStreamTest, ConfiguresAlrWhenSendSideOn) { const std::string kAlrProbingExperiment = std::string(AlrDetector::kScreenshareProbingBweExperimentName) + - "/1.1,2875,85,20,-20,0/"; + "/1.0,2875,80,40,-60,3/"; test::ScopedFieldTrials alr_experiment(kAlrProbingExperiment); class PacingFactorObserver : public test::SendTest { public: @@ -3607,7 +3607,7 @@ TEST_F(VideoSendStreamTest, ConfiguresAlrWhenSendSideOn) { }; // Send-side bwe on, use pacing factor from |kAlrProbingExperiment| above. - PacingFactorObserver test_with_send_side(true, 1.1f); + PacingFactorObserver test_with_send_side(true, 1.0f); RunBaseTest(&test_with_send_side); // Send-side bwe off, use default pacing factor.