commit b8fbb542910f5dbe188af5ab16b65b765dea298e
author peah <peah@webrtc.org> Tue Mar 15 09:28:08 2016
committer Commit bot <commit-bot@chromium.org> Tue Mar 15 09:28:12 2016
tree b8cb7db34288376e0c6989d06f97f51b40d7340e
parent f8cdd184d5299773dfb16063e8690aa2b5bad3ae

Removed the dependency on AudioProcessingImpl in GainControlImpl

BUG=webrtc:5353

Review URL: https://codereview.webrtc.org/1801003002

Cr-Commit-Position: refs/heads/master@{#11994}

webrtc/modules/audio_processing/gain_control_impl.h

diff --git a/webrtc/modules/audio_processing/gain_control_impl.h b/webrtc/modules/audio_processing/gain_control_impl.h
index b5fe1e3..6841d5d 100644
--- a/webrtc/modules/audio_processing/gain_control_impl.h
+++ b/webrtc/modules/audio_processing/gain_control_impl.h
@@ -27,16 +27,15 @@
 
 class GainControlImpl : public GainControl {
  public:
-  GainControlImpl(const AudioProcessing* apm,
-                  rtc::CriticalSection* crit_render,
+  GainControlImpl(rtc::CriticalSection* crit_render,
                   rtc::CriticalSection* crit_capture);
   ~GainControlImpl() override;
 
   int ProcessRenderAudio(AudioBuffer* audio);
   int AnalyzeCaptureAudio(AudioBuffer* audio);
-  int ProcessCaptureAudio(AudioBuffer* audio);
+  int ProcessCaptureAudio(AudioBuffer* audio, bool stream_has_echo);
 
-  void Initialize();
+  void Initialize(size_t num_proc_channels, int sample_rate_hz);
 
   // GainControl implementation.
   bool is_enabled() const override;
@@ -64,14 +63,9 @@
   int analog_level_maximum() const override;
   bool stream_is_saturated() const override;
 
-  size_t num_handles_required() const;
-
   void AllocateRenderQueue();
   int Configure();
 
-  // Not guarded as its public API is thread safe.
-  const AudioProcessing* apm_;
-
   rtc::CriticalSection* const crit_render_ ACQUIRED_BEFORE(crit_capture_);
   rtc::CriticalSection* const crit_capture_;
 
@@ -99,6 +93,9 @@
 
   std::vector<std::unique_ptr<GainController>> gain_controllers_;
 
+  rtc::Optional<size_t> num_proc_channels_ GUARDED_BY(crit_capture_);
+  rtc::Optional<int> sample_rate_hz_ GUARDED_BY(crit_capture_);
+
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(GainControlImpl);
 };
 }  // namespace webrtc