Major updates to the echo removal functionality in AEC3

webrtc/modules/audio_processing/aec3/render_delay_controller_metrics.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.
  */
 
@@ skipping 34 matching lines @@
   if (!initial_update) {
     if (delay_samples) {
       ++reliable_delay_estimate_counter_;
       size_t delay_blocks = (*delay_samples) / kBlockSize;
 
       if (delay_blocks != delay_blocks_) {
         ++delay_change_counter_;
         delay_blocks_ = delay_blocks;
       }
     }
-  } else if (++initial_call_counter_ == 5 * 250) {
+  } else if (++initial_call_counter_ == 5 * kNumBlocksPerSecond) {
     initial_update = false;
   }
 
   if (call_counter_ == kMetricsReportingIntervalBlocks) {
     int value_to_report = static_cast<int>(delay_blocks_);
     value_to_report = std::min(124, value_to_report);
     RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.EchoCanceller.EchoPathDelay",
                                 value_to_report, 0, 124, 125);
 
     value_to_report = static_cast<int>(buffer_delay_blocks);
@@ skipping 42 matching lines @@
     metrics_reported_ = false;
   }
 }
 
 void RenderDelayControllerMetrics::ResetMetrics() {
   delay_change_counter_ = 0;
   reliable_delay_estimate_counter_ = 0;
 }
 
 }  // namespace webrtc