Bug 1851693 - Vendor libwebrtc from f80cf81435

Upstream commit: https://webrtc.googlesource.com/src/+/f80cf814353d11a9f22bef5ce5e8868f2c72f0d0 Changing the pre echo configuration default. Bug: webrtc:14205 Change-Id: I17add3bf19c599f170ffe98d0da0a561794591c1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/309481 Commit-Queue: Jesus de Vicente Pena <[email protected]> Reviewed-by: Per Åhgren <[email protected]> Cr-Commit-Position: refs/heads/main@{#40319}
jamienicol · Sep 19, 2023 · 80a81ea · 80a81ea
1 parent d445ace
commit 80a81ea
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit
@@ -24636,3 +24636,6 @@ e5ee43787a
 # MOZ_LIBWEBRTC_SRC=/Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
 # base of lastest vendoring
 ff58aed678
+# MOZ_LIBWEBRTC_SRC=/Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
+# base of lastest vendoring
+f80cf81435
diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla
@@ -16446,3 +16446,5 @@ libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc co
 libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-09-19T20:33:52.969505.
 # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
 libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-09-19T20:35:06.982164.
+# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-09-19T20:37:00.314247.
diff --git a/third_party/libwebrtc/modules/audio_processing/aec3/matched_filter.cc b/third_party/libwebrtc/modules/audio_processing/aec3/matched_filter.cc
@@ -109,14 +109,16 @@ size_t ComputePreEchoLag(
 }
 
 webrtc::MatchedFilter::PreEchoConfiguration FetchPreEchoConfiguration() {
-  float threshold = 0.5f;
-  int mode = 0;
+  constexpr float kDefaultThreshold = 0.5f;
+  constexpr int kDefaultMode = 3;
+  float threshold = kDefaultThreshold;
+  int mode = kDefaultMode;
   const std::string pre_echo_configuration_field_trial =
       webrtc::field_trial::FindFullName("WebRTC-Aec3PreEchoConfiguration");
   webrtc::FieldTrialParameter<double> threshold_field_trial_parameter(
-      /*key=*/"threshold", /*default_value=*/threshold);
+      /*key=*/"threshold", /*default_value=*/kDefaultThreshold);
   webrtc::FieldTrialParameter<int> mode_field_trial_parameter(
-      /*key=*/"mode", /*default_value=*/mode);
+      /*key=*/"mode", /*default_value=*/kDefaultMode);
   webrtc::ParseFieldTrial(
       {&threshold_field_trial_parameter, &mode_field_trial_parameter},
       pre_echo_configuration_field_trial);

diff --git a/third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_unittest.cc b/third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_unittest.cc
@@ -584,7 +584,7 @@ TEST(MatchedFilterFieldTrialTest, PreEchoConfigurationTest) {
 
 TEST(MatchedFilterFieldTrialTest, WrongPreEchoConfigurationTest) {
   constexpr float kDefaultThreshold = 0.5f;
-  constexpr int kDefaultMode = 0;
+  constexpr int kDefaultMode = 3;
   float threshold_in = -0.1f;
   int mode_in = 5;
   rtc::StringBuilder field_trial_name;