commit 2fbb83b16b4c2c1712cbe898ca3ba42d6da3e96f
author Sam Zackrisson <saza@webrtc.org> Fri Sep 28 12:40:47 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Sep 28 11:11:44 2018 +0000
tree c442e833fcb13ac49c4e517da5656a265a9c4eb6
parent d9664b8249882b114c46da6931a046cf82289085

Remove APM-internal usage of EchoControlMobile

This is a sibling CL to a similar one for EchoCancellation:
https://webrtc-review.googlesource.com/c/src/+/97603

 - EchoControlMobileImpl will no longer inherit EchoControlMobile.
 - Removes usage of AudioProcessing::echo_control_mobile() inside most of
   the audio processing module and unit tests.

The CL breaks audioproc_f backwards compatibility: It can no longer
use all recorded settings (comfort noise, routing mode), but prints an
error message when unsupported settings are encountered.

Tested: audioproc_f with .wav and aecdump inputs.
Bug: webrtc:9535
Change-Id: I63c3c81bcaf44021315978e1a0f3e42173b988ce
Reviewed-on: https://webrtc-review.googlesource.com/101621
Reviewed-by: Alex Loiko <aleloi@webrtc.org>
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24888}

modules/audio_processing/echo_control_mobile_proxy.cc

diff --git a/modules/audio_processing/echo_control_mobile_proxy.cc b/modules/audio_processing/echo_control_mobile_proxy.cc
index fd29834..e3909db 100644
--- a/modules/audio_processing/echo_control_mobile_proxy.cc
+++ b/modules/audio_processing/echo_control_mobile_proxy.cc
@@ -10,20 +10,19 @@
 
 #include "modules/audio_processing/echo_control_mobile_proxy.h"
 
+#include "rtc_base/logging.h"
+
 namespace webrtc {
 
 EchoControlMobileProxy::EchoControlMobileProxy(
     AudioProcessing* audio_processing,
-    EchoControlMobile* echo_control_mobile)
+    EchoControlMobileImpl* echo_control_mobile)
     : audio_processing_(audio_processing),
       echo_control_mobile_(echo_control_mobile) {}
 
 EchoControlMobileProxy::~EchoControlMobileProxy() = default;
 
 int EchoControlMobileProxy::Enable(bool enable) {
-  // Change the config in APM to mirror the applied settings.
-  // TODO(bugs.webrtc.org/9535): Remove the call to EchoControlMobile::Enable
-  // when APM starts taking the config into account.
   AudioProcessing::Config apm_config = audio_processing_->GetConfig();
   bool aecm_enabled = apm_config.echo_canceller.enabled &&
                       apm_config.echo_canceller.mobile_mode;
@@ -32,7 +31,6 @@
     apm_config.echo_canceller.mobile_mode = true;
     audio_processing_->ApplyConfig(apm_config);
   }
-  echo_control_mobile_->Enable(enable);
   return AudioProcessing::kNoError;
 }
 
@@ -41,29 +39,31 @@
 }
 
 int EchoControlMobileProxy::set_routing_mode(RoutingMode mode) {
-  return echo_control_mobile_->set_routing_mode(mode);
+  RTC_LOG(LS_ERROR) << "Ignoring deprecated setting: AECM routing mode";
+  return AudioProcessing::kUnsupportedFunctionError;
 }
 
 EchoControlMobile::RoutingMode EchoControlMobileProxy::routing_mode() const {
-  return echo_control_mobile_->routing_mode();
+  return EchoControlMobile::kSpeakerphone;
 }
 
 int EchoControlMobileProxy::enable_comfort_noise(bool enable) {
-  return echo_control_mobile_->enable_comfort_noise(enable);
+  RTC_LOG(LS_ERROR) << "Ignoring deprecated setting: AECM comfort noise";
+  return AudioProcessing::kUnsupportedFunctionError;
 }
 
 bool EchoControlMobileProxy::is_comfort_noise_enabled() const {
-  return echo_control_mobile_->is_comfort_noise_enabled();
+  return false;
 }
 
 int EchoControlMobileProxy::SetEchoPath(const void* echo_path,
                                         size_t size_bytes) {
-  return echo_control_mobile_->SetEchoPath(echo_path, size_bytes);
+  return AudioProcessing::kUnsupportedFunctionError;
 }
 
 int EchoControlMobileProxy::GetEchoPath(void* echo_path,
                                         size_t size_bytes) const {
-  return echo_control_mobile_->GetEchoPath(echo_path, size_bytes);
+  return AudioProcessing::kUnsupportedFunctionError;
 }
 
 }  // namespace webrtc