diff --git a/experiments/field_trials.py b/experiments/field_trials.py index 8274c03a8d..77e22ee5ca 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -53,9 +53,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ FieldTrial('WebRTC-Av1-GetEncoderInfoOverride', 'webrtc:14931', date(2024, 4, 1)), - FieldTrial('WebRTC-Bwe-SubtractAdditionalBackoffTerm', - 'webrtc:13402', - date(2024, 4, 1)), FieldTrial('WebRTC-DataChannelMessageInterleaving', 'webrtc:5696', date(2024, 10, 1)), diff --git a/modules/remote_bitrate_estimator/aimd_rate_control.cc b/modules/remote_bitrate_estimator/aimd_rate_control.cc index fde66657e7..576d307cac 100644 --- a/modules/remote_bitrate_estimator/aimd_rate_control.cc +++ b/modules/remote_bitrate_estimator/aimd_rate_control.cc @@ -79,9 +79,7 @@ AimdRateControl::AimdRateControl(const FieldTrialsView& key_value_config, rtt_(kDefaultRtt), send_side_(send_side), no_bitrate_increase_in_alr_( - key_value_config.IsEnabled("WebRTC-DontIncreaseDelayBasedBweInAlr")), - subtract_additional_backoff_term_(!key_value_config.IsDisabled( - "WebRTC-Bwe-SubtractAdditionalBackoffTerm")) { + key_value_config.IsEnabled("WebRTC-DontIncreaseDelayBasedBweInAlr")) { ParseFieldTrial( {&disable_estimate_bounded_increase_, &use_current_estimate_as_min_upper_bound_}, @@ -289,8 +287,7 @@ void AimdRateControl::ChangeBitrate(const RateControlInput& input, // Set bit rate to something slightly lower than the measured throughput // to get rid of any self-induced delay. decreased_bitrate = estimated_throughput * beta_; - if (decreased_bitrate > DataRate::KilobitsPerSec(5) && - subtract_additional_backoff_term_) { + if (decreased_bitrate > DataRate::KilobitsPerSec(5)) { decreased_bitrate -= DataRate::KilobitsPerSec(5); } diff --git a/modules/remote_bitrate_estimator/aimd_rate_control.h b/modules/remote_bitrate_estimator/aimd_rate_control.h index c9edc4f551..b7a8ef6e53 100644 --- a/modules/remote_bitrate_estimator/aimd_rate_control.h +++ b/modules/remote_bitrate_estimator/aimd_rate_control.h @@ -103,8 +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_; - // If true, subtract an additional 5kbps when backing off. - const bool subtract_additional_backoff_term_; // If "Disabled", estimated link capacity is not used as upper bound. FieldTrialFlag disable_estimate_bounded_increase_{"Disabled"}; FieldTrialParameter use_current_estimate_as_min_upper_bound_{"c_upper",