Index: media/audio/android/opensles_input.h |
diff --git a/media/audio/android/opensles_input.h b/media/audio/android/opensles_input.h |
index 9743992fc653e16cacbbce8644acec4e4d361f63..6bdaed1389df26dd720f43c8d167edb188ff4689 100644 |
--- a/media/audio/android/opensles_input.h |
+++ b/media/audio/android/opensles_input.h |
@@ -9,6 +9,8 @@ |
#include <SLES/OpenSLES_Android.h> |
#include "base/compiler_specific.h" |
+#include "base/synchronization/lock.h" |
+#include "base/threading/thread_checker.h" |
#include "media/audio/audio_io.h" |
#include "media/audio/audio_parameters.h" |
#include "media/audio/android/opensles_util.h" |
@@ -41,9 +43,11 @@ class OpenSLESInputStream : public AudioInputStream { |
private: |
bool CreateRecorder(); |
+ // Called from OpenSLES specific audio worker thread. |
static void SimpleBufferQueueCallback( |
SLAndroidSimpleBufferQueueItf buffer_queue, void* instance); |
+ // Called from OpenSLES specific audio worker thread. |
void ReadBufferQueue(); |
// Called in Open(); |
@@ -56,6 +60,12 @@ class OpenSLESInputStream : public AudioInputStream { |
// the attached AudioInputCallback::OnError(). |
void HandleError(SLresult error); |
+ base::ThreadChecker thread_checker_; |
+ |
+ // Protects |started_|, |callback_|, |active_queue_|, |audio_data_|, |
+ // |buffer_size_bytes_| and |simple_buffer_queue_|. |
+ base::Lock lock_; |
+ |
AudioManagerAndroid* audio_manager_; |
AudioInputCallback* callback_; |