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 1f73c5984a68af29d7dd941a64f88a834fd9e72a..4216cf9c9d108946fcfa31d3f51cb21c01d733ca 100644 |
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc |
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc |
@@ -569,7 +569,8 @@ int AudioProcessingImpl::InitializeLocked(const ProcessingConfig& config) { |
submodule_states_.RenderMultiBandSubModulesActive()); |
// TODO(aluebs): Remove this restriction once we figure out why the 3-band |
// splitting filter degrades the AEC performance. |
- if (render_processing_rate > kSampleRate32kHz) { |
+ if (render_processing_rate > kSampleRate32kHz && |
+ !config_.echo_canceller3.enabled) { |
peah-webrtc
2017/03/30 05:36:57
This change causes the splitting filter to always
|
render_processing_rate = submodule_states_.RenderMultiBandProcessingActive() |
? kSampleRate32kHz |
: kSampleRate16kHz; |
@@ -1440,9 +1441,7 @@ int AudioProcessingImpl::ProcessRenderStreamLocked() { |
QueueRenderAudio(render_buffer); |
// TODO(peah): Perform the queueing ínside QueueRenderAudiuo(). |
if (private_submodules_->echo_canceller3) { |
- if (!private_submodules_->echo_canceller3->AnalyzeRender(render_buffer)) { |
- // TODO(peah): Lock and empty render queue, and try again. |
- } |
+ private_submodules_->echo_canceller3->AnalyzeRender(render_buffer); |
} |
if (submodule_states_.RenderMultiBandProcessingActive() && |