From 039288c284c895d71911c73401852a388f30c8d0 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Wed, 17 Apr 2024 13:21:50 +0200
Subject: [PATCH] Delete expired field trial WebRTC-Bwe-LinkCapacity

Bug: webrtc:9718
Change-Id: I7ac3712a2008411a80f4739bfa4eeebe5097eb75
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/347742
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42097}
---
 experiments/field_trials.py                           |  5 +----
 .../goog_cc/send_side_bandwidth_estimation.cc         | 11 ++---------
 .../goog_cc/send_side_bandwidth_estimation.h          |  5 ++---
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/experiments/field_trials.py b/experiments/field_trials.py
index 4dca8a6644..406b249ccd 100755
--- a/experiments/field_trials.py
+++ b/experiments/field_trials.py
@@ -508,9 +508,6 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
     FieldTrial('WebRTC-Bwe-LimitProbesLowerThanThroughputEstimate',
                'webrtc:11498',
                date(2024, 4, 1)),
-    FieldTrial('WebRTC-Bwe-LinkCapacity',
-               'webrtc:9718',
-               date(2024, 4, 1)),
     FieldTrial('WebRTC-Bwe-LossBasedBweV2',
                'webrtc:12707',
                date(2024, 4, 1)),
@@ -896,7 +893,7 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
 ])  # yapf: disable
 
 POLICY_EXEMPT_FIELD_TRIALS_DIGEST: str = \
-    '785cfbd78860c15c840e509f4859e2b20bf8f250'
+    'ac66aba5d08866be534a452b59c3de627bf38f3e'
 
 REGISTERED_FIELD_TRIALS: FrozenSet[FieldTrial] = ACTIVE_FIELD_TRIALS.union(
     POLICY_EXEMPT_FIELD_TRIALS)
diff --git a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc
index 7b305f12f1..43d4837e04 100644
--- a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc
+++ b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc
@@ -113,14 +113,6 @@ bool ReadBweLossExperimentParameters(float* low_loss_threshold,
 }
 }  // namespace
 
-LinkCapacityTracker::LinkCapacityTracker()
-    : tracking_rate("rate", TimeDelta::Seconds(10)) {
-  ParseFieldTrial({&tracking_rate},
-                  field_trial::FindFullName("WebRTC-Bwe-LinkCapacity"));
-}
-
-LinkCapacityTracker::~LinkCapacityTracker() {}
-
 void LinkCapacityTracker::UpdateDelayBasedEstimate(
     Timestamp at_time,
     DataRate delay_based_bitrate) {
@@ -145,7 +137,8 @@ void LinkCapacityTracker::OnRateUpdate(absl::optional<DataRate> acknowledged,
   DataRate acknowledged_target = std::min(*acknowledged, target);
   if (acknowledged_target.bps() > capacity_estimate_bps_) {
     TimeDelta delta = at_time - last_link_capacity_update_;
-    double alpha = delta.IsFinite() ? exp(-(delta / tracking_rate.Get())) : 0;
+    double alpha =
+        delta.IsFinite() ? exp(-(delta / TimeDelta::Seconds(10))) : 0;
     capacity_estimate_bps_ = alpha * capacity_estimate_bps_ +
                              (1 - alpha) * acknowledged_target.bps<double>();
   }
diff --git a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h
index 1d919af7b6..4d0b42a9cf 100644
--- a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h
+++ b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h
@@ -37,8 +37,8 @@ class RtcEventLog;
 
 class LinkCapacityTracker {
  public:
-  LinkCapacityTracker();
-  ~LinkCapacityTracker();
+  LinkCapacityTracker() = default;
+  ~LinkCapacityTracker() = default;
   // Call when a new delay-based estimate is available.
   void UpdateDelayBasedEstimate(Timestamp at_time,
                                 DataRate delay_based_bitrate);
@@ -50,7 +50,6 @@ class LinkCapacityTracker {
   DataRate estimate() const;
 
  private:
-  FieldTrialParameter<TimeDelta> tracking_rate;
   double capacity_estimate_bps_ = 0;
   Timestamp last_link_capacity_update_ = Timestamp::MinusInfinity();
   DataRate last_delay_based_estimate_ = DataRate::PlusInfinity();