Removed the indirect error message reporting in aec and aecm.

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.
  */
 
@@ skipping 76 matching lines @@
   size_t handle_index = 0;
   for (int i = 0; i < apm_->num_output_channels(); i++) {
     for (int j = 0; j < audio->num_channels(); j++) {
       Handle* my_handle = static_cast<Handle*>(handle(handle_index));
       err = WebRtcAec_BufferFarend(
           my_handle,
           audio->split_bands_const_f(j)[kBand0To8kHz],
           audio->num_frames_per_band());
 
       if (err != apm_->kNoError) {
-        return GetHandleError(my_handle);  // TODO(ajm): warning possible?
+        return MapError(err);  // TODO(ajm): warning possible?
       }
 
       handle_index++;
     }
   }
 
   return apm_->kNoError;
 }
 
 int EchoCancellationImpl::ProcessCaptureAudio(AudioBuffer* audio) {
@@ skipping 23 matching lines @@
       err = WebRtcAec_Process(
           my_handle,
           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 != apm_->kNoError) {
-        err = GetHandleError(my_handle);
+        err = MapError(err);
         // TODO(ajm): Figure out how to return warnings properly.
         if (err != apm_->kBadStreamParameterWarning) {
           return err;
         }
       }
 
       int status = 0;
       err = WebRtcAec_get_echo_status(my_handle, &status);
       if (err != apm_->kNoError) {
-        return GetHandleError(my_handle);
+        return MapError(err);
       }
 
       if (status == 1) {
         stream_has_echo_ = true;
       }
 
       handle_index++;
     }
   }
 
@@ skipping 71 matching lines @@
     return apm_->kNotEnabledError;
   }
 
   AecMetrics my_metrics;
   memset(&my_metrics, 0, sizeof(my_metrics));
   memset(metrics, 0, sizeof(Metrics));
 
   Handle* my_handle = static_cast<Handle*>(handle(0));
   int err = WebRtcAec_GetMetrics(my_handle, &my_metrics);
   if (err != apm_->kNoError) {
-    return GetHandleError(my_handle);
+    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;
   metrics->echo_return_loss.average = my_metrics.erl.average;
   metrics->echo_return_loss.maximum = my_metrics.erl.max;
@@ skipping 48 matching lines @@
   }
   if (std == NULL) {
     return apm_->kNullPointerError;
   }
 
   if (!is_component_enabled() || !delay_logging_enabled_) {
     return apm_->kNotEnabledError;
   }
 
   Handle* my_handle = static_cast<Handle*>(handle(0));
-  if (WebRtcAec_GetDelayMetrics(my_handle, median, std, fraction_poor_delays) !=
-      apm_->kNoError) {
-    return GetHandleError(my_handle);
+  const int err =
+      WebRtcAec_GetDelayMetrics(my_handle, median, std, fraction_poor_delays);
+  if (err != apm_->kNoError) {
+    return MapError(err);
   }
 
   return apm_->kNoError;
 }
 
 struct AecCore* EchoCancellationImpl::aec_core() const {
   CriticalSectionScoped crit_scoped(crit_);
   if (!is_component_enabled()) {
     return NULL;
   }
@@ skipping 52 matching lines @@
   return WebRtcAec_set_config(static_cast<Handle*>(handle), config);
 }
 
 int EchoCancellationImpl::num_handles_required() const {
   return apm_->num_output_channels() *
          apm_->num_reverse_channels();
 }
 
 int EchoCancellationImpl::GetHandleError(void* handle) const {
   assert(handle != NULL);
-  return MapError(WebRtcAec_get_error_code(static_cast<Handle*>(handle)));
+  return AudioProcessing::kUnspecifiedError;
 }
 }  // namespace webrtc