Minor cleaning up of the EchoCancellationImpl code

webrtc/modules/audio_processing/echo_cancellation_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.
  */
 
 #include "webrtc/modules/audio_processing/echo_cancellation_impl.h"
 
 #include <assert.h>
 #include <string.h>
 
 #include "webrtc/modules/audio_processing/aec/aec_core.h"
 #include "webrtc/modules/audio_processing/aec/echo_cancellation.h"
 #include "webrtc/modules/audio_processing/audio_buffer.h"
 
 namespace webrtc {
 
-typedef void Handle;
-
 namespace {
 int16_t MapSetting(EchoCancellation::SuppressionLevel level) {
   switch (level) {
     case EchoCancellation::kLowSuppression:
       return kAecNlpConservative;
     case EchoCancellation::kModerateSuppression:
       return kAecNlpModerate;
     case EchoCancellation::kHighSuppression:
       return kAecNlpAggressive;
   }
@@ skipping 20 matching lines @@
 // Maximum length that a frame of samples can have.
 static const size_t kMaxAllowedValuesOfSamplesPerFrame = 160;
 // 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
 
 class EchoCancellationImpl::Canceller {
  public:
-  explicit Canceller(int sample_rate_hz) {
+  Canceller() {
     state_ = WebRtcAec_Create();
     RTC_DCHECK(state_);
   }
 
   ~Canceller() {
     RTC_CHECK(state_);
     WebRtcAec_Free(state_);
   }
 
-  Handle* state() { return state_; }
+  void* state() { return state_; }
 
   void Initialize(int sample_rate_hz) {
     // TODO(ajm): Drift compensation is disabled in practice. If restored, it
     // should be managed internally and not depend on the hardware sample rate.
     // For now, just hardcode a 48 kHz value.
     const int error = WebRtcAec_Init(state_, sample_rate_hz, 48000);
     RTC_DCHECK_EQ(0, error);
   }
 
  private:
-  Handle* state_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Canceller);
+  void* state_;
 };
 
 EchoCancellationImpl::EchoCancellationImpl(const AudioProcessing* apm,
                                            rtc::CriticalSection* crit_render,
                                            rtc::CriticalSection* crit_capture)
     : apm_(apm),
       crit_render_(crit_render),
       crit_capture_(crit_capture),
       drift_compensation_enabled_(false),
       metrics_enabled_(false),
@@ skipping 24 matching lines @@
   RTC_DCHECK_GE(cancellers_.size(),
                 apm_->num_output_channels() * audio->num_channels());
 
   int err = AudioProcessing::kNoError;
 
   // The ordering convention must be followed to pass to the correct AEC.
   size_t handle_index = 0;
   render_queue_buffer_.clear();
   for (size_t i = 0; i < apm_->num_output_channels(); i++) {
     for (size_t j = 0; j < audio->num_channels(); j++) {
-      Handle* my_handle = cancellers_[handle_index++]->state();
       // Retrieve any error code produced by the buffering of the farend
       // signal.
       err = WebRtcAec_GetBufferFarendError(
-          my_handle, audio->split_bands_const_f(j)[kBand0To8kHz],
+          cancellers_[handle_index++]->state(),
+          audio->split_bands_const_f(j)[kBand0To8kHz],
           audio->num_frames_per_band());
 
       if (err != AudioProcessing::kNoError) {
         return MapError(err);  // TODO(ajm): warning possible?
       }
 
       // Buffer the samples in the render queue.
       render_queue_buffer_.insert(render_queue_buffer_.end(),
                                   audio->split_bands_const_f(j)[kBand0To8kHz],
                                   (audio->split_bands_const_f(j)[kBand0To8kHz] +
@@ skipping 22 matching lines @@
   }
 
   while (render_signal_queue_->Remove(&capture_queue_buffer_)) {
     size_t handle_index = 0;
     size_t buffer_index = 0;
     const size_t num_frames_per_band =
         capture_queue_buffer_.size() /
         (apm_->num_output_channels() * apm_->num_reverse_channels());
     for (size_t i = 0; i < apm_->num_output_channels(); i++) {
       for (size_t j = 0; j < apm_->num_reverse_channels(); j++) {
-        Handle* my_handle = cancellers_[handle_index++]->state();
-        WebRtcAec_BufferFarend(my_handle, &capture_queue_buffer_[buffer_index],
+        WebRtcAec_BufferFarend(cancellers_[handle_index++]->state(),
+                               &capture_queue_buffer_[buffer_index],
                                num_frames_per_band);
 
         buffer_index += num_frames_per_band;
       }
     }
   }
 }
 
 int EchoCancellationImpl::ProcessCaptureAudio(AudioBuffer* audio) {
   rtc::CritScope cs_capture(crit_capture_);
@@ skipping 12 matching lines @@
   RTC_DCHECK_GE(160u, audio->num_frames_per_band());
   RTC_DCHECK_EQ(audio->num_channels(), apm_->num_proc_channels());
 
   int err = AudioProcessing::kNoError;
 
   // The ordering convention must be followed to pass to the correct AEC.
   size_t handle_index = 0;
   stream_has_echo_ = false;
   for (size_t i = 0; i < audio->num_channels(); i++) {
     for (size_t j = 0; j < apm_->num_reverse_channels(); j++) {
-      Handle* my_handle = cancellers_[handle_index++]->state();
-      err = WebRtcAec_Process(my_handle, audio->split_bands_const_f(i),
-                              audio->num_bands(), audio->split_bands_f(i),
+      err = WebRtcAec_Process(cancellers_[handle_index]->state(),
+                              audio->split_bands_const_f(i), audio->num_bands(),
+                              audio->split_bands_f(i),
                               audio->num_frames_per_band(),
                               apm_->stream_delay_ms(), stream_drift_samples_);
 
       if (err != AudioProcessing::kNoError) {
         err = MapError(err);
         // TODO(ajm): Figure out how to return warnings properly.
         if (err != AudioProcessing::kBadStreamParameterWarning) {
           return err;
         }
       }
 
       int status = 0;
-      err = WebRtcAec_get_echo_status(my_handle, &status);
+      err = WebRtcAec_get_echo_status(cancellers_[handle_index]->state(),
+                                      &status);
       if (err != AudioProcessing::kNoError) {
         return MapError(err);
       }
 
       if (status == 1) {
         stream_has_echo_ = true;
       }
+
+      handle_index++;
     }
   }
 
   was_stream_drift_set_ = false;
   return AudioProcessing::kNoError;
 }
 
 int EchoCancellationImpl::Enable(bool enable) {
   // Run in a single-threaded manner.
   rtc::CritScope cs_render(crit_render_);
@@ skipping 82 matching lines @@
   }
 
   if (!enabled_ || !metrics_enabled_) {
     return AudioProcessing::kNotEnabledError;
   }
 
   AecMetrics my_metrics;
   memset(&my_metrics, 0, sizeof(my_metrics));
   memset(metrics, 0, sizeof(Metrics));
 
-  Handle* my_handle = cancellers_[0]->state();
-  int err = WebRtcAec_GetMetrics(my_handle, &my_metrics);
+  const int err = WebRtcAec_GetMetrics(cancellers_[0]->state(), &my_metrics);
   if (err != AudioProcessing::kNoError) {
     return MapError(err);
   }
 
   metrics->residual_echo_return_loss.instant = my_metrics.rerl.instant;
   metrics->residual_echo_return_loss.average = my_metrics.rerl.average;
   metrics->residual_echo_return_loss.maximum = my_metrics.rerl.max;
   metrics->residual_echo_return_loss.minimum = my_metrics.rerl.min;
 
   metrics->echo_return_loss.instant = my_metrics.erl.instant;
@@ skipping 61 matching lines @@
     return AudioProcessing::kNullPointerError;
   }
   if (std == NULL) {
     return AudioProcessing::kNullPointerError;
   }
 
   if (!enabled_ || !delay_logging_enabled_) {
     return AudioProcessing::kNotEnabledError;
   }
 
-  Handle* my_handle = cancellers_[0]->state();
-  const int err =
-      WebRtcAec_GetDelayMetrics(my_handle, median, std, fraction_poor_delays);
+  const int err = WebRtcAec_GetDelayMetrics(cancellers_[0]->state(), median,
+                                            std, fraction_poor_delays);
   if (err != AudioProcessing::kNoError) {
     return MapError(err);
   }
 
   return AudioProcessing::kNoError;
 }
 
 struct AecCore* EchoCancellationImpl::aec_core() const {
   rtc::CritScope cs(crit_capture_);
   if (!enabled_) {
     return NULL;
   }
-  Handle* my_handle = cancellers_[0]->state();
-  return WebRtcAec_aec_core(my_handle);
+  return WebRtcAec_aec_core(cancellers_[0]->state());
 }
 
 void EchoCancellationImpl::Initialize() {
   rtc::CritScope cs_render(crit_render_);
   rtc::CritScope cs_capture(crit_capture_);
   if (!enabled_) {
     return;
   }
-  const int sample_rate_hz = apm_->proc_sample_rate_hz();
 
   if (num_handles_required() > cancellers_.size()) {
     const size_t cancellers_old_size = cancellers_.size();
     cancellers_.resize(num_handles_required());
 
     for (size_t i = cancellers_old_size; i < cancellers_.size(); ++i) {
-      cancellers_[i].reset(new Canceller(sample_rate_hz));
+      cancellers_[i].reset(new Canceller());
     }
   }
 
-  for (size_t i = 0; i < cancellers_.size(); ++i) {
-    cancellers_[i]->Initialize(sample_rate_hz);
+  const int sample_rate_hz = apm_->proc_sample_rate_hz();
+  for (auto& canceller : cancellers_) {
+    canceller->Initialize(sample_rate_hz);
   }
 
   Configure();
 
   AllocateRenderQueue();
 }
 
 int EchoCancellationImpl::GetSystemDelayInSamples() const {
   rtc::CritScope cs(crit_capture_);
   RTC_DCHECK(enabled_);
@@ skipping 42 matching lines @@
 int EchoCancellationImpl::Configure() {
   rtc::CritScope cs_render(crit_render_);
   rtc::CritScope cs_capture(crit_capture_);
   AecConfig config;
   config.metricsMode = metrics_enabled_;
   config.nlpMode = MapSetting(suppression_level_);
   config.skewMode = drift_compensation_enabled_;
   config.delay_logging = delay_logging_enabled_;
 
   int error = AudioProcessing::kNoError;
-  for (size_t i = 0; i < cancellers_.size(); i++) {
-    Handle* my_handle = cancellers_[i]->state();
-    WebRtcAec_enable_extended_filter(WebRtcAec_aec_core(my_handle),
+  for (auto& canceller : cancellers_) {
+    WebRtcAec_enable_extended_filter(WebRtcAec_aec_core(canceller->state()),
                                      extended_filter_enabled_ ? 1 : 0);
-    WebRtcAec_enable_delay_agnostic(WebRtcAec_aec_core(my_handle),
+    WebRtcAec_enable_delay_agnostic(WebRtcAec_aec_core(canceller->state()),
                                     delay_agnostic_enabled_ ? 1 : 0);
-    WebRtcAec_enable_aec3(WebRtcAec_aec_core(my_handle), aec3_enabled_ ? 1 : 0);
-    const int handle_error = WebRtcAec_set_config(my_handle, config);
+    WebRtcAec_enable_aec3(WebRtcAec_aec_core(canceller->state()),
+                          aec3_enabled_ ? 1 : 0);
+    const int handle_error = WebRtcAec_set_config(canceller->state(), config);
     if (handle_error != AudioProcessing::kNoError) {
       error = AudioProcessing::kNoError;
     }
   }
   return error;
 }
 
 size_t EchoCancellationImpl::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();
 }
 
 }  // namespace webrtc