Removed the AudioProcessing dependency in EchoCancellerImpl

webrtc/modules/audio_processing/echo_cancellation_impl.h

Index: webrtc/modules/audio_processing/echo_cancellation_impl.h
diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.h b/webrtc/modules/audio_processing/echo_cancellation_impl.h
index ff7c3ae319eb67eb603504f53f8709b4278cbef8..9cc5da1f9fa43981e5b8634ad0dbaa1716cea972 100644
--- a/webrtc/modules/audio_processing/echo_cancellation_impl.h
+++ b/webrtc/modules/audio_processing/echo_cancellation_impl.h
@@ -25,13 +25,12 @@ class AudioBuffer;
 
 class EchoCancellationImpl : public EchoCancellation {
  public:
-  EchoCancellationImpl(const AudioProcessing* apm,
-                       rtc::CriticalSection* crit_render,
+  EchoCancellationImpl(rtc::CriticalSection* crit_render,
                        rtc::CriticalSection* crit_capture);
   virtual ~EchoCancellationImpl();
 
   int ProcessRenderAudio(const AudioBuffer* audio);
-  int ProcessCaptureAudio(AudioBuffer* audio);
+  int ProcessCaptureAudio(AudioBuffer* audio, int stream_delay_ms);
 
   // EchoCancellation implementation.
   bool is_enabled() const override;
@@ -40,6 +39,10 @@ class EchoCancellationImpl : public EchoCancellation {
   bool is_drift_compensation_enabled() const override;
 
   void Initialize();

[the sun, 2016/03/11 10:26:02]

Not used?

[peah-webrtc, 2016/03/11 13:49:16]

Done.

+  void Initialize(int sample_rate_hz,
+                  size_t num_reverse_channels_,
+                  size_t num_output_channels_,
+                  size_t num_proc_channels_);
   void SetExtraOptions(const Config& config);
   bool is_delay_agnostic_enabled() const;
   bool is_extended_filter_enabled() const;
@@ -54,6 +57,7 @@ class EchoCancellationImpl : public EchoCancellation {
 
  private:
   class Canceller;
+  struct StreamProperties;
 
   // EchoCancellation implementation.
   int Enable(bool enable) override;
@@ -73,13 +77,11 @@ class EchoCancellationImpl : public EchoCancellation {
 
   struct AecCore* aec_core() const override;
 
-  size_t num_handles_required() const;
+  size_t NumCancellersRequired() 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_;
@@ -106,6 +108,8 @@ class EchoCancellationImpl : public EchoCancellation {
       render_signal_queue_;
 
   std::vector<std::unique_ptr<Canceller>> cancellers_;
+  std::unique_ptr<StreamProperties> stream_properties_;
+
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoCancellationImpl);
 };