commit 1107cab646985eaecce5e723fbe4213f23f596cc
author Gustaf Ullberg <gustaf@webrtc.org> Tue Apr 02 14:00:46 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Apr 02 14:04:38 2019 +0000
tree fd27b1aab6cb8b06541636134daac7f89def6ff9
parent f537da6c194d2c021709a255563c27b261e92488

Remove the ability for EchoRemover to override the render vs capture alignment

This change removes the (unused) ability of EchoRemover overriding
the delay of the RenderDelayController. The change is tested for
bit-exactness.

Bug: webrtc:8671
Change-Id: I188ef740f1437de64ffe236d07a7dcd4128192c2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130518
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27414}

modules/audio_processing/aec3/block_processor.cc

diff --git a/modules/audio_processing/aec3/block_processor.cc b/modules/audio_processing/aec3/block_processor.cc
index b08be68..2674827 100644
--- a/modules/audio_processing/aec3/block_processor.cc
+++ b/modules/audio_processing/aec3/block_processor.cc
@@ -71,7 +71,6 @@
   RenderDelayBuffer::BufferingEvent render_event_;
   size_t capture_call_counter_ = 0;
   absl::optional<DelayEstimate> estimated_delay_;
-  absl::optional<int> echo_remover_delay_;
 };
 
 int BlockProcessorImpl::instance_count_ = 0;
@@ -150,11 +149,11 @@
                         &(*capture_block)[0][0],
                         LowestBandRate(sample_rate_hz_), 1);
 
-  // Compute and and apply the render delay required to achieve proper signal
+  // Compute and apply the render delay required to achieve proper signal
   // alignment.
-  estimated_delay_ = delay_controller_->GetDelay(
-      render_buffer_->GetDownsampledRenderBuffer(), render_buffer_->Delay(),
-      echo_remover_delay_, (*capture_block)[0]);
+  estimated_delay_ =
+      delay_controller_->GetDelay(render_buffer_->GetDownsampledRenderBuffer(),
+                                  render_buffer_->Delay(), (*capture_block)[0]);
 
   if (estimated_delay_) {
     bool delay_change = render_buffer_->SetDelay(estimated_delay_->delay);
@@ -173,10 +172,6 @@
       echo_path_variability, capture_signal_saturation, estimated_delay_,
       render_buffer_->GetRenderBuffer(), capture_block);
 
-  // Check to see if a refined delay estimate has been obtained from the echo
-  // remover.
-  echo_remover_delay_ = echo_remover_->Delay();
-
   // Update the metrics.
   metrics_.UpdateCapture(false);
 }