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

Unified Diff: content/renderer/media/webrtc_audio_device_impl.h

Issue 131213003: Fixed the racing in the resampler of webrtc when two streams are calling OnData() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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: content/renderer/media/webrtc_audio_device_impl.h
diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h
index f515c6e24cbc2bcea6d2bcb7fb027e6cc39b23e0..89f145991cc155aefdf58bbc3b695eeb9eb5d71b 100644
--- a/content/renderer/media/webrtc_audio_device_impl.h
+++ b/content/renderer/media/webrtc_audio_device_impl.h
@@ -385,6 +385,10 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl
// |recording_| and |microphone_volume_|.
mutable base::Lock lock_;
+ // Used to protect the racing of calling OnData() since there can be more
+ // than one input streams calling OnData().
henrika (OOO until Aug 14) 2014/01/09 10:07:14 Do we know on which threads these calls are made?
no longer working on chromium 2014/01/09 10:18:32 Threads can be the from WebRtcAudioCapturer and fr
+ mutable base::Lock capture_callback_lock_;
+
bool initialized_;
bool playing_;
bool recording_;
« no previous file with comments | « no previous file | content/renderer/media/webrtc_audio_device_impl.cc » ('j') | content/renderer/media/webrtc_audio_device_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698