admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ALR probing experiment default on.

Browse Source 
Bug: webrtc:7694
Change-Id: I9d468ed13d2894c6d6ec9163d21959d51926cf33
Reviewed-on: https://webrtc-review.googlesource.com/23560
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20894}
This commit is contained in:
Erik Språng 2017-11-27 13:49:07 +01:00 committed by Commit Bot
parent ce15cd3e3e
commit 9299642fd0
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/pacing/alr_detector.cc
View File

@ -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;

4
modules/pacing/alr_detector_unittest.cc
View File

@ -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());
}

4
video/video_send_stream_tests.cc
View File

@ -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.