Utilizing the AEC3 config struct for constants.

webrtc/modules/audio_processing/aec3/aec_state.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_AEC_STATE_H_
 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "webrtc/modules/audio_processing/aec3/aec3_common.h"
 #include "webrtc/modules/audio_processing/aec3/echo_path_variability.h"
 #include "webrtc/modules/audio_processing/aec3/erl_estimator.h"
 #include "webrtc/modules/audio_processing/aec3/erle_estimator.h"
 #include "webrtc/modules/audio_processing/aec3/render_buffer.h"
+#include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/rtc_base/array_view.h"
 #include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 
 class ApmDataDumper;
 
 // Handles the state and the conditions for the echo removal functionality.
 class AecState {
  public:
-  explicit AecState(float reverb_decay);
+  explicit AecState(const AudioProcessing::Config::EchoCanceller3& config);
   ~AecState();
 
   // Returns whether the linear filter estimate is usable.
   bool UsableLinearEstimate() const { return usable_linear_estimate_; }
 
   // Returns whether there has been echo leakage detected.
   bool EchoLeakageDetected() const { return echo_leakage_detected_; }
 
   // Returns whether the render signal is currently active.
   // TODO(peah): Deprecate this in an upcoming CL.
@@ skipping 88 matching lines @@
   bool capture_signal_saturation_ = false;
   bool echo_saturation_ = false;
   bool headset_detected_ = false;
   float previous_max_sample_ = 0.f;
   bool force_zero_gain_ = false;
   bool render_received_ = false;
   size_t force_zero_gain_counter_ = 0;
   rtc::Optional<size_t> filter_delay_;
   rtc::Optional<size_t> external_delay_;
   size_t blocks_since_last_saturation_ = 1000;
-  float reverb_decay_;
   float reverb_decay_to_test_ = 0.9f;
   float reverb_decay_candidate_ = 0.f;
   float reverb_decay_candidate_residual_ = -1.f;
   EchoAudibility echo_audibility_;
+  const AudioProcessing::Config::EchoCanceller3 config_;
+  float reverb_decay_;
 
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AecState);
+  RTC_DISALLOW_COPY_AND_ASSIGN(AecState);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_