From 09831c9b0a079811f2a7c4d4091c5d9ea7955b78 Mon Sep 17 00:00:00 2001 From: Gustaf Ullberg Date: Wed, 22 Aug 2018 15:10:35 +0200 Subject: [PATCH] Correct audioproc_f to support the new echo canceller activation II 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: I0e1462fa6e35944f7dbb02580f1db09401c8f7c8 Reviewed-on: https://webrtc-review.googlesource.com/95484 Reviewed-by: Per Åhgren Commit-Queue: Gustaf Ullberg Cr-Commit-Position: refs/heads/master@{#24394} --- modules/audio_processing/test/aec_dump_based_simulator.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/audio_processing/test/aec_dump_based_simulator.cc b/modules/audio_processing/test/aec_dump_based_simulator.cc index f1c6ad3025..954e18acdd 100644 --- a/modules/audio_processing/test/aec_dump_based_simulator.cc +++ b/modules/audio_processing/test/aec_dump_based_simulator.cc @@ -281,8 +281,7 @@ void AecDumpBasedSimulator::HandleMessage( if (msg.has_aec_enabled() || settings_.use_aec) { bool enable = settings_.use_aec ? *settings_.use_aec : msg.aec_enabled(); - RTC_CHECK_EQ(AudioProcessing::kNoError, - ap_->echo_cancellation()->Enable(enable)); + apm_config.echo_canceller.enabled = enable; if (settings_.use_verbose_logging) { std::cout << " aec_enabled: " << (enable ? "true" : "false") << std::endl; @@ -341,8 +340,8 @@ void AecDumpBasedSimulator::HandleMessage( if (msg.has_aecm_enabled() || settings_.use_aecm) { bool enable = settings_.use_aecm ? *settings_.use_aecm : msg.aecm_enabled(); - RTC_CHECK_EQ(AudioProcessing::kNoError, - ap_->echo_control_mobile()->Enable(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") << std::endl;