Removed the dependency on AudioProcessingImpl in EchoControlMobileImpl

webrtc/modules/audio_processing/echo_control_mobile_impl.cc

 /*
  *  Copyright (c) 2012 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 46 matching lines @@
 // Maximum number of frames to buffer in the render queue.
 // TODO(peah): Decrease this once we properly handle hugely unbalanced
 // reverse and forward call numbers.
 static const size_t kMaxNumFramesToBuffer = 100;
 }  // namespace
 
 size_t EchoControlMobile::echo_path_size_bytes() {
   return WebRtcAecm_echo_path_size_bytes();
 }
 
+struct EchoControlMobileImpl::StreamProperties {
+  StreamProperties() = delete;
+  StreamProperties(int sample_rate_hz,
+                   size_t num_reverse_channels,
+                   size_t num_output_channels)
+      : sample_rate_hz(sample_rate_hz),
+        num_reverse_channels(num_reverse_channels),
+        num_output_channels(num_output_channels) {}
+
+  int sample_rate_hz;
+  size_t num_reverse_channels;
+  size_t num_output_channels;
+};
+
 class EchoControlMobileImpl::Canceller {
  public:
   Canceller() {
     state_ = WebRtcAecm_Create();
     RTC_CHECK(state_);
   }
 
   ~Canceller() {
     RTC_DCHECK(state_);
     WebRtcAecm_Free(state_);
@@ skipping 15 matching lines @@
                                       echo_path_size_bytes);
       RTC_DCHECK_EQ(AudioProcessing::kNoError, error);
     }
   }
 
  private:
   void* state_;
   RTC_DISALLOW_COPY_AND_ASSIGN(Canceller);
 };
 
-EchoControlMobileImpl::EchoControlMobileImpl(const AudioProcessing* apm,
-                                             rtc::CriticalSection* crit_render,
+EchoControlMobileImpl::EchoControlMobileImpl(rtc::CriticalSection* crit_render,
                                              rtc::CriticalSection* crit_capture)
-    : apm_(apm),
-      crit_render_(crit_render),
+    : crit_render_(crit_render),
       crit_capture_(crit_capture),
       routing_mode_(kSpeakerphone),
       comfort_noise_enabled_(true),
       external_echo_path_(NULL),
       render_queue_element_max_size_(0) {
-  RTC_DCHECK(apm);
   RTC_DCHECK(crit_render);
   RTC_DCHECK(crit_capture);
 }
 
 EchoControlMobileImpl::~EchoControlMobileImpl() {
     if (external_echo_path_ != NULL) {
       delete [] external_echo_path_;
       external_echo_path_ = NULL;
     }
 }
 
 int EchoControlMobileImpl::ProcessRenderAudio(const AudioBuffer* audio) {
   rtc::CritScope cs_render(crit_render_);
   if (!enabled_) {
     return AudioProcessing::kNoError;
   }
 
+  RTC_DCHECK(stream_properties_);
   RTC_DCHECK_GE(160u, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(audio->num_channels(), apm_->num_reverse_channels());
-  RTC_DCHECK_GE(cancellers_.size(),
-                apm_->num_output_channels() * audio->num_channels());
+  RTC_DCHECK_EQ(audio->num_channels(),
+                stream_properties_->num_reverse_channels);
+  RTC_DCHECK_GE(cancellers_.size(), stream_properties_->num_output_channels *
+                                        audio->num_channels());
 
   int err = AudioProcessing::kNoError;
   // The ordering convention must be followed to pass to the correct AECM.
   render_queue_buffer_.clear();
   int render_channel = 0;
   for (auto& canceller : cancellers_) {
     err = WebRtcAecm_GetBufferFarendError(
         canceller->state(),
         audio->split_bands_const(render_channel)[kBand0To8kHz],
         audio->num_frames_per_band());
@@ skipping 19 matching lines @@
     RTC_DCHECK_EQ(render_signal_queue_->Insert(&render_queue_buffer_), true);
   }
 
   return AudioProcessing::kNoError;
 }
 
 // Read chunks of data that were received and queued on the render side from
 // a queue. All the data chunks are buffered into the farend signal of the AEC.
 void EchoControlMobileImpl::ReadQueuedRenderData() {
   rtc::CritScope cs_capture(crit_capture_);
+  RTC_DCHECK(stream_properties_);
 
   if (!enabled_) {
     return;
   }
 
   while (render_signal_queue_->Remove(&capture_queue_buffer_)) {
     size_t buffer_index = 0;
-    size_t num_frames_per_band =
-        capture_queue_buffer_.size() /
-        (apm_->num_output_channels() * apm_->num_reverse_channels());
+    size_t num_frames_per_band = capture_queue_buffer_.size() /
+                                 (stream_properties_->num_output_channels *
+                                  stream_properties_->num_reverse_channels);
 
     for (auto& canceller : cancellers_) {
       WebRtcAecm_BufferFarend(canceller->state(),
                               &capture_queue_buffer_[buffer_index],
                               num_frames_per_band);
 
       buffer_index += num_frames_per_band;
     }
   }
 }
 
-int EchoControlMobileImpl::ProcessCaptureAudio(AudioBuffer* audio) {
+int EchoControlMobileImpl::ProcessCaptureAudio(AudioBuffer* audio,
+                                               int stream_delay_ms) {
   rtc::CritScope cs_capture(crit_capture_);
   if (!enabled_) {
     return AudioProcessing::kNoError;
   }
 
-  if (!apm_->was_stream_delay_set()) {
-    return AudioProcessing::kStreamParameterNotSetError;
-  }
-
+  RTC_DCHECK(stream_properties_);
   RTC_DCHECK_GE(160u, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(audio->num_channels(), apm_->num_output_channels());
-  RTC_DCHECK_GE(cancellers_.size(),
-                apm_->num_reverse_channels() * audio->num_channels());
+  RTC_DCHECK_EQ(audio->num_channels(), stream_properties_->num_output_channels);
+  RTC_DCHECK_GE(cancellers_.size(), stream_properties_->num_reverse_channels *
+                                        audio->num_channels());
 
   int err = AudioProcessing::kNoError;
 
   // The ordering convention must be followed to pass to the correct AECM.
   size_t handle_index = 0;
   for (size_t capture = 0; capture < audio->num_channels(); ++capture) {
     // TODO(ajm): improve how this works, possibly inside AECM.
     //            This is kind of hacked up.
     const int16_t* noisy = audio->low_pass_reference(capture);
     const int16_t* clean = audio->split_bands_const(capture)[kBand0To8kHz];
     if (noisy == NULL) {
       noisy = clean;
       clean = NULL;
     }
-    for (size_t render = 0; render < apm_->num_reverse_channels(); ++render) {
+    for (size_t render = 0; render < stream_properties_->num_reverse_channels;
+         ++render) {
       err = WebRtcAecm_Process(cancellers_[handle_index]->state(), noisy, clean,
                                audio->split_bands(capture)[kBand0To8kHz],
-                               audio->num_frames_per_band(),
-                               apm_->stream_delay_ms());
+                               audio->num_frames_per_band(), stream_delay_ms);
 
       if (err != AudioProcessing::kNoError) {
         return MapError(err);
       }
 
       ++handle_index;
     }
   }
   return AudioProcessing::kNoError;
 }
 
 int EchoControlMobileImpl::Enable(bool enable) {
   // Ensure AEC and AECM are not both enabled.
   rtc::CritScope cs_render(crit_render_);
   rtc::CritScope cs_capture(crit_capture_);
-  // The is_enabled call is safe from a deadlock perspective
-  // as both locks are allready held in the correct order.
-  if (enable && apm_->echo_cancellation()->is_enabled()) {
-    return AudioProcessing::kBadParameterError;
-  }
 
   if (enable &&
-      apm_->proc_sample_rate_hz() > AudioProcessing::kSampleRate16kHz) {
+      stream_properties_->sample_rate_hz > AudioProcessing::kSampleRate16kHz) {
     return AudioProcessing::kBadSampleRateError;
   }
 
   if (enable && !enabled_) {
     enabled_ = enable;  // Must be set before Initialize() is called.
-    Initialize();
+
+    // TODO(peah): Simplify once the Enable function has been removed from
+    // the public APM API.
+    RTC_DCHECK(stream_properties_);

[hlundin-webrtc, 2016/03/15 07:53:38]

Move the DCHECK to before line 256.

[peah-webrtc, 2016/03/15 08:18:31]

Of course! :$ Good catch!

+    Initialize(stream_properties_->sample_rate_hz,
+               stream_properties_->num_reverse_channels,
+               stream_properties_->num_output_channels);
   } else {
     enabled_ = enable;
   }
   return AudioProcessing::kNoError;
 }
 
 bool EchoControlMobileImpl::is_enabled() const {
   rtc::CritScope cs(crit_capture_);
   return enabled_;
 }
@@ skipping 41 matching lines @@
       // Size mismatch
       return AudioProcessing::kBadParameterError;
     }
 
     if (external_echo_path_ == NULL) {
       external_echo_path_ = new unsigned char[size_bytes];
     }
     memcpy(external_echo_path_, echo_path, size_bytes);
   }
 
-  Initialize();
+  // TODO(peah): Simplify once the Enable function has been removed from
+  // the public APM API.
+  RTC_DCHECK(stream_properties_);
+  Initialize(stream_properties_->sample_rate_hz,
+             stream_properties_->num_reverse_channels,
+             stream_properties_->num_output_channels);
   return AudioProcessing::kNoError;
 }
 
 int EchoControlMobileImpl::GetEchoPath(void* echo_path,
                                        size_t size_bytes) const {
   rtc::CritScope cs(crit_capture_);
   if (echo_path == NULL) {
     return AudioProcessing::kNullPointerError;
   }
   if (size_bytes != echo_path_size_bytes()) {
     // Size mismatch
     return AudioProcessing::kBadParameterError;
   }
   if (!enabled_) {
     return AudioProcessing::kNotEnabledError;
   }
 
   // Get the echo path from the first channel
   int32_t err =
       WebRtcAecm_GetEchoPath(cancellers_[0]->state(), echo_path, size_bytes);
   if (err != 0) {
     return MapError(err);
   }
 
   return AudioProcessing::kNoError;
 }
 
-void EchoControlMobileImpl::Initialize() {
+void EchoControlMobileImpl::Initialize(int sample_rate_hz,
+                                       size_t num_reverse_channels,
+                                       size_t num_output_channels) {
   rtc::CritScope cs_render(crit_render_);
   rtc::CritScope cs_capture(crit_capture_);
+
+  stream_properties_.reset(new StreamProperties(
+      sample_rate_hz, num_reverse_channels, num_output_channels));
+
   if (!enabled_) {
     return;
   }
 
-  if (apm_->proc_sample_rate_hz() > AudioProcessing::kSampleRate16kHz) {
+  if (stream_properties_->sample_rate_hz > AudioProcessing::kSampleRate16kHz) {
     LOG(LS_ERROR) << "AECM only supports 16 kHz or lower sample rates";
   }
 
-  int sample_rate_hz = apm_->proc_sample_rate_hz();
   cancellers_.resize(num_handles_required());
   for (auto& canceller : cancellers_) {
     if (!canceller) {
       canceller.reset(new Canceller());
     }
     canceller->Initialize(sample_rate_hz, external_echo_path_,
                           echo_path_size_bytes());
   }
 
   Configure();
@@ skipping 38 matching lines @@
   for (auto& canceller : cancellers_) {
     int handle_error = WebRtcAecm_set_config(canceller->state(), config);
     if (handle_error != AudioProcessing::kNoError) {
       error = handle_error;
     }
   }
   return error;
 }
 
 size_t EchoControlMobileImpl::num_handles_required() const {
-  // Not locked as it only relies on APM public API which is threadsafe.
-  return apm_->num_output_channels() * apm_->num_reverse_channels();
+  RTC_DCHECK(stream_properties_);
+  return stream_properties_->num_output_channels *
+         stream_properties_->num_reverse_channels;
 }
 }  // namespace webrtc