commit 3e9a53760101a5b14d771ee1152b2988685d630e
author ivoc <ivoc@webrtc.org> Fri Oct 28 07:55:33 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Oct 28 14:55:39 2016 +0000
tree 2d77815dd4020c0787bf6bfdebeab23427c3cf08
parent 1e45cc6ee0b368f7cb8b90acc7fe4c1699bb4288

Original CL: https://codereview.webrtc.org/2433153003/, commit 8b8d3e4c30e8ea3846b58dfd36d1fd35a7799df4.
Revert CL: https://codereview.webrtc.org/2456333002/, commit 48dfab5c58119a4e65c52506ed55f8de79725bcf.

The new function on the APM interface is no longer pure virtual.

BUG=webrtc:6525
TBR=solenberg@webrtc.org,peah@webrtc.org

Review-Url: https://codereview.webrtc.org/2458993002
Cr-Commit-Position: refs/heads/master@{#14827}

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 32f1d9f..fe4dcee 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -448,6 +448,10 @@
       num_proc_channels());
   AllocateRenderQueue();
 
+  int success = public_submodules_->echo_cancellation->enable_metrics(true);
+  RTC_DCHECK_EQ(0, success);
+  success = public_submodules_->echo_cancellation->enable_delay_logging(true);
+  RTC_DCHECK_EQ(0, success);
   public_submodules_->echo_control_mobile->Initialize(
       proc_split_sample_rate_hz(), num_reverse_channels(),
       num_output_channels());
@@ -1473,6 +1477,28 @@
 #endif  // WEBRTC_AUDIOPROC_DEBUG_DUMP
 }
 
+// TODO(ivoc): Remove this when GetStatistics() becomes pure virtual.
+AudioProcessing::AudioProcessingStatistics AudioProcessing::GetStatistics()
+    const {
+  return AudioProcessingStatistics();
+}
+
+AudioProcessing::AudioProcessingStatistics AudioProcessingImpl::GetStatistics()
+    const {
+  AudioProcessingStatistics stats;
+  EchoCancellation::Metrics metrics;
+  public_submodules_->echo_cancellation->GetMetrics(&metrics);
+  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);
+  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();
 }