From c40cf325b7db6d7c1871aacbe09167af9fb62749 Mon Sep 17 00:00:00 2001 From: Diep Bui Date: Mon, 14 Nov 2022 11:37:58 +0000 Subject: [PATCH] Remove flag PaceAtLossBaseBweWhenLoss as it is not used. Change-Id: Ie08745e302c1fe582d4ed3b86e96d7a95d021d78 Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/283361 Reviewed-by: Per Kjellander Commit-Queue: Diep Bui Cr-Commit-Position: refs/heads/main@{#38632} --- .../goog_cc/goog_cc_network_control.cc | 7 +------ .../goog_cc/goog_cc_network_control.h | 1 - 2 files changed, 1 insertion(+), 7 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 842bb58184..033094f7fd 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -85,8 +85,6 @@ GoogCcNetworkController::GoogCcNetworkController(NetworkControllerConfig config, pace_at_max_of_bwe_and_lower_link_capacity_( IsEnabled(key_value_config_, "WebRTC-Bwe-PaceAtMaxOfBweAndLowerLinkCapacity")), - pace_at_loss_based_bwe_when_loss_( - IsEnabled(key_value_config_, "WebRTC-Bwe-PaceAtLossBaseBweWhenLoss")), probe_controller_( new ProbeController(key_value_config_, config.event_log)), congestion_window_pushback_controller_( @@ -688,10 +686,7 @@ PacerConfig GoogCcNetworkController::GetPacingRates(Timestamp at_time) const { // Pacing rate is based on target rate before congestion window pushback, // because we don't want to build queues in the pacer when pushback occurs. DataRate pacing_rate = DataRate::Zero(); - if ((pace_at_max_of_bwe_and_lower_link_capacity_ || - (pace_at_loss_based_bwe_when_loss_ && - last_loss_based_target_rate_ >= delay_based_bwe_->last_estimate())) && - estimate_) { + if (pace_at_max_of_bwe_and_lower_link_capacity_ && estimate_) { pacing_rate = std::max({min_total_allocated_bitrate_, estimate_->link_capacity_lower, last_loss_based_target_rate_}) * 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 1b9f962732..32526f8786 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h @@ -95,7 +95,6 @@ class GoogCcNetworkController : public NetworkControllerInterface { const RateControlSettings rate_control_settings_; const bool loss_based_stable_rate_; const bool pace_at_max_of_bwe_and_lower_link_capacity_; - const bool pace_at_loss_based_bwe_when_loss_; const std::unique_ptr probe_controller_; const std::unique_ptr