From 8e9252a14ff0121236ddc6e2c49bb7df9a4c73d1 Mon Sep 17 00:00:00 2001 From: Gustaf Ullberg Date: Wed, 29 Nov 2017 15:07:17 +0100 Subject: [PATCH] AEC3 can only be activated by injection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed echo_canceller3.enabled from API configuration. Bug: webrtc:8346 Change-Id: Ie88a518c7eb37653ad9b20b18bdec6476076ccb6 Reviewed-on: https://webrtc-review.googlesource.com/27080 Reviewed-by: Per Åhgren Commit-Queue: Gustaf Ullberg Cr-Commit-Position: refs/heads/master@{#21829} --- modules/audio_processing/audio_processing_impl.cc | 13 ------------- .../audio_processing/audio_processing_unittest.cc | 1 - modules/audio_processing/include/audio_processing.h | 6 ------ 3 files changed, 20 deletions(-) diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc index 08d1ac0fef..c7d59b84d5 100644 --- a/modules/audio_processing/audio_processing_impl.cc +++ b/modules/audio_processing/audio_processing_impl.cc @@ -19,7 +19,6 @@ #include "common_audio/include/audio_util.h" #include "common_audio/signal_processing/include/signal_processing_library.h" #include "modules/audio_processing/aec/aec_core.h" -#include "modules/audio_processing/aec3/echo_canceller3.h" #include "modules/audio_processing/agc/agc_manager_direct.h" #include "modules/audio_processing/agc2/gain_controller2.h" #include "modules/audio_processing/audio_buffer.h" @@ -736,18 +735,6 @@ void AudioProcessingImpl::ApplyConfig(const AudioProcessing::Config& config) { RTC_LOG(LS_INFO) << "Highpass filter activated: " << config_.high_pass_filter.enabled; - // Deprecated way of activating AEC3. - // TODO(gustaf): Remove when possible. - if (config.echo_canceller3.enabled && !echo_control_factory_) { - capture_nonlocked_.echo_controller_enabled = - config_.echo_canceller3.enabled; - echo_control_factory_ = - std::unique_ptr(new EchoCanceller3Factory()); - InitializeEchoController(); - RTC_LOG(LS_INFO) << "Echo canceller 3 activated: " - << capture_nonlocked_.echo_controller_enabled; - } - config_ok = GainController2::Validate(config_.gain_controller2); if (!config_ok) { RTC_LOG(LS_ERROR) << "AudioProcessing module config error" << std::endl diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc index a75037b247..ecaeed3edc 100644 --- a/modules/audio_processing/audio_processing_unittest.cc +++ b/modules/audio_processing/audio_processing_unittest.cc @@ -3005,7 +3005,6 @@ std::unique_ptr CreateApm(bool use_AEC2) { // Disable all components except for an AEC and the residual echo detector. AudioProcessing::Config config; config.residual_echo_detector.enabled = true; - config.echo_canceller3.enabled = false; config.high_pass_filter.enabled = false; config.gain_controller2.enabled = false; config.level_controller.enabled = false; diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index c8a1e55c97..5185a1fe6f 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -276,12 +276,6 @@ class AudioProcessing : public rtc::RefCountInterface { bool enabled = false; } high_pass_filter; - // Deprecated way of activating AEC3. - // TODO(gustaf): Remove when possible. - struct EchoCanceller3 { - bool enabled = false; - } echo_canceller3; - // Enables the next generation AGC functionality. This feature replaces the // standard methods of gain control in the previous AGC. // The functionality is not yet activated in the code and turning this on