Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: webrtc/modules/audio_processing/audio_processing_impl.cc

Issue 1783693005: Deprecate AudioProcessing::AnalyzeReverseStream(AudioFrame) API (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@voe
Patch Set: Rebasing Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: 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 1756e8506d1fa977c02179f08057b8385e1f3375..a09c1c9acf3362f53cbd9f968ad5a4b6a5cf0932 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::AnalyzeReverseStreamLocked(
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 @@ int AudioProcessingImpl::AnalyzeReverseStream(AudioFrame* frame) {
}
#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() {

Powered by Google App Engine
This is Rietveld 408576698