commit 4bc66fc3879e7bd3fcd6f7dedf0c4bb35e88e66f
author Michael Graczyk <mgraczyk@chromium.org> Mon Aug 10 15:26:38 2015 -0700
committer Michael Graczyk <mgraczyk@chromium.org> Mon Aug 10 22:26:43 2015 +0000
tree 757b30e2db4b2081a8c454f84936fea831c57d22
parent 4de6622bccb0e8ba3dff9de26ca69e3adf7a4eba

Fix data race in AMP.

R=aluebs@webrtc.org, aluebs-webrtc
BUG=516637

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

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

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 bbfb771..81d6c70 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -489,6 +489,7 @@
                                        int output_sample_rate_hz,
                                        ChannelLayout output_layout,
                                        float* const* dest) {
+  CriticalSectionScoped crit_scoped(crit_);
   StreamConfig input_stream = api_format_.input_stream();
   input_stream.set_sample_rate_hz(input_sample_rate_hz);
   input_stream.set_num_channels(ChannelsFromLayout(input_layout));