Revert "delay estimator: Look for early reverberation" (#173)

This reverts commit 8783c67.

Reason to revert: This change breaks MSVC build.

Author: jianjunz

api/audio/echo_canceller3_config.h

@@ -59,7 +59,6 @@ struct RTC_EXPORT EchoCanceller3Config {
     };
     AlignmentMixing render_alignment_mixing = {false, true, 10000.f, true};
     AlignmentMixing capture_alignment_mixing = {false, true, 10000.f, false};
-    bool detect_pre_echo = false;
   } delay;
 
   struct Filter {

api/audio/echo_canceller3_config_json.cc

@@ -220,7 +220,6 @@ void Aec3ConfigFromJsonString(absl::string_view json_string,
               &cfg.delay.render_alignment_mixing);
     ReadParam(section, "capture_alignment_mixing",
               &cfg.delay.capture_alignment_mixing);
-    ReadParam(section, "detect_pre_echo", &cfg.delay.detect_pre_echo);
   }
 
   if (rtc::GetValueFromJsonObject(aec3_root, "filter", &section)) {
@@ -506,9 +505,7 @@ std::string Aec3ConfigToJsonString(const EchoCanceller3Config& config) {
       << (config.delay.capture_alignment_mixing.prefer_first_two_channels
               ? "true"
               : "false");
-  ost << "},";
-  ost << "\"detect_pre_echo\": "
-      << (config.delay.detect_pre_echo ? "true" : "false");
+  ost << "}";
   ost << "},";
 
   ost << "\"filter\": {";

modules/audio_processing/aec3/BUILD.gn

@@ -230,7 +230,6 @@ rtc_source_set("matched_filter") {
     "../../../api:array_view",
     "../../../rtc_base/system:arch",
   ]
-  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
 
 rtc_source_set("vector_math") {

modules/audio_processing/aec3/echo_canceller3.cc

@@ -378,14 +378,6 @@ EchoCanceller3Config AdjustConfig(const EchoCanceller3Config& config) {
         false;
   }
 
-  if (field_trial::IsEnabled("WebRTC-Aec3DelayEstimatorDetectPreEcho")) {
-    adjusted_cfg.delay.detect_pre_echo = true;
-  }
-
-  if (field_trial::IsDisabled("WebRTC-Aec3DelayEstimatorDetectPreEcho")) {
-    adjusted_cfg.delay.detect_pre_echo = false;
-  }
-
   if (field_trial::IsEnabled("WebRTC-Aec3SensitiveDominantNearendActivation")) {
     adjusted_cfg.suppressor.dominant_nearend_detection.enr_threshold = 0.5f;
   } else if (field_trial::IsEnabled(

modules/audio_processing/aec3/echo_path_delay_estimator.cc

@@ -43,11 +43,10 @@ EchoPathDelayEstimator::EchoPathDelayEstimator(
               : config.render_levels.poor_excitation_render_limit,
           config.delay.delay_estimate_smoothing,
           config.delay.delay_estimate_smoothing_delay_found,
-          config.delay.delay_candidate_detection_threshold,
-          config.delay.detect_pre_echo),
+          config.delay.delay_candidate_detection_threshold),
       matched_filter_lag_aggregator_(data_dumper_,
                                      matched_filter_.GetMaxFilterLag(),
-                                     config.delay) {
+                                     config.delay.delay_selection_thresholds) {
   RTC_DCHECK(data_dumper);
   RTC_DCHECK(down_sampling_factor_ > 0);
 }
@@ -76,14 +75,13 @@ absl::optional<DelayEstimate> EchoPathDelayEstimator::EstimateDelay(
 
   absl::optional<DelayEstimate> aggregated_matched_filter_lag =
       matched_filter_lag_aggregator_.Aggregate(
-          matched_filter_.GetBestLagEstimate());
+          matched_filter_.GetLagEstimates());
 
   // Run clockdrift detection.
   if (aggregated_matched_filter_lag &&
       (*aggregated_matched_filter_lag).quality ==
           DelayEstimate::Quality::kRefined)
-    clockdrift_detector_.Update(
-        matched_filter_lag_aggregator_.GetDelayAtHighestPeak());
+    clockdrift_detector_.Update((*aggregated_matched_filter_lag).delay);
 
   // TODO(peah): Move this logging outside of this class once EchoCanceller3
   // development is done.

modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc

@@ -78,7 +78,6 @@ TEST(EchoPathDelayEstimator, DelayEstimation) {
   constexpr size_t kDownSamplingFactors[] = {2, 4, 8};
   for (auto down_sampling_factor : kDownSamplingFactors) {
     EchoCanceller3Config config;
-    config.delay.delay_headroom_samples = 0;
     config.delay.down_sampling_factor = down_sampling_factor;
     config.delay.num_filters = 10;
     for (size_t delay_samples : {30, 64, 150, 200, 800, 4000}) {
@@ -112,13 +111,12 @@ TEST(EchoPathDelayEstimator, DelayEstimation) {
       }
 
       if (estimated_delay_samples) {
-        // Allow estimated delay to be off by a block as internally the delay is
-        // quantized with an error up to a block.
+        // Allow estimated delay to be off by one sample in the down-sampled
+        // domain.
         size_t delay_ds = delay_samples / down_sampling_factor;
         size_t estimated_delay_ds =
             estimated_delay_samples->delay / down_sampling_factor;
-        EXPECT_NEAR(delay_ds, estimated_delay_ds,
-                    kBlockSize / down_sampling_factor);
+        EXPECT_NEAR(delay_ds, estimated_delay_ds, 1);
       } else {
         ADD_FAILURE();
       }