commit b031955770f25f9727d5166a3be8d1e118ce6b48
author aluebs <aluebs@webrtc.org> Thu Mar 17 20:39:53 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Mar 18 03:39:57 2016 +0000
tree 6942a11b6e08251b6eda6dae0af5af8bb3806ee8
parent da116c4c3739204ff24a3287156bc8250cff8d5b

Deprecate AudioProcessing::AnalyzeReverseStream(AudioFrame) API

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

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

webrtc/modules/audio_processing/audio_processing_impl.cc

diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index 1756e85..a09c1c9 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -837,17 +837,6 @@
 int AudioProcessingImpl::ProcessReverseStream(AudioFrame* frame) {
   TRACE_EVENT0("webrtc", "AudioProcessing::ProcessReverseStream_AudioFrame");
   rtc::CritScope cs(&crit_render_);
-  RETURN_ON_ERR(AnalyzeReverseStream(frame));
-  if (is_rev_processed()) {
-    render_.render_audio->InterleaveTo(frame, true);
-  }
-
-  return kNoError;
-}
-
-int AudioProcessingImpl::AnalyzeReverseStream(AudioFrame* frame) {
-  TRACE_EVENT0("webrtc", "AudioProcessing::AnalyzeReverseStream_AudioFrame");
-  rtc::CritScope cs(&crit_render_);
   if (frame == nullptr) {
     return kNullPointerError;
   }
@@ -893,7 +882,11 @@
   }
 #endif
   render_.render_audio->DeinterleaveFrom(frame);
-  return ProcessReverseStreamLocked();
+  RETURN_ON_ERR(ProcessReverseStreamLocked());
+  if (is_rev_processed()) {
+    render_.render_audio->InterleaveTo(frame, true);
+  }
+  return kNoError;
 }
 
 int AudioProcessingImpl::ProcessReverseStreamLocked() {