Chromium Code Reviews| Index: content/renderer/pepper_platform_video_decoder_impl.h |
| diff --git a/content/renderer/pepper_platform_video_decoder_impl.h b/content/renderer/pepper_platform_video_decoder_impl.h |
| index 4f10db657b79f7bc60ee52cc3e1f76d1be3d2bdb..97447cd281541eaad68fb7a7142300b9fee34402 100644 |
| --- a/content/renderer/pepper_platform_video_decoder_impl.h |
| +++ b/content/renderer/pepper_platform_video_decoder_impl.h |
| @@ -14,6 +14,9 @@ |
| #include "webkit/plugins/ppapi/plugin_delegate.h" |
| class GpuChannelHost; |
| +namespace gpu { |
| +class CommandBufferHelper; |
| +} |
| class PlatformVideoDecoderImpl |
| : public webkit::ppapi::PluginDelegate::PlatformVideoDecoder, |
| @@ -22,7 +25,8 @@ class PlatformVideoDecoderImpl |
| public: |
| explicit PlatformVideoDecoderImpl( |
|
scherkus (not reviewing)
2011/06/27 22:54:47
does this need to be explicit?
Ami GONE FROM CHROMIUM
2011/06/28 00:06:35
Done.
|
| media::VideoDecodeAccelerator::Client* client, |
| - uint32 command_buffer_route_id); |
| + int32 command_buffer_route_id, |
| + gpu::CommandBufferHelper* cmd_buffer_helper); |
| virtual ~PlatformVideoDecoderImpl(); |
| // PlatformVideoDecoder implementation. |
| @@ -30,15 +34,15 @@ class PlatformVideoDecoderImpl |
| const std::vector<uint32>& requested_configs, |
| std::vector<uint32>* matched_configs) OVERRIDE; |
| virtual bool Initialize(const std::vector<uint32>& config) OVERRIDE; |
| - virtual bool Decode( |
| + virtual void Decode( |
| const media::BitstreamBuffer& bitstream_buffer) OVERRIDE; |
| virtual void AssignGLESBuffers( |
| const std::vector<media::GLESBuffer>& buffers) OVERRIDE; |
| virtual void AssignSysmemBuffers( |
| const std::vector<media::SysmemBuffer>& buffers) OVERRIDE; |
| virtual void ReusePictureBuffer(int32 picture_buffer_id); |
| - virtual bool Flush() OVERRIDE; |
| - virtual bool Abort() OVERRIDE; |
| + virtual void Flush() OVERRIDE; |
| + virtual void Abort() OVERRIDE; |
| // VideoDecodeAccelerator::Client implementation. |
| virtual void ProvidePictureBuffers( |
| @@ -65,7 +69,10 @@ class PlatformVideoDecoderImpl |
| media::VideoDecodeAccelerator::Client* client_; |
| // Route ID for the command buffer associated with video decoder's context. |
| - uint32 command_buffer_route_id_; |
| + int32 command_buffer_route_id_; |
| + |
| + // Helper for the command buffer associated with video decoder's context. |
| + gpu::CommandBufferHelper* cmd_buffer_helper_; |
| // Host for GpuVideoDecodeAccelerator. |
| scoped_ptr<media::VideoDecodeAccelerator> decoder_; |