From 48cc54e4cec31ab7b19a8918f96b974893d6d539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Fri, 1 Jul 2022 19:17:12 +0200 Subject: [PATCH] Remove code for unused field trial WebRTC-BweCappedProbing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I6799794659dce52f0d9f98dc1b5c63e0806d152d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267403 Auto-Submit: Erik Språng Reviewed-by: Philip Eliasson Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/main@{#37406} --- .../congestion_controller/goog_cc/probe_controller.cc | 9 +-------- modules/congestion_controller/goog_cc/probe_controller.h | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/modules/congestion_controller/goog_cc/probe_controller.cc b/modules/congestion_controller/goog_cc/probe_controller.cc index 59021109ba..e70f2b310c 100644 --- a/modules/congestion_controller/goog_cc/probe_controller.cc +++ b/modules/congestion_controller/goog_cc/probe_controller.cc @@ -65,9 +65,6 @@ constexpr double kProbeUncertainty = 0.05; constexpr char kBweRapidRecoveryExperiment[] = "WebRTC-BweRapidRecoveryExperiment"; -// Never probe higher than configured by OnMaxTotalAllocatedBitrate(). -constexpr char kCappedProbingFieldTrialName[] = "WebRTC-BweCappedProbing"; - void MaybeLogProbeClusterCreated(RtcEventLog* event_log, const ProbeClusterConfig& probe) { RTC_DCHECK(event_log); @@ -131,9 +128,6 @@ ProbeController::ProbeController(const FieldTrialsView* key_value_config, in_rapid_recovery_experiment_(absl::StartsWith( key_value_config->Lookup(kBweRapidRecoveryExperiment), "Enabled")), - limit_probes_with_allocateable_rate_(!absl::StartsWith( - key_value_config->Lookup(kCappedProbingFieldTrialName), - "Disabled")), event_log_(event_log), config_(ProbeControllerConfig(key_value_config)) { Reset(0); @@ -402,8 +396,7 @@ std::vector ProbeController::InitiateProbing( bool probe_further) { int64_t max_probe_bitrate_bps = max_bitrate_bps_ > 0 ? max_bitrate_bps_ : kDefaultMaxProbingBitrateBps; - if (limit_probes_with_allocateable_rate_ && - max_total_allocated_bitrate_ > 0) { + if (max_total_allocated_bitrate_ > 0) { // If a max allocated bitrate has been configured, allow probing up to 2x // that rate. This allows some overhead to account for bursty streams, // which otherwise would have to ramp up when the overshoot is already in diff --git a/modules/congestion_controller/goog_cc/probe_controller.h b/modules/congestion_controller/goog_cc/probe_controller.h index 3c1b62c30e..d71c045d2b 100644 --- a/modules/congestion_controller/goog_cc/probe_controller.h +++ b/modules/congestion_controller/goog_cc/probe_controller.h @@ -140,7 +140,6 @@ class ProbeController { int64_t max_total_allocated_bitrate_; const bool in_rapid_recovery_experiment_; - const bool limit_probes_with_allocateable_rate_; // For WebRTC.BWE.MidCallProbing.* metric. bool mid_call_probing_waiting_for_result_; int64_t mid_call_probing_bitrate_bps_;