Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / renderer / pepper / pepper_media_stream_audio_track_host.h

diff --git a/src/content/renderer/pepper/pepper_media_stream_audio_track_host.h b/src/content/renderer/pepper/pepper_media_stream_audio_track_host.h
index 348103c..c1f3335 100644 (file)
--- a/src/content/renderer/pepper/pepper_media_stream_audio_track_host.h
+++ b/src/content/renderer/pepper/pepper_media_stream_audio_track_host.h
@@ -15,6 +15,7 @@
 #include "content/public/renderer/media_stream_audio_sink.h"
 #include "content/renderer/pepper/pepper_media_stream_track_host_base.h"
 #include "media/audio/audio_parameters.h"
+#include "ppapi/host/host_message_context.h"
 #include "ppapi/shared_impl/media_stream_audio_track_shared.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 
@@ -45,16 +46,21 @@ class PepperMediaStreamAudioTrackHost : public PepperMediaStreamTrackHostBase {
     void EnqueueBuffer(int32_t index);
 
     // This function is called on the main thread.
-    void Configure(int32_t number_of_buffers);
+    int32_t Configure(int32_t number_of_buffers, int32_t duration,
+                      const ppapi::host::ReplyMessageContext& context);
+
+    // Send a reply to the currently pending |Configure()| request.
+    void SendConfigureReply(int32_t result);
 
    private:
     // Initializes buffers on the main thread.
-    void SetFormatOnMainThread(int bytes_per_second);
+    void SetFormatOnMainThread(int bytes_per_second, int bytes_per_frame);
 
     void InitBuffers();
 
     // Send enqueue buffer message on the main thread.
-    void SendEnqueueBufferMessageOnMainThread(int32_t index);
+    void SendEnqueueBufferMessageOnMainThread(int32_t index,
+                                              int32_t buffers_generation);
 
     // MediaStreamAudioSink overrides:
     // These two functions should be called on the audio thread.
@@ -92,12 +98,32 @@ class PepperMediaStreamAudioTrackHost : public PepperMediaStreamTrackHostBase {
     // Access only on the audio thread.
     uint32_t buffer_data_size_;
 
-    // A lock to protect the index queue |buffers_|.
+    // Index of the currently active buffer.
+    // Access only on the audio thread.
+    int active_buffer_index_;
+
+    // Generation of buffers corresponding to the currently active
+    // buffer. Used to make sure the active buffer is still valid.
+    // Access only on the audio thread.
+    int32_t active_buffers_generation_;
+
+    // Current offset, in bytes, within the currently active buffer.
+    // Access only on the audio thread.
+    uint32_t active_buffer_offset_;
+
+    // A lock to protect the index queue |buffers_|, |buffers_generation_|,
+    // buffers in |host_->buffer_manager()|, and |output_buffer_size_|.
     base::Lock lock_;
 
     // A queue for free buffer indices.
     std::deque<int32_t> buffers_;
 
+    // Generation of buffers. It is increased by every |InitBuffers()| call.
+    int32_t buffers_generation_;
+
+    // Intended size of each output buffer.
+    int32_t output_buffer_size_;
+
     scoped_refptr<base::MessageLoopProxy> main_message_loop_proxy_;
 
     base::ThreadChecker audio_thread_checker_;
@@ -110,6 +136,15 @@ class PepperMediaStreamAudioTrackHost : public PepperMediaStreamTrackHostBase {
     // Number of bytes per second.
     int bytes_per_second_;
 
+    // Number of bytes per frame = channels * bytes per sample.
+    int bytes_per_frame_;
+
+    // User-configured buffer duration, in milliseconds.
+    int32_t user_buffer_duration_;
+
+    // Pending |Configure()| reply context.
+    ppapi::host::ReplyMessageContext pending_configure_reply_;
+
     DISALLOW_COPY_AND_ASSIGN(AudioSink);
   };