| 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 900a8ec437abdf069ec29e02afe678ea7fb939c5..756cc0cca572b8bb0df7a901f2a58bf8fbf57031 100644
|
| --- a/webrtc/modules/audio_processing/audio_processing_impl.cc
|
| +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
|
| @@ -220,11 +220,9 @@ bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandSubModulesActive()
|
| const {
|
| #if WEBRTC_INTELLIGIBILITY_ENHANCER
|
| return CaptureMultiBandProcessingActive() ||
|
| - intelligibility_enhancer_enabled_ ||
|
| - voice_activity_detector_enabled_ || residual_echo_detector_enabled_;
|
| + intelligibility_enhancer_enabled_ || voice_activity_detector_enabled_;
|
| #else
|
| - return CaptureMultiBandProcessingActive() ||
|
| - voice_activity_detector_enabled_ || residual_echo_detector_enabled_;
|
| + return CaptureMultiBandProcessingActive() || voice_activity_detector_enabled_;
|
| #endif
|
| }
|
|
|
| @@ -240,7 +238,7 @@ bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandSubModulesActive()
|
| const {
|
| return RenderMultiBandProcessingActive() || echo_canceller_enabled_ ||
|
| mobile_echo_controller_enabled_ || adaptive_gain_controller_enabled_ ||
|
| - residual_echo_detector_enabled_ || echo_canceller3_enabled_;
|
| + echo_canceller3_enabled_;
|
| }
|
|
|
| bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandProcessingActive()
|
|
|