Utilizing the AEC3 config struct for constants.

webrtc/modules/audio_processing/aec3/residual_echo_estimator.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 61 matching lines @@
       }
     }
   }
 }
 
 // Assume a minimum echo path gain of -33 dB for headsets.
 constexpr float kHeadsetEchoPathGain = 0.0005f;
 
 }  // namespace
 
-ResidualEchoEstimator::ResidualEchoEstimator() {
+ResidualEchoEstimator::ResidualEchoEstimator(
+    const AudioProcessing::Config::EchoCanceller3& config)
+    : config_(config) {
   Reset();
 }
 
 ResidualEchoEstimator::~ResidualEchoEstimator() = default;
 
 void ResidualEchoEstimator::Estimate(
     bool using_subtractor_output,
     const AecState& aec_state,
     const RenderBuffer& render_buffer,
     const std::array<float, kFftLengthBy2Plus1>& S2_linear,
@@ skipping 88 matching lines @@
                    return b / a;
                  });
 }
 
 void ResidualEchoEstimator::NonLinearEstimate(
     bool headset_detected,
     const std::array<float, kFftLengthBy2Plus1>& X2,
     const std::array<float, kFftLengthBy2Plus1>& Y2,
     std::array<float, kFftLengthBy2Plus1>* R2) {
   // Choose gains.
-  const float echo_path_gain_lf = headset_detected ? kHeadsetEchoPathGain : 100;
+  const float echo_path_gain_lf =
+      headset_detected ? kHeadsetEchoPathGain : config_.param.ep_strength.lf;
   const float echo_path_gain_mf =
-      headset_detected ? kHeadsetEchoPathGain : 1000;
+      headset_detected ? kHeadsetEchoPathGain : config_.param.ep_strength.mf;
   const float echo_path_gain_hf =
-      headset_detected ? kHeadsetEchoPathGain : 5000;
+      headset_detected ? kHeadsetEchoPathGain : config_.param.ep_strength.hf;
 
   // Compute preliminary residual echo.
   std::transform(
       X2.begin(), X2.begin() + 12, R2->begin(),
       [echo_path_gain_lf](float a) { return a * echo_path_gain_lf; });
   std::transform(
       X2.begin() + 12, X2.begin() + 25, R2->begin() + 12,
       [echo_path_gain_mf](float a) { return a * echo_path_gain_mf; });
   std::transform(
       X2.begin() + 25, X2.end(), R2->begin() + 25,
@@ skipping 46 matching lines @@
   } else {
     std::copy(S2.begin(), S2.end(), S2_old_[S2_old_index_].begin());
   }
 
   // Add the power of the echo reverb to the residual echo power.
   std::transform(R2->begin(), R2->end(), R2_reverb_.begin(), R2->begin(),
                  std::plus<float>());
 }
 
 }  // namespace webrtc