From b1b2840171107366a6909a86825251db42a6e5a7 Mon Sep 17 00:00:00 2001 From: Per Kjellander Date: Fri, 2 Dec 2022 16:00:18 +0100 Subject: [PATCH] Remove field trial string WebRTC-Bwe-EstimateBoundedBackoff The feature is per default enabled. Bug: webrtc:10498 Change-Id: I21787fad77eba58cd4405e91bb2dcff39003bb9c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/285884 Commit-Queue: Per Kjellander Reviewed-by: Diep Bui Cr-Commit-Position: refs/heads/main@{#38823} --- modules/remote_bitrate_estimator/aimd_rate_control.cc | 10 +--------- modules/remote_bitrate_estimator/aimd_rate_control.h | 3 --- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/modules/remote_bitrate_estimator/aimd_rate_control.cc b/modules/remote_bitrate_estimator/aimd_rate_control.cc index c8c7ca92fb..6c3638b59f 100644 --- a/modules/remote_bitrate_estimator/aimd_rate_control.cc +++ b/modules/remote_bitrate_estimator/aimd_rate_control.cc @@ -39,10 +39,6 @@ bool IsEnabled(const FieldTrialsView& field_trials, absl::string_view key) { return absl::StartsWith(field_trials.Lookup(key), "Enabled"); } -bool IsNotDisabled(const FieldTrialsView& field_trials, absl::string_view key) { - return !absl::StartsWith(field_trials.Lookup(key), "Disabled"); -} - double ReadBackoffFactor(const FieldTrialsView& key_value_config) { std::string experiment_string = key_value_config.Lookup(kBweBackOffFactorExperiment); @@ -89,9 +85,6 @@ AimdRateControl::AimdRateControl(const FieldTrialsView* key_value_config, no_bitrate_increase_in_alr_( IsEnabled(*key_value_config, "WebRTC-DontIncreaseDelayBasedBweInAlr")), - estimate_bounded_backoff_( - IsNotDisabled(*key_value_config, - "WebRTC-Bwe-EstimateBoundedBackoff")), initial_backoff_interval_("initial_backoff_interval"), link_capacity_fix_("link_capacity_fix") { ParseFieldTrial( @@ -381,8 +374,7 @@ DataRate AimdRateControl::ClampBitrate(DataRate new_bitrate) const { } new_bitrate = std::min(upper_bound, new_bitrate); } - if (estimate_bounded_backoff_ && network_estimate_ && - network_estimate_->link_capacity_lower.IsFinite() && + if (network_estimate_ && network_estimate_->link_capacity_lower.IsFinite() && new_bitrate < current_bitrate_) { new_bitrate = std::min( current_bitrate_, diff --git a/modules/remote_bitrate_estimator/aimd_rate_control.h b/modules/remote_bitrate_estimator/aimd_rate_control.h index ce226c9f28..8321fd5239 100644 --- a/modules/remote_bitrate_estimator/aimd_rate_control.h +++ b/modules/remote_bitrate_estimator/aimd_rate_control.h @@ -103,9 +103,6 @@ class AimdRateControl { // Allow the delay based estimate to only increase as long as application // limited region (alr) is not detected. const bool no_bitrate_increase_in_alr_; - // Use estimated link capacity lower bound if it is higher than the - // acknowledged rate when backing off due to overuse. - const bool estimate_bounded_backoff_; // If false, uses estimated link capacity upper bound * // `estimate_bounded_increase_ratio_` as upper limit for the estimate. FieldTrialFlag disable_estimate_bounded_increase_{"Disabled"};