| Index: content/renderer/pepper/pepper_media_stream_track_host_base.h
|
| diff --git a/content/renderer/pepper/pepper_media_stream_track_host_base.h b/content/renderer/pepper/pepper_media_stream_track_host_base.h
|
| index bb34eb5798ccf2a5e52c2ff108f426064add9a61..a31c1e1fec18d97a0cb23bd8a8b6f5119a29d10d 100644
|
| --- a/content/renderer/pepper/pepper_media_stream_track_host_base.h
|
| +++ b/content/renderer/pepper/pepper_media_stream_track_host_base.h
|
| @@ -8,7 +8,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "content/common/content_export.h"
|
| #include "ppapi/host/resource_host.h"
|
| -#include "ppapi/shared_impl/media_stream_frame_buffer.h"
|
| +#include "ppapi/shared_impl/media_stream_buffer_manager.h"
|
|
|
| namespace content {
|
|
|
| @@ -16,21 +16,22 @@ class RendererPpapiHost;
|
|
|
| class PepperMediaStreamTrackHostBase
|
| : public ppapi::host::ResourceHost,
|
| - public ppapi::MediaStreamFrameBuffer::Delegate {
|
| + public ppapi::MediaStreamBufferManager::Delegate {
|
| protected:
|
| PepperMediaStreamTrackHostBase(RendererPpapiHost* host,
|
| PP_Instance instance,
|
| PP_Resource resource);
|
| virtual ~PepperMediaStreamTrackHostBase();
|
|
|
| - bool InitFrames(int32_t number_of_frames, int32_t frame_size);
|
| + bool InitBuffers(int32_t number_of_buffers, int32_t buffer_size);
|
|
|
| - ppapi::MediaStreamFrameBuffer* frame_buffer() { return &frame_buffer_; }
|
| + ppapi::MediaStreamBufferManager* buffer_manager() { return &buffer_manager_; }
|
|
|
| - // Sends a frame index to the corresponding MediaStreamTrackResourceBase
|
| - // via an IPC message. The resource adds the frame index into its
|
| - // |frame_buffer_| for reading or writing. Also see |MediaStreamFrameBuffer|.
|
| - void SendEnqueueFrameMessageToPlugin(int32_t index);
|
| + // Sends a buffer index to the corresponding MediaStreamTrackResourceBase
|
| + // via an IPC message. The resource adds the buffer index into its
|
| + // |buffer_manager_| for reading or writing.
|
| + // Also see |MediaStreamBufferManager|.
|
| + void SendEnqueueBufferMessageToPlugin(int32_t index);
|
|
|
| private:
|
| // Subclasses must implement this method to clean up when the track is closed.
|
| @@ -42,13 +43,13 @@ class PepperMediaStreamTrackHostBase
|
| ppapi::host::HostMessageContext* context) OVERRIDE;
|
|
|
| // Message handlers:
|
| - int32_t OnHostMsgEnqueueFrame(ppapi::host::HostMessageContext* context,
|
| + int32_t OnHostMsgEnqueueBuffer(ppapi::host::HostMessageContext* context,
|
| int32_t index);
|
| int32_t OnHostMsgClose(ppapi::host::HostMessageContext* context);
|
|
|
| RendererPpapiHost* host_;
|
|
|
| - ppapi::MediaStreamFrameBuffer frame_buffer_;
|
| + ppapi::MediaStreamBufferManager buffer_manager_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PepperMediaStreamTrackHostBase);
|
| };
|
|
|