commit 370c050ecdfb745707dc3ab324878fa16aba1750
author Gustaf Ullberg <gustaf@webrtc.org> Thu Aug 23 09:41:29 2018
committer Commit Bot <commit-bot@chromium.org> Thu Aug 23 13:48:33 2018
tree ca58bb90112594b34ccc5b3515c513b280063c7b
parent 1f262cc5da79ad35aac683f8209491f133210bda

Correct audioproc_f to support the new echo canceller activation III

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 <peah@webrtc.org>
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24405}

modules/audio_processing/test/aec_dump_based_simulator.cc

diff --git a/modules/audio_processing/test/aec_dump_based_simulator.cc b/modules/audio_processing/test/aec_dump_based_simulator.cc
index 954e18a..fe7197c 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 @@
     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")