zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AEC3 can only be activated by injection.

Browse Source 
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 <peah@webrtc.org>
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21829}
This commit is contained in:
Gustaf Ullberg
2017-11-29 15:07:17 +01:00
committed by Commit Bot
parent 7c4dedade1
commit 8e9252a14f
3 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/audio_processing/audio_processing_impl.cc
View File

@ -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<EchoControlFactory>(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