From b93a7d7e05b096e9be4aadf7faf0e0068b5b703e Mon Sep 17 00:00:00 2001 From: Jonas Oreland Date: Thu, 9 Jan 2020 12:51:54 +0000 Subject: [PATCH] Revert "Add field trial to base stable target rate on loss based target rate" This reverts commit 63db77007bea78487af05d46b1b46106761556a1. Reason for revert: Flipped !=which should have been == makes tests Original change's description: > Add field trial to base stable target rate on loss based target rate > > I.e not the pushback_rate that includes the congestion window pushback > (if enabled). > > Bug: None > Change-Id: I413d011004a95da03dd62f5b423abc3c8b66b333 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165383 > Commit-Queue: Jonas Oreland > Reviewed-by: Rasmus Brandt > Reviewed-by: Sebastian Jansson > Cr-Commit-Position: refs/heads/master@{#30189} TBR=brandtr@webrtc.org,srte@webrtc.org,jonaso@webrtc.org Change-Id: I883edb8a74f1ae2a4d783b9825cc08c6a5228aa9 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165388 Reviewed-by: Jonas Oreland Commit-Queue: Jonas Oreland Cr-Commit-Position: refs/heads/master@{#30193} --- .../goog_cc/goog_cc_network_control.cc | 18 +++--------------- .../goog_cc/goog_cc_network_control.h | 1 - 2 files changed, 3 insertions(+), 16 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 293bd02b64..adb143375c 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -52,10 +52,6 @@ int64_t GetBpsOrDefault(const absl::optional& rate, } } -bool IsEnabled(const WebRtcKeyValueConfig* config, absl::string_view key) { - return config->Lookup(key).find("Enabled") != 0; -} - bool IsNotDisabled(const WebRtcKeyValueConfig* config, absl::string_view key) { return config->Lookup(key).find("Disabled") != 0; } @@ -76,8 +72,6 @@ GoogCcNetworkController::GoogCcNetworkController(NetworkControllerConfig config, "WebRTC-Bwe-IgnoreProbesLowerThanNetworkStateEstimate")), rate_control_settings_( RateControlSettings::ParseFromKeyValueConfig(key_value_config_)), - loss_based_stable_rate_( - IsEnabled(key_value_config_, "WebRTC-Bwe-LossBasedStableRate")), probe_controller_( new ProbeController(key_value_config_, config.event_log)), congestion_window_pushback_controller_( @@ -625,15 +619,9 @@ void GoogCcNetworkController::MaybeTriggerOnNetworkChanged( TargetTransferRate target_rate_msg; target_rate_msg.at_time = at_time; target_rate_msg.target_rate = pushback_target_rate; - if (loss_based_stable_rate_) { - target_rate_msg.stable_target_rate = - std::min(bandwidth_estimation_->GetEstimatedLinkCapacity(), - loss_based_target_rate); - } else { - target_rate_msg.stable_target_rate = - std::min(bandwidth_estimation_->GetEstimatedLinkCapacity(), - pushback_target_rate); - } + target_rate_msg.stable_target_rate = + std::min(bandwidth_estimation_->GetEstimatedLinkCapacity(), + pushback_target_rate); target_rate_msg.network_estimate.at_time = at_time; target_rate_msg.network_estimate.round_trip_time = round_trip_time; target_rate_msg.network_estimate.loss_rate_ratio = fraction_loss / 255.0f; 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 ae17b3ab39..f8970c808f 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h @@ -88,7 +88,6 @@ class GoogCcNetworkController : public NetworkControllerInterface { const bool use_min_allocatable_as_lower_bound_; const bool ignore_probes_lower_than_network_estimate_; const RateControlSettings rate_control_settings_; - const bool loss_based_stable_rate_; const std::unique_ptr probe_controller_; const std::unique_ptr