Utilizing the AEC3 config struct for constants.

webrtc/modules/audio_processing/aec3/suppression_gain.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_
 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_
 
 #include <array>
 #include <vector>
 
 #include "webrtc/modules/audio_processing/aec3/aec3_common.h"
 #include "webrtc/modules/audio_processing/aec3/render_signal_analyzer.h"
+#include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 
 class SuppressionGain {
  public:
-  explicit SuppressionGain(Aec3Optimization optimization);
+  SuppressionGain(const AudioProcessing::Config::EchoCanceller3& config,
+                  Aec3Optimization optimization);
   void GetGain(const std::array<float, kFftLengthBy2Plus1>& nearend,
                const std::array<float, kFftLengthBy2Plus1>& echo,
                const std::array<float, kFftLengthBy2Plus1>& comfort_noise,
                const RenderSignalAnalyzer& render_signal_analyzer,
                bool saturated_echo,
                const std::vector<std::vector<float>>& render,
                bool force_zero_gain,
                float* high_bands_gain,
                std::array<float, kFftLengthBy2Plus1>* low_band_gain);
 
  private:
+  void UpdateMaxGainIncrease(
+      size_t no_saturation_counter,
+      bool low_noise_render,
+      const std::array<float, kFftLengthBy2Plus1>& last_echo,
+      const std::array<float, kFftLengthBy2Plus1>& echo,
+      const std::array<float, kFftLengthBy2Plus1>& last_gain,
+      const std::array<float, kFftLengthBy2Plus1>& new_gain,
+      std::array<float, kFftLengthBy2Plus1>* gain_increase) const;
+
+  void GainToNoAudibleEcho(
+      bool low_noise_render,
+      bool saturated_echo,
+      const std::array<float, kFftLengthBy2Plus1>& nearend,
+      const std::array<float, kFftLengthBy2Plus1>& echo,
+      const std::array<float, kFftLengthBy2Plus1>& masker,
+      const std::array<float, kFftLengthBy2Plus1>& min_gain,
+      const std::array<float, kFftLengthBy2Plus1>& max_gain,
+      const std::array<float, kFftLengthBy2Plus1>& one_by_echo,
+      std::array<float, kFftLengthBy2Plus1>* gain) const;
+
+  void MaskingPower(const std::array<float, kFftLengthBy2Plus1>& nearend,
+                    const std::array<float, kFftLengthBy2Plus1>& comfort_noise,
+                    const std::array<float, kFftLengthBy2Plus1>& last_masker,
+                    const std::array<float, kFftLengthBy2Plus1>& gain,
+                    std::array<float, kFftLengthBy2Plus1>* masker) const;
+
   void LowerBandGain(bool stationary_with_low_power,
                      const rtc::Optional<int>& narrow_peak_band,
                      bool saturated_echo,
                      const std::array<float, kFftLengthBy2Plus1>& nearend,
                      const std::array<float, kFftLengthBy2Plus1>& echo,
                      const std::array<float, kFftLengthBy2Plus1>& comfort_noise,
                      std::array<float, kFftLengthBy2Plus1>* gain);
 
   class LowNoiseRenderDetector {
    public:
     bool Detect(const std::vector<std::vector<float>>& render);
 
    private:
     float average_power_ = 32768.f * 32768.f;
   };
 
   const Aec3Optimization optimization_;
   std::array<float, kFftLengthBy2Plus1> last_gain_;
   std::array<float, kFftLengthBy2Plus1> last_masker_;
   std::array<float, kFftLengthBy2Plus1> gain_increase_;
   std::array<float, kFftLengthBy2Plus1> last_echo_;
 
   LowNoiseRenderDetector low_render_detector_;
   size_t no_saturation_counter_ = 0;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SuppressionGain);
+  const AudioProcessing::Config::EchoCanceller3 config_;
+  RTC_DISALLOW_COPY_AND_ASSIGN(SuppressionGain);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_