Chromium Code Reviews| Index: webkit/plugins/ppapi/ppb_video_decoder_impl.h |
| diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.h b/webkit/plugins/ppapi/ppb_video_decoder_impl.h |
| index 1040923d424dc9a9c7b5206fa77a7067dfb69da3..52fb49a01db6d2538c0e1516ba41921e2670a97e 100644 |
| --- a/webkit/plugins/ppapi/ppb_video_decoder_impl.h |
| +++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.h |
| @@ -15,7 +15,8 @@ |
| #include "webkit/plugins/ppapi/plugin_delegate.h" |
| #include "webkit/plugins/ppapi/resource.h" |
| -union PP_PictureData_Dev; |
| +struct PP_Picture_Dev; |
| +struct PP_PictureBuffer_Dev; |
| struct PP_VideoDecoderConfig_Dev; |
| struct PP_VideoBitstreamBuffer_Dev; |
| struct PPB_VideoDecoder_Dev; |
| @@ -47,8 +48,8 @@ class PPB_VideoDecoder_Impl : public Resource, |
| bool Decode(PP_VideoBitstreamBuffer_Dev* bitstream_buffer, |
| PP_CompletionCallback callback); |
| void AssignPictureBuffer(uint32_t no_of_picture_buffers, |
| - PP_PictureData_Dev* picture_buffers); |
| - void ReusePictureBuffer(PP_PictureData_Dev* picture_buffer); |
| + PP_PictureBuffer_Dev* picture_buffers); |
| + void ReusePictureBuffer(int32_t picture_buffer_id); |
| bool Flush(PP_CompletionCallback callback); |
| bool Abort(PP_CompletionCallback callback); |
| @@ -56,15 +57,23 @@ class PPB_VideoDecoder_Impl : public Resource, |
| virtual void ProvidePictureBuffers( |
| uint32_t requested_num_of_buffers, |
| const std::vector<uint32_t>& buffer_properties) OVERRIDE; |
| - virtual void DismissPictureBuffer( |
| - media::VideoDecodeAccelerator::PictureBuffer* picture_buffer) OVERRIDE; |
| + virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE; |
| virtual void PictureReady( |
| - media::VideoDecodeAccelerator::Picture* picture) OVERRIDE; |
| + media::VideoDecodeAccelerator::Picture& picture) OVERRIDE; |
|
scherkus (not reviewing)
2011/04/26 22:36:34
why ref versus pointer?
if ref we usually go with
vrk (LEFT CHROMIUM)
2011/04/27 00:40:33
Const-ref'ed!
|
| virtual void NotifyEndOfStream() OVERRIDE; |
| virtual void NotifyError( |
| media::VideoDecodeAccelerator::Error error) OVERRIDE; |
| private: |
| + static media::VideoDecodeAccelerator::PictureBuffer* |
| + CreateMediaPictureBuffer(struct PP_PictureBuffer_Dev& input); |
|
scherkus (not reviewing)
2011/04/26 22:36:34
nit: c++ doesn't need struct
also ref vs pointer
vrk (LEFT CHROMIUM)
2011/04/27 00:40:33
Done.
|
| + |
| + static media::VideoDecodeAccelerator::Picture* |
| + CreateMediaPicture(struct PP_Picture_Dev& input); |
|
scherkus (not reviewing)
2011/04/26 22:36:34
nit: c++ doesn't need struct
also ref vs pointer
vrk (LEFT CHROMIUM)
2011/04/27 00:40:33
Done.
|
| + |
| + static struct PP_Picture_Dev* CreatePictureDev( |
|
scherkus (not reviewing)
2011/04/26 22:36:34
nit: c++ doesn't need struct
also ref vs pointer
vrk (LEFT CHROMIUM)
2011/04/27 00:40:33
Done.
|
| + media::VideoDecodeAccelerator::Picture& input); |
| + |
| void OnAbortComplete(); |
| void OnBitstreamBufferProcessed(); |
| void OnFlushComplete(); |