mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
2fbb83b16b
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}
69 lines
2.3 KiB
C++
69 lines
2.3 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"
|
|
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace webrtc {
|
|
|
|
EchoControlMobileProxy::EchoControlMobileProxy(
|
|
AudioProcessing* audio_processing,
|
|
EchoControlMobileImpl* echo_control_mobile)
|
|
: audio_processing_(audio_processing),
|
|
echo_control_mobile_(echo_control_mobile) {}
|
|
|
|
EchoControlMobileProxy::~EchoControlMobileProxy() = default;
|
|
|
|
int EchoControlMobileProxy::Enable(bool enable) {
|
|
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);
|
|
}
|
|
return AudioProcessing::kNoError;
|
|
}
|
|
|
|
bool EchoControlMobileProxy::is_enabled() const {
|
|
return echo_control_mobile_->is_enabled();
|
|
}
|
|
|
|
int EchoControlMobileProxy::set_routing_mode(RoutingMode mode) {
|
|
RTC_LOG(LS_ERROR) << "Ignoring deprecated setting: AECM routing mode";
|
|
return AudioProcessing::kUnsupportedFunctionError;
|
|
}
|
|
|
|
EchoControlMobile::RoutingMode EchoControlMobileProxy::routing_mode() const {
|
|
return EchoControlMobile::kSpeakerphone;
|
|
}
|
|
|
|
int EchoControlMobileProxy::enable_comfort_noise(bool enable) {
|
|
RTC_LOG(LS_ERROR) << "Ignoring deprecated setting: AECM comfort noise";
|
|
return AudioProcessing::kUnsupportedFunctionError;
|
|
}
|
|
|
|
bool EchoControlMobileProxy::is_comfort_noise_enabled() const {
|
|
return false;
|
|
}
|
|
|
|
int EchoControlMobileProxy::SetEchoPath(const void* echo_path,
|
|
size_t size_bytes) {
|
|
return AudioProcessing::kUnsupportedFunctionError;
|
|
}
|
|
|
|
int EchoControlMobileProxy::GetEchoPath(void* echo_path,
|
|
size_t size_bytes) const {
|
|
return AudioProcessing::kUnsupportedFunctionError;
|
|
}
|
|
|
|
} // namespace webrtc
|