Remove expired WebRTC-Bwe-SubtractAdditionalBackoffTerm

Bug: webrtc:13402
Change-Id: Ia5a741fb7af753fbcbf00ece4f8e321c9b2655a2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/345721
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Emil Lundmark <lndmrk@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42028}
This commit is contained in:
Emil Lundmark 2024-04-04 13:51:19 +02:00 committed by WebRTC LUCI CQ
parent 91b1cfbfa0
commit d5c107d5d4
3 changed files with 2 additions and 10 deletions

View file

@ -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)),

View file

@ -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);
}

View file

@ -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<bool> use_current_estimate_as_min_upper_bound_{"c_upper",