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

ppapi/c/dev/pp_video_dev.h

 /* Copyright (c) 2011 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef PPAPI_C_DEV_PP_VIDEO_DEV_H_
 #define PPAPI_C_DEV_PP_VIDEO_DEV_H_
 
 #include "ppapi/c/dev/ppb_opengles_dev.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
@@ skipping 252 matching lines @@
 
 // The data structure for video bitstream buffer.
 struct PP_VideoBitstreamBuffer_Dev {
   // Buffer to hold the bitstream data. Should be allocated using the PPB_Buffer
   // interface for consistent interprocess behaviour.
   PP_Resource bitstream;
 
   // Size of the bitstream contained in buffer (in bytes).
   int32_t bitstream_size;
 
-  // Optional pointer for application to associate information with a sample.
-  // The pointer will be associated with the resulting decoded picture.
-  // Typically applications associate timestamps with buffers.
+  // Handle to identify the bitstream buffer.
   void* user_handle;
-
-  // TODO(vmr): Add information about access unit boundaries.
 };
 
-// Union for specifying picture data.
-union PP_PictureData_Dev {
-  // Resource representing system memory from shared memory address space.
-  // Use PPB_Buffer_Dev interface to handle this resource.
-  PP_Resource sysmem;
-  // Structure to define explicitly a GLES2 context.
-  struct {
-    // Context allocated using PPB_Context3D_Dev.
-    PP_Resource context;
-    // Texture ID in the given context where picture is stored.
-    GLuint texture_id;
-  } gles2_texture;
-  // Client-specified id for the picture buffer. By using this value client can
-  // keep track of the buffers it has assigned to the video decoder and how they
-  // are passed back to it.
+// Struct for specifiying picture buffers.
+struct PP_PictureBuffer_Dev {
+  // Client-specified id for the picture buffer.
   int32_t id;
+
+  union {
+    // Resource representing system memory from shared memory address space.
+    // Use PPB_Buffer_Dev interface to handle this resource.
+    PP_Resource sysmem;
+    // Structure to define explicitly a GLES2 context.
+    struct {
+      // Context allocated using PPB_Context3D_Dev.
+      PP_Resource context;
+      // Texture ID in the given context where picture is stored.
+      GLuint texture_id;
+    } gles2_texture;
+  } storage;
+
+  PP_PictureBufferType_Dev storage_type;
+
+  // Pixel width and height of the buffer.
+  uint32_t width;

[Ami GONE FROM CHROMIUM, 2011/04/26 23:01:57]

WDYT, worth using PP_Size?

[vrk (LEFT CHROMIUM), 2011/04/27 00:40:33]

Good catch! Yes, I think so. I changed this and the sizes in PP_Picture_Dev.

+  uint32_t height;
 };
 
 // Structure to describe the decoded output picture for the plug-in along with
 // optional metadata associated with the picture.
 struct PP_Picture_Dev {
-  // Resource that represents the buffer where the picture data is stored.
-  // Actual implementation style of the picture buffer may be OpenGL ES texture
-  // (allocated using PPB_OpenGLES2_Dev) or system memory (allocated using
-  // PPB_Buffer_Dev).
-  union PP_PictureData_Dev picture_data;
+  // ID for the picture buffer where the picture is stored.
+  int32_t picture_buffer_id;
 
-  // Optional pointer to associated metadata with the picture. Typical
-  // information carried over metadata includes timestamps. If there is
-  // multiple NAL units each with their own respective metadata, only the
-  // metadata from the latest call to Decode will be carried over.
-  void* user_handle;
+  // Handle to identify the bitstream buffer from which this picture was
+  // decoded.
+  void* bitstream_user_handle;
+
+  // Visible width and height of the picture.
+  uint32_t visible_width;
+  uint32_t visible_height;
+
+  // Decoded width and height of the picture.
+  uint32_t decoded_width;
+  uint32_t decoded_height;
 };
 
 // Enumeration for error events that may be reported through
 // PP_VideoDecodeErrorHandler_Func_Dev callback function to the plugin. Default
 // error handling functionality expected from the plugin is to Flush and Destroy
 // the decoder.
 enum PP_VideoDecodeError_Dev {
   PP_VIDEODECODEERROR_NONE = 0,
   // Decoder has not been initialized and configured properly.
   PP_VIDEODECODEERROR_UNINITIALIZED,
   // Decoder does not support feature of configuration or bitstream.
   PP_VIDEODECODEERROR_UNSUPPORTED,
   // Decoder did not get valid input.
   PP_VIDEODECODERERROR_INVALIDINPUT,
   // Failure in memory allocation or mapping.
   PP_VIDEODECODERERROR_MEMFAILURE,
   // Decoder was given bitstream that would result in output pictures but it
   // has not been provided buffers to do all this.
   PP_VIDEODECODEERROR_INSUFFICIENT_BUFFERS,
   // Decoder cannot continue operation due to insufficient resources for the
   // current configuration.
   PP_VIDEODECODEERROR_INSUFFICIENTRESOURCES,
   // Decoder hardware has reported hardware error.
   PP_VIDEODECODEERROR_HARDWARE
 };
 PP_COMPILE_ASSERT_ENUM_SIZE_IN_BYTES(PP_VideoDecodeError_Dev, 4);
 
 #endif  /* PPAPI_C_DEV_PP_VIDEO_DEV_H_ */