commit 63a2c13d6dddab0331fb1fff42620c3c694f8017
author Alejandro Luebs <aluebs@webrtc.org> Thu Mar 31 18:04:40 2016 -0700
committer Alejandro Luebs <aluebs@webrtc.org> Fri Apr 01 01:04:47 2016 +0000
tree 4ab4deb58176955a5898872653bcd43507bbe0cf
parent 89717aad5099d7cf5ff55dd5eace6df6651de3c7

Only split into bands when the reverse stream is analyzed in the APM

BUG=596079
R=henrik.lundin@webrtc.org, peah@webrtc.org

Review URL: https://codereview.webrtc.org/1844583003 .

Cr-Commit-Position: refs/heads/master@{#12187}

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 a09c1c9..9fd18fc 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -1099,7 +1099,7 @@
   return public_submodules_->voice_detection.get();
 }
 
-bool AudioProcessingImpl::is_data_processed() const {
+bool AudioProcessingImpl::is_fwd_processed() const {
   // The beamformer, noise suppressor and highpass filter
   // modify the data.
   if (capture_nonlocked_.beamformer_enabled ||
@@ -1119,16 +1119,16 @@
   // Check if we've upmixed or downmixed the audio.
   return ((formats_.api_format.output_stream().num_channels() !=
            formats_.api_format.input_stream().num_channels()) ||
-          is_data_processed() || capture_.transient_suppressor_enabled);
+          is_fwd_processed() || capture_.transient_suppressor_enabled);
 }
 
 bool AudioProcessingImpl::fwd_synthesis_needed() const {
-  return (is_data_processed() &&
+  return (is_fwd_processed() &&
           is_multi_band(capture_nonlocked_.fwd_proc_format.sample_rate_hz()));
 }
 
 bool AudioProcessingImpl::fwd_analysis_needed() const {
-  if (!is_data_processed() &&
+  if (!is_fwd_processed() &&
       !public_submodules_->voice_detection->is_enabled() &&
       !capture_.transient_suppressor_enabled) {
     // Only public_submodules_->level_estimator is enabled.
@@ -1152,7 +1152,11 @@
 }
 
 bool AudioProcessingImpl::rev_analysis_needed() const {
-  return is_multi_band(formats_.rev_proc_format.sample_rate_hz());
+  return is_multi_band(formats_.rev_proc_format.sample_rate_hz()) &&
+         (is_rev_processed() ||
+          public_submodules_->echo_cancellation->is_enabled() ||
+          public_submodules_->echo_control_mobile->is_enabled() ||
+          public_submodules_->gain_control->is_enabled());
 }
 
 bool AudioProcessingImpl::render_check_rev_conversion_needed() const {