Chromium Code Reviews| 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..6a9e1c3c98faddac4ca5c679fc48fd9660cbefbe 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" |
| @@ -18,9 +20,12 @@ namespace media { |
| class AudioManagerAndroid; |
| // Implements PCM audio input support for Android using the OpenSLES API. |
| +// This class is created and lives on the Audio Manager thread but recorded |
| +// audio buffers are given to us from an internal OpenSLES audio thread. |
| +// All public methods should be called on the Audio Manager thread. |
| class OpenSLESInputStream : public AudioInputStream { |
| public: |
| - static const int kNumOfQueuesInBuffer = 2; |
| + static const int kMaxNumOfBuffersInQueue = 2; |
| OpenSLESInputStream(AudioManagerAndroid* manager, |
| const AudioParameters& params); |
| @@ -41,9 +46,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 +63,12 @@ class OpenSLESInputStream : public AudioInputStream { |
| // the attached AudioInputCallback::OnError(). |
| void HandleError(SLresult error); |
| + base::ThreadChecker thread_checker_; |
| + |
| + // Protects |callback_|, |active_queue_|, |audio_data_|, |
| + // |buffer_size_bytes_| and |simple_buffer_queue_|. |
| + base::Lock lock_; |
| + |
| AudioManagerAndroid* audio_manager_; |
| AudioInputCallback* callback_; |
| @@ -73,9 +86,9 @@ class OpenSLESInputStream : public AudioInputStream { |
| // Audio buffers that are allocated in the constructor based on |
| // info from audio parameters. |
| - uint8* audio_data_[kNumOfQueuesInBuffer]; |
| + uint8* audio_data_[kMaxNumOfBuffersInQueue]; |
| - int active_queue_; |
| + int active_buffer_; |
|
tommi (sloooow) - chröme
2013/09/03 12:15:09
nit: active_buffer_index_
henrika (OOO until Aug 14)
2013/09/03 12:48:32
Done.
|
| int buffer_size_bytes_; |
| bool started_; |