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

Enable RttMult by default.

Browse Source 
This feature has had positive impact in downstream experiments, so we should enable it by default. It will be kept around as a kill switch for a while though.

Bug: webrtc:15260
Change-Id: Ibfd25f5be124f65cd4360ae76f7022bb46f65301
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/309781
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40327}
This commit is contained in:
Rasmus Brandt 2023-06-21 15:08:30 +02:00 committed by WebRTC LUCI CQ
parent d20bbc4a15
commit 0510463439
2 changed files with 10 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rtc_base/experiments/rtt_mult_experiment.cc
View File

@ -21,45 +21,19 @@ namespace webrtc {
namespace {
const char kRttMultExperiment[] = "WebRTC-RttMult";
const float max_rtt_mult_setting = 1.0;
const float min_rtt_mult_setting = 0.0;
const float max_rtt_mult_add_cap_ms = 2000.0;
const float min_rtt_mult_add_cap_ms = 0.0;
} // namespace
bool RttMultExperiment::RttMultEnabled() {
return field_trial::IsEnabled(kRttMultExperiment);
return !field_trial::IsDisabled(kRttMultExperiment);
}
absl::optional<RttMultExperiment::Settings>
RttMultExperiment::GetRttMultValue() {
if (!RttMultExperiment::RttMultEnabled())
return absl::nullopt;
const std::string group =
webrtc::field_trial::FindFullName(kRttMultExperiment);
if (group.empty()) {
RTC_LOG(LS_WARNING) << "Could not find rtt_mult_experiment.";
if (!RttMultExperiment::RttMultEnabled()) {
return absl::nullopt;
}
Settings s;
if (sscanf(group.c_str(), "Enabled-%f,%f", &s.rtt_mult_setting,
&s.rtt_mult_add_cap_ms) != 2) {
RTC_LOG(LS_WARNING) << "Invalid number of parameters provided.";
return absl::nullopt;
}
// Bounds check rtt_mult_setting and rtt_mult_add_cap_ms values.
s.rtt_mult_setting = std::min(s.rtt_mult_setting, max_rtt_mult_setting);
s.rtt_mult_setting = std::max(s.rtt_mult_setting, min_rtt_mult_setting);
s.rtt_mult_add_cap_ms =
std::min(s.rtt_mult_add_cap_ms, max_rtt_mult_add_cap_ms);
s.rtt_mult_add_cap_ms =
std::max(s.rtt_mult_add_cap_ms, min_rtt_mult_add_cap_ms);
RTC_LOG(LS_INFO) << "rtt_mult experiment: rtt_mult value = "
<< s.rtt_mult_setting
<< " rtt_mult addition cap = " << s.rtt_mult_add_cap_ms
<< " ms.";
return s;
return RttMultExperiment::Settings{.rtt_mult_setting = 0.9,
.rtt_mult_add_cap_ms = 200.0};
}
} // namespace webrtc

43
rtc_base/experiments/rtt_mult_experiment_unittest.cc
View File

@ -15,48 +15,17 @@
namespace webrtc {
TEST(RttMultExperimentTest, RttMultDisabledByDefault) {
EXPECT_FALSE(RttMultExperiment::RttMultEnabled());
}
TEST(RttMultExperimentTest, RttMultEnabledByFieldTrial) {
webrtc::test::ScopedFieldTrials field_trials(
"WebRTC-RttMult/Enabled-0.60,100.0/");
TEST(RttMultExperimentTest, RttMultEnabledByDefault) {
EXPECT_TRUE(RttMultExperiment::RttMultEnabled());
ASSERT_TRUE(RttMultExperiment::GetRttMultValue());
EXPECT_EQ(0.9f, RttMultExperiment::GetRttMultValue()->rtt_mult_setting);
EXPECT_EQ(200.0f, RttMultExperiment::GetRttMultValue()->rtt_mult_add_cap_ms);
}
TEST(RttMultExperimentTest, RttMultTestValue) {
webrtc::test::ScopedFieldTrials field_trials(
"WebRTC-RttMult/Enabled-0.60,100.0/");
EXPECT_EQ(0.6f, RttMultExperiment::GetRttMultValue()->rtt_mult_setting);
EXPECT_EQ(100.0f, RttMultExperiment::GetRttMultValue()->rtt_mult_add_cap_ms);
}
TEST(RttMultExperimentTest, RttMultTestMalformedEnabled) {
webrtc::test::ScopedFieldTrials field_trials(
"WebRTC-RttMult/Enable-0.60,100.0/");
TEST(RttMultExperimentTest, RttMultDisabledByFieldTrial) {
webrtc::test::ScopedFieldTrials field_trials("WebRTC-RttMult/Disabled/");
EXPECT_FALSE(RttMultExperiment::RttMultEnabled());
EXPECT_FALSE(RttMultExperiment::GetRttMultValue());
}
TEST(RttMultExperimentTest, RttMultTestValueOutOfBoundsPositive) {
webrtc::test::ScopedFieldTrials field_trials(
"WebRTC-RttMult/Enabled-1.5,2100.0/");
EXPECT_EQ(1.0f, RttMultExperiment::GetRttMultValue()->rtt_mult_setting);
EXPECT_EQ(2000.0f, RttMultExperiment::GetRttMultValue()->rtt_mult_add_cap_ms);
}
TEST(RttMultExperimentTest, RttMultTestValueOutOfBoundsNegative) {
webrtc::test::ScopedFieldTrials field_trials(
"WebRTC-RttMult/Enabled--0.5,-100.0/");
EXPECT_EQ(0.0f, RttMultExperiment::GetRttMultValue()->rtt_mult_setting);
EXPECT_EQ(0.0f, RttMultExperiment::GetRttMultValue()->rtt_mult_add_cap_ms);
}
TEST(RttMultExperimentTest, RttMultTestMalformedValue) {
webrtc::test::ScopedFieldTrials field_trials(
"WebRTC-RttMult/Enabled-0.25,10a0.0/");
EXPECT_NE(100.0f, RttMultExperiment::GetRttMultValue()->rtt_mult_add_cap_ms);
}
} // namespace webrtc