From a7013ee65056fd45cecbd1659053e0bafcc6e460 Mon Sep 17 00:00:00 2001 From: Per Kjellander Date: Thu, 24 Nov 2022 15:01:49 +0100 Subject: [PATCH] Remove unused field trial WebRTC-Bwe-LossBasedStableRate Originally submitted here: https://webrtc.googlesource.com/src/+/350a82aec3556cfab385e41b67ab4f26f2fb0151 Bug: None Change-Id: Id464770b089122e2cf13ce2d841f7114aa9eb9d2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284942 Commit-Queue: Per Kjellander Reviewed-by: Jonas Oreland Commit-Queue: Jonas Oreland Auto-Submit: Per Kjellander Cr-Commit-Position: refs/heads/main@{#38726} --- .../goog_cc/goog_cc_network_control.cc | 8 +------- .../goog_cc/goog_cc_network_control.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc index dcbc15db74..be7027f88a 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -93,8 +93,6 @@ GoogCcNetworkController::GoogCcNetworkController(NetworkControllerConfig config, "WebRTC-Bwe-LimitProbesLowerThanThroughputEstimate")), rate_control_settings_( RateControlSettings::ParseFromKeyValueConfig(key_value_config_)), - loss_based_stable_rate_( - IsEnabled(key_value_config_, "WebRTC-Bwe-LossBasedStableRate")), pace_at_max_of_bwe_and_lower_link_capacity_( IsEnabled(key_value_config_, "WebRTC-Bwe-PaceAtMaxOfBweAndLowerLinkCapacity")), @@ -643,11 +641,7 @@ void GoogCcNetworkController::MaybeTriggerOnNetworkChanged( } DataRate stable_target_rate = bandwidth_estimation_->GetEstimatedLinkCapacity(); - if (loss_based_stable_rate_) { - stable_target_rate = std::min(stable_target_rate, loss_based_target_rate); - } else { - stable_target_rate = std::min(stable_target_rate, pushback_target_rate); - } + stable_target_rate = std::min(stable_target_rate, pushback_target_rate); if ((loss_based_target_rate != last_loss_based_target_rate_) || (fraction_loss != last_estimated_fraction_loss_) || diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.h b/modules/congestion_controller/goog_cc/goog_cc_network_control.h index 32526f8786..37a064e37c 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h @@ -93,7 +93,6 @@ class GoogCcNetworkController : public NetworkControllerInterface { const bool ignore_probes_lower_than_network_estimate_; const bool limit_probes_lower_than_throughput_estimate_; const RateControlSettings rate_control_settings_; - const bool loss_based_stable_rate_; const bool pace_at_max_of_bwe_and_lower_link_capacity_; const std::unique_ptr probe_controller_;