Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1663)

Unified Diff: content/renderer/video_decode_accelerator_host.h

Issue 6901036: Update VideoDecode PPAPI structs to be consistent with media structures, part 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make try bots happy Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper_plugin_delegate_impl.cc ('k') | content/renderer/video_decode_accelerator_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/video_decode_accelerator_host.h
diff --git a/content/renderer/video_decode_accelerator_host.h b/content/renderer/video_decode_accelerator_host.h
index c19b0b5fb3c6370edc272eb80350500c5858ec2f..7d7c3dcfe75dd5d7ca85fb6231a0b186faf64584 100644
--- a/content/renderer/video_decode_accelerator_host.h
+++ b/content/renderer/video_decode_accelerator_host.h
@@ -28,21 +28,26 @@ class VideoDecodeAcceleratorHost : public IPC::Channel::Listener,
virtual ~VideoDecodeAcceleratorHost();
// IPC::Channel::Listener implementation.
- virtual void OnChannelConnected(int32 peer_pid);
- virtual void OnChannelError();
- virtual bool OnMessageReceived(const IPC::Message& message);
+ virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelError() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
// media::VideoDecodeAccelerator implementation.
- virtual const std::vector<uint32>& GetConfig(
- const std::vector<uint32>& prototype_config);
- virtual bool Initialize(const std::vector<uint32>& config);
- virtual bool Decode(media::BitstreamBuffer* bitstream_buffer,
- media::VideoDecodeAcceleratorCallback* callback);
- virtual void AssignPictureBuffer(
- std::vector<PictureBuffer*> picture_buffers);
- virtual void ReusePictureBuffer(PictureBuffer* picture_buffer);
- virtual bool Flush(media::VideoDecodeAcceleratorCallback* callback);
- virtual bool Abort(media::VideoDecodeAcceleratorCallback* callback);
+ virtual void GetConfigs(
+ const std::vector<uint32>& requested_configs,
+ std::vector<uint32>* matched_configs) OVERRIDE;
+ virtual bool Initialize(
+ const std::vector<uint32>& config) OVERRIDE;
+ virtual bool Decode(
+ const media::BitstreamBuffer& bitstream_buffer,
+ media::VideoDecodeAcceleratorCallback* callback) OVERRIDE;
+ virtual void AssignGLESBuffers(
+ const std::vector<media::GLESBuffer>& buffers) OVERRIDE;
+ virtual void AssignSysmemBuffers(
+ const std::vector<media::SysmemBuffer>& buffers) OVERRIDE;
+ virtual void ReusePictureBuffer(uint32 picture_buffer_id) OVERRIDE;
+ virtual bool Flush(media::VideoDecodeAcceleratorCallback* callback) OVERRIDE;
+ virtual bool Abort(media::VideoDecodeAcceleratorCallback* callback) OVERRIDE;
private:
// Message loop that this object runs on.
@@ -67,8 +72,6 @@ class VideoDecodeAcceleratorHost : public IPC::Channel::Listener,
// TODO(vmr): move into plugin provided IPC buffers.
scoped_ptr<base::SharedMemory> input_transfer_buffer_;
- std::vector<uint32> configs_;
-
DISALLOW_COPY_AND_ASSIGN(VideoDecodeAcceleratorHost);
};
« no previous file with comments | « content/renderer/pepper_plugin_delegate_impl.cc ('k') | content/renderer/video_decode_accelerator_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698