commit b0890f33e67fb78675103641f314f3def5d48a54 parent 3f0ce89d9c13d14e2aa71f12b2b60d65892d674a Author: Dan Baker <dbaker@mozilla.com> Date: Tue, 2 Dec 2025 00:37:51 -0700 Bug 2000941 - Vendor libwebrtc from 181c224ec0 Upstream commit: https://webrtc.googlesource.com/src/+/181c224ec0c0fd6aa62b3bbf0d5f11fbf84897dd Delete unused killswitch for AEC3 multichannel config The flag was added in 2019 and hasn't to my knowledge been needed. It's safe to delete. Bug: webrtc:442444736, b:428638881 Change-Id: Iace278f99779d6980e9e689a5aac2d73f388489b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/411743 Reviewed-by: Jesus de Vicente Pena <devicentepena@webrtc.org> Commit-Queue: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45738} Diffstat:
3 files changed, 5 insertions(+), 18 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-02T07:35:13.421441+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T07:37:37.149253+00:00. # base of lastest vendoring -bddcd98747 +181c224ec0 diff --git a/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc b/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc @@ -30,6 +30,7 @@ #include "api/audio/audio_view.h" #include "api/audio/echo_canceller3_config.h" #include "api/audio/echo_control.h" +#include "api/audio/neural_residual_echo_estimator.h" #include "api/environment/environment.h" #include "api/field_trials_view.h" #include "api/scoped_refptr.h" @@ -86,14 +87,6 @@ bool EnforceSplitBandHpf(const FieldTrialsView& field_trials) { return field_trials.IsEnabled("WebRTC-FullBandHpfKillSwitch"); } -// Checks whether AEC3 should be allowed to decide what the default -// configuration should be based on the render and capture channel configuration -// at hand. -bool UseSetupSpecificDefaultAec3Congfig(const FieldTrialsView& field_trials) { - return !field_trials.IsEnabled( - "WebRTC-Aec3SetupSpecificDefaultConfigDefaultsKillSwitch"); -} - // Identify the native processing rate that best handles a sample rate. int SuitableProcessRate(int minimum_rate, int max_splitting_rate, @@ -460,8 +453,6 @@ AudioProcessingImpl::AudioProcessingImpl( std::unique_ptr<NeuralResidualEchoEstimator> neural_residual_echo_estimator) : env_(env), data_dumper_(new ApmDataDumper(instance_count_.fetch_add(1) + 1)), - use_setup_specific_default_aec3_config_( - UseSetupSpecificDefaultAec3Congfig(env.field_trials())), capture_runtime_settings_(RuntimeSettingQueueSize()), render_runtime_settings_(RuntimeSettingQueueSize()), capture_runtime_settings_enqueuer_(&capture_runtime_settings_), @@ -1925,11 +1916,8 @@ void AudioProcessingImpl::InitializeEchoController() { RTC_DCHECK(submodules_.echo_controller); } else { EchoCanceller3Config config; - std::optional<EchoCanceller3Config> multichannel_config; - if (use_setup_specific_default_aec3_config_) { - multichannel_config = - EchoCanceller3Config::CreateDefaultMultichannelConfig(); - } + std::optional<EchoCanceller3Config> multichannel_config = + EchoCanceller3Config::CreateDefaultMultichannelConfig(); submodules_.echo_controller = std::make_unique<EchoCanceller3>( env_, config, multichannel_config, submodules_.neural_residual_echo_estimator.get(), diff --git a/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.h b/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.h @@ -184,7 +184,6 @@ class AudioProcessingImpl : public AudioProcessing { const Environment env_; const std::unique_ptr<ApmDataDumper> data_dumper_; static std::atomic<int> instance_count_; - const bool use_setup_specific_default_aec3_config_; SwapQueue<RuntimeSetting> capture_runtime_settings_; SwapQueue<RuntimeSetting> render_runtime_settings_;