Index: webrtc/modules/audio_processing/audio_processing_impl.cc |
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc |
index 9c587c25c7940b1cebb230caba6d6ea807eba628..cb225870a36b1955393a84967a5ce3672f768f8c 100644 |
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc |
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc |
@@ -186,8 +186,6 @@ AudioProcessingImpl::AudioProcessingImpl(const Config& config, |
new GainControlForExperimentalAgc(public_submodules_->gain_control, |
&crit_capture_)); |
private_submodules_->component_list.push_back( |
- public_submodules_->echo_control_mobile); |
- private_submodules_->component_list.push_back( |
public_submodules_->gain_control); |
} |
@@ -320,6 +318,7 @@ int AudioProcessingImpl::InitializeLocked() { |
} |
InitializeEchoCanceller(); |
+ InitializeEchoControlMobile(); |
InitializeExperimentalAgc(); |
InitializeTransient(); |
InitializeBeamformer(); |
@@ -1135,7 +1134,8 @@ bool AudioProcessingImpl::is_data_processed() const { |
if (capture_nonlocked_.beamformer_enabled || |
public_submodules_->high_pass_filter->is_enabled() || |
public_submodules_->noise_suppression->is_enabled() || |
- public_submodules_->echo_cancellation->is_enabled()) { |
+ public_submodules_->echo_cancellation->is_enabled() || |
+ public_submodules_->echo_control_mobile->is_enabled()) { |
return true; |
} |
@@ -1254,6 +1254,10 @@ void AudioProcessingImpl::InitializeEchoCanceller() { |
public_submodules_->echo_cancellation->Initialize(); |
} |
+void AudioProcessingImpl::InitializeEchoControlMobile() { |
the sun
2016/03/07 14:43:12
In a future CL, consider removing these methods si
peah-webrtc
2016/03/08 07:53:31
Good point! I've had that in mind! Will do :-)
|
+ public_submodules_->echo_control_mobile->Initialize(); |
+} |
+ |
void AudioProcessingImpl::InitializeLevelEstimator() { |
public_submodules_->level_estimator->Initialize(); |
} |