Finalization of the first version of EchoCanceller 3

webrtc/modules/audio_processing/aec3/render_delay_controller.cc

Index: webrtc/modules/audio_processing/aec3/render_delay_controller.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller.cc b/webrtc/modules/audio_processing/aec3/render_delay_controller.cc
index 981b744eef9c1322010b473b02b11d36bf127373..834e1e7641c9da6188f81d81a6be0a4f14e0db11 100644
--- a/webrtc/modules/audio_processing/aec3/render_delay_controller.cc
+++ b/webrtc/modules/audio_processing/aec3/render_delay_controller.cc
@@ -16,7 +16,7 @@
 
 #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"
 
@@ -147,7 +147,7 @@ size_t RenderDelayControllerImpl::GetDelay(
     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>();
   }