Utilizing the AEC3 config struct for constants.

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 57 matching lines @@
   return rtc::Optional<size_t>();
 }
 
 constexpr int kEchoPathChangeCounterInitial = kNumBlocksPerSecond / 5;
 constexpr int kEchoPathChangeCounterMax = 2 * kNumBlocksPerSecond;
 
 }  // namespace
 
 int AecState::instance_count_ = 0;
 
-AecState::AecState(float reverb_decay)
+AecState::AecState(const AudioProcessing::Config::EchoCanceller3& config)
     : data_dumper_(
           new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      erle_estimator_(config.param.erle.min,
+                      config.param.erle.max_l,
+                      config.param.erle.max_h),
       echo_path_change_counter_(kEchoPathChangeCounterInitial),
-      reverb_decay_(reverb_decay) {}
+      config_(config),
+      reverb_decay_(config_.param.ep_strength.default_len) {}
 
 AecState::~AecState() = default;
 
 void AecState::HandleEchoPathChange(
     const EchoPathVariability& echo_path_variability) {
   if (echo_path_variability.AudioPathChanged()) {
     blocks_since_last_saturation_ = 0;
     usable_linear_estimate_ = false;
     echo_leakage_detected_ = false;
     capture_signal_saturation_ = false;
@@ skipping 152 matching lines @@
 
   // If all reverb candidates have been evaluated, choose the best one as the
   // reverb decay.
   if (reverb_decay_to_test_ >= 0.9965f) {
     if (reverb_decay_candidate_residual_ < 0.f) {
       // Transform the decay to be in the unit of blocks.
       reverb_decay_ = powf(reverb_decay_candidate_, kFftLengthBy2);
 
       // Limit the estimated reverb_decay_ to the maximum one needed in practice
       // to minimize the impact of incorrect estimates.
-      reverb_decay_ = std::min(0.8f, reverb_decay_);
+      reverb_decay_ =
+          std::min(config_.param.ep_strength.default_len, reverb_decay_);
     }
     reverb_decay_to_test_ = 0.9f;
     reverb_decay_candidate_residual_ = -1.f;
   }
 
   // For noisy impulse responses, assume a fixed tail length.
   if (tail_power > 0.0005f) {
-    reverb_decay_ = 0.7f;
+    reverb_decay_ = config_.param.ep_strength.default_len;
   }
   data_dumper_->DumpRaw("aec3_reverb_decay", reverb_decay_);
   data_dumper_->DumpRaw("aec3_tail_power", tail_power);
 }
 
 void AecState::EchoAudibility::Update(rtc::ArrayView<const float> x,
                                       const std::array<float, kBlockSize>& s) {
   auto result_x = std::minmax_element(x.begin(), x.end());
   auto result_s = std::minmax_element(s.begin(), s.end());
   const float x_abs =
@@ skipping 26 matching lines @@
     max_nearend_ = e_abs;
     max_nearend_counter_ = 0;
   } else {
     if (++max_nearend_counter_ > 5 * kNumBlocksPerSecond) {
       max_nearend_ *= 0.995f;
     }
   }
 }
 
 }  // namespace webrtc