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

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

Issue 1410833002: Lock scheme #4: Introduced the render sample queue for the aec and aecm (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@aec_error_report_CL
Patch Set: Merge with latest master Created 5 years, 1 month 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
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/echo_cancellation_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 668ec11e91da4165a2fe5815907296d10f7ad213..0daaf1f449d08ff5648d2c8f894587561ec26d79 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -530,6 +530,9 @@ int AudioProcessingImpl::ProcessStream(const float* const* src,
return kNullPointerError;
}
+ echo_cancellation_->ReadQueuedRenderData();
+ echo_control_mobile_->ReadQueuedRenderData();
+
ProcessingConfig processing_config = api_format_;
processing_config.input_stream() = input_config;
processing_config.output_stream() = output_config;
@@ -571,6 +574,9 @@ int AudioProcessingImpl::ProcessStream(const float* const* src,
int AudioProcessingImpl::ProcessStream(AudioFrame* frame) {
CriticalSectionScoped crit_scoped(crit_);
+ echo_cancellation_->ReadQueuedRenderData();
+ echo_control_mobile_->ReadQueuedRenderData();
+
if (!frame) {
return kNullPointerError;
}
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/echo_cancellation_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698