Control rtt_mult addition cap via experiment.

Bug: webrtc:10717
Change-Id: I68f7d8216e1a1611e692dd82ba96890cad98c7de
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140284
Commit-Queue: Michael Horowitz <mhoro@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28191}
This commit is contained in:
“Michael
2019-06-07 03:55:01 -05:00
committed by Commit Bot
parent 944dacec25
commit d3a4ebe332
6 changed files with 64 additions and 27 deletions

View File

@ -22,29 +22,43 @@ 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);
}
float RttMultExperiment::GetRttMultValue() {
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.";
return 0.0;
return absl::nullopt;
}
float rtt_mult_setting;
if (sscanf(group.c_str(), "Enabled-%f", &rtt_mult_setting) != 1) {
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 0.0;
return absl::nullopt;
}
// Bounds check rtt_mult_setting value.
rtt_mult_setting = std::min(rtt_mult_setting, max_rtt_mult_setting);
rtt_mult_setting = std::max(rtt_mult_setting, min_rtt_mult_setting);
return rtt_mult_setting;
// 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;
}
} // namespace webrtc