commit 2d31aea481900e2982d0ee2aa0d19070f8dabf3e
author Sam Zackrisson <saza@webrtc.org> Fri Jan 17 10:55:09 2020 +0100
committer Commit Bot <commit-bot@chromium.org> Fri Jan 17 11:09:51 2020 +0000
tree 8a9341d9e1c37e4fb5ddb8221d55335165a3d387
parent a3d4252a019b808bb7c55b93ecc19adc755ff2ab

Remove unused AEC delay offset API

Bug: webrtc:5298
Change-Id: If490dba3c95b1d6aeaa7b110dd1ffc23ee7a96c9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166440
Reviewed-by: Per Åhgren <peah@webrtc.org>
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30297}

modules/audio_processing/audio_processing_impl.cc

diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index ba85fc5..02a82f4 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -1235,7 +1235,7 @@
   if (submodules_.echo_control_mobile) {
     // Ensure that the stream delay was set before the call to the
     // AECM ProcessCaptureAudio function.
-    if (!was_stream_delay_set()) {
+    if (!capture_.was_stream_delay_set) {
       return AudioProcessing::kStreamParameterNotSetError;
     }
 
@@ -1252,7 +1252,7 @@
     if (submodules_.echo_controller) {
       data_dumper_->DumpRaw("stream_delay", stream_delay_ms());
 
-      if (was_stream_delay_set()) {
+      if (capture_.was_stream_delay_set) {
         submodules_.echo_controller->SetAudioBufferDelay(stream_delay_ms());
       }
 
@@ -1553,7 +1553,6 @@
   rtc::CritScope cs(&crit_capture_);
   Error retval = kNoError;
   capture_.was_stream_delay_set = true;
-  delay += capture_.delay_offset_ms;
 
   if (delay < 0) {
     delay = 0;
@@ -1600,26 +1599,11 @@
   return capture_nonlocked_.stream_delay_ms;
 }
 
-bool AudioProcessingImpl::was_stream_delay_set() const {
-  // Used as callback from submodules, hence locking is not allowed.
-  return capture_.was_stream_delay_set;
-}
-
 void AudioProcessingImpl::set_stream_key_pressed(bool key_pressed) {
   rtc::CritScope cs(&crit_capture_);
   capture_.key_pressed = key_pressed;
 }
 
-void AudioProcessingImpl::set_delay_offset_ms(int offset) {
-  rtc::CritScope cs(&crit_capture_);
-  capture_.delay_offset_ms = offset;
-}
-
-int AudioProcessingImpl::delay_offset_ms() const {
-  rtc::CritScope cs(&crit_capture_);
-  return capture_.delay_offset_ms;
-}
-
 void AudioProcessingImpl::set_stream_analog_level(int level) {
   rtc::CritScope cs_capture(&crit_capture_);
 
@@ -2107,8 +2091,7 @@
 }
 
 AudioProcessingImpl::ApmCaptureState::ApmCaptureState()
-    : delay_offset_ms(0),
-      was_stream_delay_set(false),
+    : was_stream_delay_set(false),
       output_will_be_muted(false),
       key_pressed(false),
       capture_processing_format(kSampleRate16kHz),