05a7004442
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}
70 lines
2.5 KiB
C++
70 lines
2.5 KiB
C++
/*
|
|
* Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "modules/audio_processing/echo_control_mobile_proxy.h"
|
|
|
|
namespace webrtc {
|
|
|
|
EchoControlMobileProxy::EchoControlMobileProxy(
|
|
AudioProcessing* audio_processing,
|
|
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;
|
|
if ((aecm_enabled && !enable) || (!aecm_enabled && enable)) {
|
|
apm_config.echo_canceller.enabled = enable;
|
|
apm_config.echo_canceller.mobile_mode = true;
|
|
audio_processing_->ApplyConfig(apm_config);
|
|
}
|
|
echo_control_mobile_->Enable(enable);
|
|
return AudioProcessing::kNoError;
|
|
}
|
|
|
|
bool EchoControlMobileProxy::is_enabled() const {
|
|
return echo_control_mobile_->is_enabled();
|
|
}
|
|
|
|
int EchoControlMobileProxy::set_routing_mode(RoutingMode mode) {
|
|
return echo_control_mobile_->set_routing_mode(mode);
|
|
}
|
|
|
|
EchoControlMobile::RoutingMode EchoControlMobileProxy::routing_mode() const {
|
|
return echo_control_mobile_->routing_mode();
|
|
}
|
|
|
|
int EchoControlMobileProxy::enable_comfort_noise(bool enable) {
|
|
return echo_control_mobile_->enable_comfort_noise(enable);
|
|
}
|
|
|
|
bool EchoControlMobileProxy::is_comfort_noise_enabled() const {
|
|
return echo_control_mobile_->is_comfort_noise_enabled();
|
|
}
|
|
|
|
int EchoControlMobileProxy::SetEchoPath(const void* echo_path,
|
|
size_t size_bytes) {
|
|
return echo_control_mobile_->SetEchoPath(echo_path, size_bytes);
|
|
}
|
|
|
|
int EchoControlMobileProxy::GetEchoPath(void* echo_path,
|
|
size_t size_bytes) const {
|
|
return echo_control_mobile_->GetEchoPath(echo_path, size_bytes);
|
|
}
|
|
|
|
} // namespace webrtc
|