Avoid render resampling when there is no need for render signal analysis.

webrtc/modules/audio_processing/audio_processing_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 203 matching lines @@
   changed |= first_update_;
   first_update_ = false;
   return changed;
 }
 
 bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandSubModulesActive()
     const {
 #if WEBRTC_INTELLIGIBILITY_ENHANCER
   return CaptureMultiBandProcessingActive() ||
          intelligibility_enhancer_enabled_ ||
          voice_activity_detector_enabled_ || residual_echo_detector_enabled_;

[peah-webrtc, 2017/05/19 08:07:46]

This change is due to a rebase.

 #else
   return CaptureMultiBandProcessingActive() ||

[peah-webrtc, 2017/05/19 08:07:46]

This change is due to a rebase.

          voice_activity_detector_enabled_ || residual_echo_detector_enabled_;
 #endif
 }
 
 bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandProcessingActive()
     const {
   return low_cut_filter_enabled_ || echo_canceller_enabled_ ||
          mobile_echo_controller_enabled_ || noise_suppressor_enabled_ ||
          beamformer_enabled_ || adaptive_gain_controller_enabled_ ||
          echo_canceller3_enabled_;
 }
 
 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandSubModulesActive()
     const {
   return RenderMultiBandProcessingActive() || echo_canceller_enabled_ ||
          mobile_echo_controller_enabled_ || adaptive_gain_controller_enabled_ ||

[peah-webrtc, 2017/05/19 08:07:46]

This change is due to a rebase.

          residual_echo_detector_enabled_ || echo_canceller3_enabled_;
 }
 
 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandProcessingActive()
     const {
 #if WEBRTC_INTELLIGIBILITY_ENHANCER
   return intelligibility_enhancer_enabled_;
 #else
   return false;
 #endif
@@ skipping 338 matching lines @@
   if (capture_nonlocked_.capture_processing_format.sample_rate_hz() ==
       kSampleRate8kHz) {
     render_processing_rate = kSampleRate8kHz;
   } else {
     render_processing_rate =
         std::max(render_processing_rate, static_cast<int>(kSampleRate16kHz));
   }
 
   // Always downmix the render stream to mono for analysis. This has been
   // demonstrated to work well for AEC in most practical scenarios.
-  formats_.render_processing_format = StreamConfig(render_processing_rate, 1);
+  if (submodule_states_.RenderMultiBandSubModulesActive()) {
+    formats_.render_processing_format = StreamConfig(render_processing_rate, 1);
+  } else {
+    formats_.render_processing_format = StreamConfig(
+        formats_.api_format.reverse_input_stream().sample_rate_hz(),
+        formats_.api_format.output_stream().num_channels());
+  }
 
   if (capture_nonlocked_.capture_processing_format.sample_rate_hz() ==
           kSampleRate32kHz ||
       capture_nonlocked_.capture_processing_format.sample_rate_hz() ==
           kSampleRate48kHz) {
     capture_nonlocked_.split_rate = kSampleRate16kHz;
   } else {
     capture_nonlocked_.split_rate =
         capture_nonlocked_.capture_processing_format.sample_rate_hz();
   }
@@ skipping 1402 matching lines @@
       previous_agc_level(0),
       echo_path_gain_change(false) {}
 
 AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default;
 
 AudioProcessingImpl::ApmRenderState::ApmRenderState() = default;
 
 AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default;
 
 }  // namespace webrtc