Finalization of the first version of EchoCanceller 3

webrtc/modules/audio_processing/aec3/render_delay_controller.cc

 /*
  *  Copyright (c) 2017 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.
  */
 #include "webrtc/modules/audio_processing/aec3/render_delay_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/atomicops.h"
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/audio_processing/aec3/aec3_constants.h"
+#include "webrtc/modules/audio_processing/aec3/aec3_common.h"
 #include "webrtc/modules/audio_processing/aec3/echo_path_delay_estimator.h"
 #include "webrtc/system_wrappers/include/logging.h"
 
 namespace webrtc {
 
 namespace {
 
 class RenderBuffer {
  public:
   explicit RenderBuffer(size_t size)
@@ skipping 110 matching lines @@
         ComputeNewBufferDelay(delay_, max_delay_, echo_path_delay_samples_);
     if (new_delay != delay_ && align_call_counter_ > 250) {
       delay_ = new_delay;
     }
 
     // Update render delay buffer headroom.
     blocks_since_last_delay_estimate_ = 0;
     const int headroom = echo_path_delay_samples_ - delay_ * kBlockSize;
     RTC_DCHECK_LE(0, headroom);
     headroom_samples_ = rtc::Optional<size_t>(headroom);
-  } else if (++blocks_since_last_delay_estimate_ > 25000) {
+  } else if (++blocks_since_last_delay_estimate_ > 250 * 20) {
     headroom_samples_ = rtc::Optional<size_t>();
   }
 
   data_dumper_->DumpRaw("aec3_render_delay_controller_delay", 1,
                         &echo_path_delay_samples_);
   data_dumper_->DumpRaw("aec3_render_delay_controller_buffer_delay", delay_);
 
   return delay_;
 }
 
 bool RenderDelayControllerImpl::AnalyzeRender(
     rtc::ArrayView<const float> render) {
   return render_buffer_.Insert(render);
 }
 
 }  // namespace
 
 RenderDelayController* RenderDelayController::Create(
     int sample_rate_hz,
     const RenderDelayBuffer& render_delay_buffer) {
   return new RenderDelayControllerImpl(sample_rate_hz, render_delay_buffer);
 }
 
 }  // namespace webrtc