Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 11 insertions, 14 deletions

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 97fa490adf..c9edc4f551 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
@@ -108,7 +108,7 @@ class AimdRateControl {
   // If "Disabled",  estimated link capacity is not used as upper bound.
   FieldTrialFlag disable_estimate_bounded_increase_{"Disabled"};
   FieldTrialParameter<bool> use_current_estimate_as_min_upper_bound_{"c_upper",
-                                                                     false};
+                                                                     true};
   absl::optional<DataRate> last_decrease_;
 };
 }  // namespace webrtc
diff --git a/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc b/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc
index f26afe995c..401e87e310 100644
--- a/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc
+++ b/third_party/libwebrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc
@@ -208,6 +208,7 @@ TEST(AimdRateControlTest, SetEstimateIncreaseBweInAlr) {
 TEST(AimdRateControlTest, SetEstimateUpperLimitedByNetworkEstimate) {
   AimdRateControl aimd_rate_control(ExplicitKeyValueConfig(""),
                                     /*send_side=*/true);
+  aimd_rate_control.SetEstimate(DataRate::BitsPerSec(300'000), kInitialTime);
   NetworkStateEstimate network_estimate;
   network_estimate.link_capacity_upper = DataRate::BitsPerSec(400'000);
   aimd_rate_control.SetNetworkStateEstimate(network_estimate);
@@ -217,11 +218,9 @@ TEST(AimdRateControlTest, SetEstimateUpperLimitedByNetworkEstimate) {
 }
 
 TEST(AimdRateControlTest,
-     SetEstimateUpperLimitedByCurrentBitrateIfNetworkEstimateIsLow) {
-  AimdRateControl aimd_rate_control(
-      ExplicitKeyValueConfig(
-          "WebRTC-Bwe-EstimateBoundedIncrease/c_upper:true/"),
-      /*send_side=*/true);
+     SetEstimateDefaultUpperLimitedByCurrentBitrateIfNetworkEstimateIsLow) {
+  AimdRateControl aimd_rate_control(ExplicitKeyValueConfig(""),
+                                    /*send_side=*/true);
   aimd_rate_control.SetEstimate(DataRate::BitsPerSec(500'000), kInitialTime);
   ASSERT_EQ(aimd_rate_control.LatestEstimate(), DataRate::BitsPerSec(500'000));
 
@@ -233,9 +232,12 @@ TEST(AimdRateControlTest,
 }
 
 TEST(AimdRateControlTest,
-     SetEstimateDefaultNotUpperLimitedByCurrentBitrateIfNetworkEstimateIsLow) {
-  AimdRateControl aimd_rate_control(ExplicitKeyValueConfig(""),
-                                    /*send_side=*/true);
+     SetEstimateNotUpperLimitedByCurrentBitrateIfNetworkEstimateIsLowIf) {
+  AimdRateControl aimd_rate_control(
+      ExplicitKeyValueConfig(
+          "WebRTC-Bwe-EstimateBoundedIncrease/c_upper:false/"),
+      /*send_side=*/true);
+
   aimd_rate_control.SetEstimate(DataRate::BitsPerSec(500'000), kInitialTime);
   ASSERT_EQ(aimd_rate_control.LatestEstimate(), DataRate::BitsPerSec(500'000));
 
diff --git a/third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build b/third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
index 2876755e91..45104d15ca 100644
--- a/third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
+++ b/third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
@@ -211,7 +211,6 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
 
     OS_LIBS += [
-        "android_support",
         "unwind"
     ]
 
@@ -221,10 +220,6 @@ if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
         "-msse2"
     ]
 
-    OS_LIBS += [
-        "android_support"
-    ]
-
 if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 
     DEFINES["_GNU_SOURCE"] = True