commit 510f68494fcd6a037eff99df9fd56ea9b27beafb parent 1c19821d409dc7a17c5879d2578342798eb02341 Author: Dan Baker <dbaker@mozilla.com> Date: Mon, 1 Dec 2025 21:23:20 -0700 Bug 2000941 - Vendor libwebrtc from 2f7b443761 Upstream commit: https://webrtc.googlesource.com/src/+/2f7b4437610a1b1d8460c49b73df7cc5e322c21c Make ANDROID not use the AEC mobile. It will use AEC3 by default Bug: webrtc:379762006 Change-Id: I69d5f3492f0193caf231c555b85f46769f66be49 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/406121 Reviewed-by: Sam Zackrisson <saza@webrtc.org> Commit-Queue: Lionel Koenig <lionelk@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45667} Diffstat:
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./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 2025-12-02T04:19:13.093496+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T04:23:06.105596+00:00. # base of lastest vendoring -03a4c626c8 +2f7b443761 diff --git a/third_party/libwebrtc/media/engine/webrtc_voice_engine.cc b/third_party/libwebrtc/media/engine/webrtc_voice_engine.cc @@ -604,10 +604,6 @@ void WebRtcVoiceEngine::ApplyOptions(const AudioOptions& options_in) { << options_in.ToString(); AudioOptions options = options_in; // The options are modified below. - // Set and adjust echo canceller options. - // Use desktop AEC by default, when not using hardware AEC. - bool use_mobile_software_aec = false; - #if defined(WEBRTC_IOS) if (options.ios_force_software_aec_HACK && *options.ios_force_software_aec_HACK) { @@ -621,8 +617,6 @@ void WebRtcVoiceEngine::ApplyOptions(const AudioOptions& options_in) { options.echo_cancellation = false; RTC_LOG(LS_INFO) << "Always disable AEC on iOS. Use built-in instead."; } -#elif defined(WEBRTC_ANDROID) - use_mobile_software_aec = true; #endif // Set and adjust gain control options. @@ -725,7 +719,6 @@ void WebRtcVoiceEngine::ApplyOptions(const AudioOptions& options_in) { if (options.echo_cancellation) { apm_config.echo_canceller.enabled = *options.echo_cancellation; - apm_config.echo_canceller.mobile_mode = use_mobile_software_aec; } if (options.auto_gain_control) { diff --git a/third_party/libwebrtc/media/engine/webrtc_voice_engine_unittest.cc b/third_party/libwebrtc/media/engine/webrtc_voice_engine_unittest.cc @@ -881,14 +881,8 @@ class WebRtcVoiceEngineTestFake : public ::testing::TestWithParam<bool> { } void VerifyEchoCancellationSettings(bool enabled) { - constexpr bool kDefaultUseAecm = -#if defined(WEBRTC_ANDROID) - true; -#else - false; -#endif EXPECT_EQ(apm_config_.echo_canceller.enabled, enabled); - EXPECT_EQ(apm_config_.echo_canceller.mobile_mode, kDefaultUseAecm); + EXPECT_EQ(apm_config_.echo_canceller.mobile_mode, false); } bool IsHighPassFilterEnabled() {