AEC3 Tuning changes

webrtc/modules/audio_processing/aec3/aec_state.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 54 matching lines @@
   for (size_t k = 1; k < kUpperBin; ++k) {
     if (H2[delay][k] > H2[delay][0]) {
       RTC_DCHECK_GT(H2.size(), delay);
       return rtc::Optional<size_t>(delay);
     }
   }
   return rtc::Optional<size_t>();
 }
 
 constexpr int kEchoPathChangeCounterInitial = kNumBlocksPerSecond / 5;
-constexpr int kEchoPathChangeCounterMax = 3 * kNumBlocksPerSecond;
+constexpr int kEchoPathChangeCounterMax = 2 * kNumBlocksPerSecond;
 
 }  // namespace
 
 int AecState::instance_count_ = 0;
 
 AecState::AecState()
     : data_dumper_(
           new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
       echo_path_change_counter_(kEchoPathChangeCounterInitial) {}
 
 AecState::~AecState() = default;
 
 void AecState::HandleEchoPathChange(
     const EchoPathVariability& echo_path_variability) {
   if (echo_path_variability.AudioPathChanged()) {
     blocks_since_last_saturation_ = 0;
     active_render_blocks_ = 0;
-    echo_path_change_counter_ = kEchoPathChangeCounterMax;
     usable_linear_estimate_ = false;
     echo_leakage_detected_ = false;
     capture_signal_saturation_ = false;
     echo_saturation_ = false;
-    headset_detected_ = false;
     previous_max_sample_ = 0.f;
 
     if (echo_path_variability.delay_change) {
       force_zero_gain_counter_ = 0;
       force_zero_gain_ = true;
+      echo_path_change_counter_ = kEchoPathChangeCounterMax;
+    }
+    if (echo_path_variability.gain_change) {
+      echo_path_change_counter_ = kEchoPathChangeCounterInitial;
     }
   }
 }
 
 void AecState::Update(const std::vector<std::array<float, kFftLengthBy2Plus1>>&
                           adaptive_filter_frequency_response,
                       const rtc::Optional<size_t>& external_delay_samples,
                       const RenderBuffer& render_buffer,
                       const std::array<float, kFftLengthBy2Plus1>& E2_main,
                       const std::array<float, kFftLengthBy2Plus1>& Y2,
@@ skipping 48 matching lines @@
       filter_delay_ && echo_path_change_counter_ <= 0;
 
   // After an amount of active render samples for which an echo should have been
   // detected in the capture signal if the ERL was not infinite, flag that a
   // headset is used.
   headset_detected_ = !external_delay_ && !filter_delay_ &&
                       active_render_blocks_ >= kEchoPathChangeConvergenceBlocks;
 }
 
 }  // namespace webrtc