Revert "Remove APM-internal usage of EchoControlMobile"
This reverts commit 2fbb83b16b4c2c1712cbe898ca3ba42d6da3e96f.
Reason for revert: Speculative revert over failing Chromium bot:
https://ci.chromium.org/p/chromium/builders/luci.chromium.webrtc.fyi/WebRTC%20Chromium%20FYI%20Android%20Tests%20%28dbg%29%20%28M%20Nexus5X%29/117
Original change's description:
> 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}
TBR=saza@webrtc.org,aleloi@webrtc.org
Change-Id: I1f8a27ac291f2cdc16c8daa32e399b74d489dbb9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9535
Reviewed-on: https://webrtc-review.googlesource.com/102642
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24895}
diff --git a/modules/audio_processing/echo_control_mobile_proxy.cc b/modules/audio_processing/echo_control_mobile_proxy.cc
index e3909db..fd29834 100644
--- a/modules/audio_processing/echo_control_mobile_proxy.cc
+++ b/modules/audio_processing/echo_control_mobile_proxy.cc
@@ -10,19 +10,20 @@
#include "modules/audio_processing/echo_control_mobile_proxy.h"
-#include "rtc_base/logging.h"
-
namespace webrtc {
EchoControlMobileProxy::EchoControlMobileProxy(
AudioProcessing* audio_processing,
- EchoControlMobileImpl* echo_control_mobile)
+ EchoControlMobile* 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;
@@ -31,6 +32,7 @@
apm_config.echo_canceller.mobile_mode = true;
audio_processing_->ApplyConfig(apm_config);
}
+ echo_control_mobile_->Enable(enable);
return AudioProcessing::kNoError;
}
@@ -39,31 +41,29 @@
}
int EchoControlMobileProxy::set_routing_mode(RoutingMode mode) {
- RTC_LOG(LS_ERROR) << "Ignoring deprecated setting: AECM routing mode";
- return AudioProcessing::kUnsupportedFunctionError;
+ return echo_control_mobile_->set_routing_mode(mode);
}
EchoControlMobile::RoutingMode EchoControlMobileProxy::routing_mode() const {
- return EchoControlMobile::kSpeakerphone;
+ return echo_control_mobile_->routing_mode();
}
int EchoControlMobileProxy::enable_comfort_noise(bool enable) {
- RTC_LOG(LS_ERROR) << "Ignoring deprecated setting: AECM comfort noise";
- return AudioProcessing::kUnsupportedFunctionError;
+ return echo_control_mobile_->enable_comfort_noise(enable);
}
bool EchoControlMobileProxy::is_comfort_noise_enabled() const {
- return false;
+ return echo_control_mobile_->is_comfort_noise_enabled();
}
int EchoControlMobileProxy::SetEchoPath(const void* echo_path,
size_t size_bytes) {
- return AudioProcessing::kUnsupportedFunctionError;
+ return echo_control_mobile_->SetEchoPath(echo_path, size_bytes);
}
int EchoControlMobileProxy::GetEchoPath(void* echo_path,
size_t size_bytes) const {
- return AudioProcessing::kUnsupportedFunctionError;
+ return echo_control_mobile_->GetEchoPath(echo_path, size_bytes);
}
} // namespace webrtc