Add support to audioproc_f for running the residual echo detector and producing an echo likelihood …

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 171 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_;
+         intelligibility_enhancer_enabled_ ||

[peah-webrtc, 2016/11/10 10:47:09]

Great catch! I missed that when reviewing the other CL.

This is not really part of this CL though so I think you should either
1) Change the description of this CL to reflect that this is done as well.
2) Make another CL that does this.

I would lean towards 2) as the rest of the CL relates to simulation code and
this relates to production code.

Furthermore, the correction below needs to be added as well.

[ivoc, 2016/11/10 15:36:08]

Good point, I will make a new CL for these changes.

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

[peah-webrtc, 2016/11/10 10:47:09]

You need to add "|| residual_echo_detector_enabled_" here as well as the render
signal copy will otherwise not be generated.

[ivoc, 2016/11/10 15:36:08]

Good point. I will add it to the other CL.

          mobile_echo_controller_enabled_ || adaptive_gain_controller_enabled_;
 }
 
 bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandProcessingActive()
     const {
 #if WEBRTC_INTELLIGIBILITY_ENHANCER
   return intelligibility_enhancer_enabled_;
 #else
   return false;
 #endif
@@ skipping 1271 matching lines @@
   EchoCancellation::Metrics metrics;
   int success = public_submodules_->echo_cancellation->GetMetrics(&metrics);
   if (success == Error::kNoError) {
     stats.a_nlp.Set(metrics.a_nlp);
     stats.divergent_filter_fraction = metrics.divergent_filter_fraction;
     stats.echo_return_loss.Set(metrics.echo_return_loss);
     stats.echo_return_loss_enhancement.Set(
         metrics.echo_return_loss_enhancement);
     stats.residual_echo_return_loss.Set(metrics.residual_echo_return_loss);
   }
+  stats.residual_echo_likelihood =
+      private_submodules_->residual_echo_detector->echo_likelihood();
   public_submodules_->echo_cancellation->GetDelayMetrics(
       &stats.delay_median, &stats.delay_standard_deviation,
       &stats.fraction_poor_delays);
   return stats;
 }
 
 EchoCancellation* AudioProcessingImpl::echo_cancellation() const {
   return public_submodules_->echo_cancellation.get();
 }
 
@@ skipping 314 matching lines @@
       capture_processing_format(kSampleRate16kHz),
       split_rate(kSampleRate16kHz) {}
 
 AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default;
 
 AudioProcessingImpl::ApmRenderState::ApmRenderState() = default;
 
 AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default;
 
 }  // namespace webrtc