From 370c050ecdfb745707dc3ab324878fa16aba1750 Mon Sep 17 00:00:00 2001 From: Gustaf Ullberg Date: Thu, 23 Aug 2018 11:41:29 +0200 Subject: [PATCH] Correct audioproc_f to support the new echo canceller activation III MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The introduction of the new AEC proxies caused audioproc_f to fail. This CL corrects audioproc_f so that the AEC2 and AECM echo cancellers are properly activated using the new AEC proxies. Bug: webrtc:9535 Change-Id: I48b9deaad873aee597f56ebd33814420024e0d58 Reviewed-on: https://webrtc-review.googlesource.com/95645 Reviewed-by: Per Åhgren Commit-Queue: Gustaf Ullberg Cr-Commit-Position: refs/heads/master@{#24405} --- modules/audio_processing/test/aec_dump_based_simulator.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/audio_processing/test/aec_dump_based_simulator.cc b/modules/audio_processing/test/aec_dump_based_simulator.cc index 954e18acdd..fe7197c175 100644 --- a/modules/audio_processing/test/aec_dump_based_simulator.cc +++ b/modules/audio_processing/test/aec_dump_based_simulator.cc @@ -340,7 +340,7 @@ void AecDumpBasedSimulator::HandleMessage( if (msg.has_aecm_enabled() || settings_.use_aecm) { bool enable = settings_.use_aecm ? *settings_.use_aecm : msg.aecm_enabled(); - apm_config.echo_canceller.enabled = enable; + apm_config.echo_canceller.enabled |= enable; apm_config.echo_canceller.mobile_mode = enable; if (settings_.use_verbose_logging) { std::cout << " aecm_enabled: " << (enable ? "true" : "false")