Utilizing the AEC3 config struct for constants.

webrtc/modules/audio_processing/aec3/echo_remover.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.
  */
 #include "webrtc/modules/audio_processing/aec3/echo_remover.h"
@@ skipping 54 matching lines @@
       std::vector<std::vector<float>>* capture) override;
 
   // Updates the status on whether echo leakage is detected in the output of the
   // echo remover.
   void UpdateEchoLeakageStatus(bool leakage_detected) override {
     echo_leakage_detected_ = leakage_detected;
   }
 
  private:
   static int instance_count_;
+  const AudioProcessing::Config::EchoCanceller3 config_;
   const Aec3Fft fft_;
   std::unique_ptr<ApmDataDumper> data_dumper_;
   const Aec3Optimization optimization_;
   const int sample_rate_hz_;
   Subtractor subtractor_;
   SuppressionGain suppression_gain_;
   ComfortNoiseGenerator cng_;
   SuppressionFilter suppression_filter_;
   RenderSignalAnalyzer render_signal_analyzer_;
   OutputSelector output_selector_;
   ResidualEchoEstimator residual_echo_estimator_;
   bool echo_leakage_detected_ = false;
   AecState aec_state_;
   EchoRemoverMetrics metrics_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(EchoRemoverImpl);
 };
 
 int EchoRemoverImpl::instance_count_ = 0;
 
 EchoRemoverImpl::EchoRemoverImpl(
     const AudioProcessing::Config::EchoCanceller3& config,
     int sample_rate_hz)
-    : fft_(),
+    : config_(config),
+      fft_(),
       data_dumper_(
           new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
       optimization_(DetectOptimization()),
       sample_rate_hz_(sample_rate_hz),
       subtractor_(data_dumper_.get(), optimization_),
-      suppression_gain_(optimization_),
+      suppression_gain_(config_, optimization_),
       cng_(optimization_),
       suppression_filter_(sample_rate_hz_),
-      aec_state_(0.8f) {
+      residual_echo_estimator_(config_),
+      aec_state_(config_) {
   RTC_DCHECK(ValidFullBandRate(sample_rate_hz));
 }
 
 EchoRemoverImpl::~EchoRemoverImpl() = default;
 
 void EchoRemoverImpl::ProcessCapture(
     const rtc::Optional<size_t>& echo_path_delay_samples,
     const EchoPathVariability& echo_path_variability,
     bool capture_signal_saturation,
     const RenderBuffer& render_buffer,
@@ skipping 122 matching lines @@
 
 }  // namespace
 
 EchoRemover* EchoRemover::Create(
     const AudioProcessing::Config::EchoCanceller3& config,
     int sample_rate_hz) {
   return new EchoRemoverImpl(config, sample_rate_hz);
 }
 
 }  // namespace webrtc