Update VideoDecode PPAPI structs to be consistent with media structures, part 1

media/video/picture.cc

Index: media/video/picture.cc
diff --git a/media/video/picture.cc b/media/video/picture.cc
index dd57e4af4d3f3ce89d9fd6d85104fd9c48e73df7..68e70c771abd795a8454f00159ad825d7ca06cb0 100644
--- a/media/video/picture.cc
+++ b/media/video/picture.cc
@@ -6,67 +6,21 @@
 
 namespace media {
 

[Ami GONE FROM CHROMIUM, 2011/05/03 23:34:47]

Add a comment pointing to the far-away implementations?

[scherkus (not reviewing), 2011/05/04 00:03:28]

woah there are far away implementations!?

[vrk (LEFT CHROMIUM), 2011/05/05 05:57:12]

Done.

[vrk (LEFT CHROMIUM), 2011/05/05 05:57:12]

The other constructors (e.g. BufferInfo(const PP_BufferInfo_Dev& info)) are in
webkit/plugins/ppapi/ppb_video_decoder_impl.cc; they're defined there instead of
here because of dependency reasons. Looks like ami's suggestion is a good one!
:)

-// PictureBuffer implementation.
-PictureBuffer::PictureBuffer(int32 id,
-                             gfx::Size pixel_size,
-                             std::vector<uint32> color_format,
-                             MemoryType memory_type,
-                             std::vector<DataPlaneHandle> data_plane_handles)
-    : id_(id),
-      pixel_size_(pixel_size),
-      color_format_(color_format),
-      memory_type_(memory_type),
-      data_plane_handles_(data_plane_handles) {
+BufferInfo::BufferInfo(int32 id, gfx::Size size)
+  : id_(id),

[scherkus (not reviewing), 2011/05/04 00:03:28]

should be indented by 2 more spaces

[vrk (LEFT CHROMIUM), 2011/05/05 05:57:12]

Done.

+    size_(size) {
 }
 
-PictureBuffer::~PictureBuffer() {}
-
-int32 PictureBuffer::GetId() {
-  return id_;
-}
-
-gfx::Size PictureBuffer::GetSize() {
-  return pixel_size_;
-}
-
-const std::vector<uint32>& PictureBuffer::GetColorFormat() {
-  return color_format_;
+GLESBuffer::GLESBuffer(
+    int32 id, gfx::Size size, uint32 texture_id, uint32 context_id)
+    : texture_id_(texture_id),
+      context_id_(context_id),
+      info_(id, size) {
 }
 
-PictureBuffer::MemoryType PictureBuffer::GetMemoryType() {
-  return memory_type_;
-}
-
-std::vector<PictureBuffer::DataPlaneHandle>& PictureBuffer::GetPlaneHandles() {
-  return data_plane_handles_;
-}
-
-// Picture implementation.
-Picture::Picture(PictureBuffer* picture_buffer, gfx::Size decoded_pixel_size,
-                 gfx::Size visible_pixel_size, void* user_handle)
-    : picture_buffer_(picture_buffer),
-      decoded_pixel_size_(decoded_pixel_size),
-      visible_pixel_size_(visible_pixel_size),
-      user_handle_(user_handle) {
-}
-
-Picture::~Picture() {}
-
-PictureBuffer* Picture::picture_buffer() {
-  return picture_buffer_;
-}
-
-gfx::Size Picture::GetDecodedSize() const {
-  return decoded_pixel_size_;
-}
-
-gfx::Size Picture::GetVisibleSize() const {
-  return visible_pixel_size_;
-}
-
-void* Picture::GetUserHandle() {
-  return user_handle_;
+SysmemBuffer::SysmemBuffer(int32 id, gfx::Size size, void* data)
+  : data_(data),

[scherkus (not reviewing), 2011/05/04 00:03:28]

should be indented by 2 more spaces

[vrk (LEFT CHROMIUM), 2011/05/05 05:57:12]

Done.

+    info_(id, size) {
 }
 
 }  // namespace media
-