From c651e0e86d3425857fe7637ddda377621d0a6373 Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Sun, 16 Jun 2024 12:22:21 +0000
Subject: [PATCH] Bug 1897501 - Vendor libwebrtc from d5c107d5d4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream commit: https://webrtc.googlesource.com/src/+/d5c107d5d4d5091adaab43b0ee9f635b5311b4b1
    Remove expired WebRTC-Bwe-SubtractAdditionalBackoffTerm

    Bug: webrtc:13402
    Change-Id: Ia5a741fb7af753fbcbf00ece4f8e321c9b2655a2
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/345721
    Reviewed-by: Björn Terelius <tereliuswebrtc.org>
    Commit-Queue: Emil Lundmark <lndmrkwebrtc.org>
    Cr-Commit-Position: refs/heads/main{#42028}

UltraBlame original commit: c0a57fd27b4e2ca0d707412e061eb6f28dde9daa
---
 third_party/libwebrtc/README.moz-ff-commit    | 49 +++++++++++
 third_party/libwebrtc/README.mozilla          | 88 +++++++++++++++++++
 .../libwebrtc/experiments/field_trials.py     | 24 -----
 .../aimd_rate_control.cc                      | 19 ----
 .../aimd_rate_control.h                       |  4 -
 5 files changed, 137 insertions(+), 47 deletions(-)

diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit
index 84cc4ca9faf4..8f0bced55508 100644
--- a/third_party/libwebrtc/README.moz-ff-commit
+++ b/third_party/libwebrtc/README.moz-ff-commit
@@ -465005,3 +465005,52 @@ of
 lastest
 vendoring
 91b1cfbfa0
+#
+MOZ_LIBWEBRTC_SRC
+=
+/
+home
+/
+mfroman
+/
+mozilla
+/
+moz
+-
+central
+/
+.
+moz
+-
+fast
+-
+forward
+/
+moz
+-
+libwebrtc
+MOZ_LIBWEBRTC_BRANCH
+=
+mozpatches
+bash
+dom
+/
+media
+/
+webrtc
+/
+third_party_build
+/
+fast
+-
+forward
+-
+libwebrtc
+.
+sh
+#
+base
+of
+lastest
+vendoring
+d5c107d5d4
diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla
index e83376378501..48590ab5ada3 100644
--- a/third_party/libwebrtc/README.mozilla
+++ b/third_party/libwebrtc/README.mozilla
@@ -769024,3 +769024,91 @@ on
 .
 709538
 .
+#
+.
+/
+mach
+python
+dom
+/
+media
+/
+webrtc
+/
+third_party_build
+/
+vendor
+-
+libwebrtc
+.
+py
+-
+-
+from
+-
+local
+/
+home
+/
+mfroman
+/
+mozilla
+/
+moz
+-
+central
+/
+.
+moz
+-
+fast
+-
+forward
+/
+moz
+-
+libwebrtc
+-
+-
+commit
+mozpatches
+libwebrtc
+libwebrtc
+updated
+from
+/
+home
+/
+mfroman
+/
+mozilla
+/
+moz
+-
+central
+/
+.
+moz
+-
+fast
+-
+forward
+/
+moz
+-
+libwebrtc
+commit
+mozpatches
+on
+2024
+-
+05
+-
+18T03
+:
+41
+:
+16
+.
+602951
+.
diff --git a/third_party/libwebrtc/experiments/field_trials.py b/third_party/libwebrtc/experiments/field_trials.py
index bdc5d8ee0dab..f99abaa62723 100644
--- a/third_party/libwebrtc/experiments/field_trials.py
+++ b/third_party/libwebrtc/experiments/field_trials.py
@@ -244,30 +244,6 @@
 )
 )
     
-FieldTrial
-(
-'
-WebRTC
--
-Bwe
--
-SubtractAdditionalBackoffTerm
-'
-               
-'
-webrtc
-:
-13402
-'
-               
-date
-(
-2024
-4
-1
-)
-)
-    
 FieldTrial
 (
 '
diff --git a/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc b/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc
index cf4b76c2661f..7dd07e7f36e5 100644
--- a/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc
+++ b/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc
@@ -457,22 +457,6 @@ DontIncreaseDelayBasedBweInAlr
 "
 )
 )
-subtract_additional_backoff_term_
-(
-!
-key_value_config
-.
-IsDisabled
-(
-"
-WebRTC
--
-Bwe
--
-SubtractAdditionalBackoffTerm
-"
-)
-)
 {
 ParseFieldTrial
 (
@@ -1455,9 +1439,6 @@ KilobitsPerSec
 (
 5
 )
-&
-&
-subtract_additional_backoff_term_
 )
 {
 decreased_bitrate
diff --git a/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control.h b/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
index 784d901337da..e30105e04d6a 100644
--- a/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
+++ b/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
@@ -374,10 +374,6 @@ const
 bool
 no_bitrate_increase_in_alr_
 ;
-const
-bool
-subtract_additional_backoff_term_
-;
 FieldTrialFlag
 disable_estimate_bounded_increase_
 {