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

Removes deprecated WebRTC-Bwe-AimdRateControl-NetworkState trial.

Browse Source 
Bug: webrtc:10498
Change-Id: Ie435ad2e2c73bf2b54d9caccabf9a27443ca4229
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158082
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29596}
This commit is contained in:
Sebastian Jansson 2019-10-23 10:18:16 +02:00 committed by Commit Bot
parent bd2007738e
commit d113ee326b
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/remote_bitrate_estimator/aimd_rate_control.cc
View File

@ -94,9 +94,7 @@ AimdRateControl::AimdRateControl(const WebRtcKeyValueConfig* key_value_config,
estimate_bounded_increase_(
IsEnabled(*key_value_config, "WebRTC-Bwe-EstimateBoundedIncrease")),
initial_backoff_interval_("initial_backoff_interval"),
low_throughput_threshold_("low_throughput", DataRate::Zero()),
capacity_deviation_ratio_threshold_("cap_thr", 0.2),
capacity_limit_deviation_factor_("cap_lim", 1) {
low_throughput_threshold_("low_throughput", DataRate::Zero()) {
// E.g
// WebRTC-BweAimdRateControlConfig/initial_backoff_interval:100ms,
// low_throughput:50kbps/
@ -107,9 +105,6 @@ AimdRateControl::AimdRateControl(const WebRtcKeyValueConfig* key_value_config,
<< " " << ToString(*initial_backoff_interval_) << ".";
}
RTC_LOG(LS_INFO) << "Using aimd rate control with back off factor " << beta_;
ParseFieldTrial(
{&capacity_deviation_ratio_threshold_, &capacity_limit_deviation_factor_},
key_value_config->Lookup("WebRTC-Bwe-AimdRateControl-NetworkState"));
}
AimdRateControl::~AimdRateControl() {}
@ -306,12 +301,6 @@ DataRate AimdRateControl::ChangeBitrate(DataRate new_bitrate,
break;
case kRcDecrease:
// TODO(srte): Remove when |estimate_bounded_backoff_| has been validated.
if (network_estimate_ && capacity_deviation_ratio_threshold_ &&
!estimate_bounded_backoff_) {
estimated_throughput = std::max(estimated_throughput,
network_estimate_->link_capacity_lower);
}
if (estimated_throughput > low_throughput_threshold_) {
// Set bit rate to something slightly lower than the measured throughput
// to get rid of any self-induced delay.
@ -384,8 +373,7 @@ DataRate AimdRateControl::ClampBitrate(DataRate new_bitrate,
}
}
if (network_estimate_ &&
(estimate_bounded_increase_ || capacity_limit_deviation_factor_)) {
if (estimate_bounded_increase_ && network_estimate_) {
DataRate upper_bound = network_estimate_->link_capacity_upper;
new_bitrate = std::min(new_bitrate, upper_bound);
}

4
modules/remote_bitrate_estimator/aimd_rate_control.h
View File

@ -117,10 +117,6 @@ class AimdRateControl {
absl::optional<DataRate> last_decrease_;
FieldTrialOptional<TimeDelta> initial_backoff_interval_;
FieldTrialParameter<DataRate> low_throughput_threshold_;
// Deprecated, enable |estimate_bounded_backoff_| instead.
FieldTrialOptional<double> capacity_deviation_ratio_threshold_;
// Deprecated, enable |estimate_bounded_increase_| instead.
FieldTrialOptional<double> capacity_limit_deviation_factor_;
};
} // namespace webrtc