Revert 88698 - Implement AssignGLESBuffers for VideoDecode PPAPI

Fills in implementation for AssignGLESBuffers where it was missing. Also
updates OmxVideoDecodeAccelerator to reflect the changes.

BUG=NONE
TEST=NONE

Review URL: http://codereview.chromium.org/6965010

TBR=vrk@google.com
Review URL: http://codereview.chromium.org/7044115

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88702 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 27 deletions

diff --git a/ppapi/c/dev/pp_video_dev.h b/ppapi/c/dev/pp_video_dev.h
index 8833818..4bf1cf3 100644
--- a/ppapi/c/dev/pp_video_dev.h
+++ b/ppapi/c/dev/pp_video_dev.h
@@ -201,6 +201,9 @@ struct PP_BufferInfo_Dev {
 
 // Struct for specifying texture-backed picture data.
 struct PP_GLESBuffer_Dev {
+  // Context allocated using PPB_Context3D_Dev.
+  PP_Resource context;
+
   // Texture ID in the given context where picture is stored.
   GLuint texture_id;
 
diff --git a/ppapi/c/dev/ppb_video_decoder_dev.h b/ppapi/c/dev/ppb_video_decoder_dev.h
index 7f59df1..4ec65df 100644
--- a/ppapi/c/dev/ppb_video_decoder_dev.h
+++ b/ppapi/c/dev/ppb_video_decoder_dev.h
@@ -9,8 +9,8 @@
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_VIDEODECODER_DEV_INTERFACE_0_9 "PPB_VideoDecoder(Dev);0.9"
-#define PPB_VIDEODECODER_DEV_INTERFACE PPB_VIDEODECODER_DEV_INTERFACE_0_9
+#define PPB_VIDEODECODER_DEV_INTERFACE_0_8 "PPB_VideoDecoder(Dev);0.8"
+#define PPB_VIDEODECODER_DEV_INTERFACE PPB_VIDEODECODER_DEV_INTERFACE_0_8
 
 // Video decoder interface.
 //
@@ -139,14 +139,11 @@ struct PPB_VideoDecoder_Dev {
   //
   // Parameters:
   //   |video_decoder| is the previously created handle to the decoder resource.
-  //   |context| the GL context in which decoding will happen. This should be a
-  //   resource of type PPB_Context3D_Dev.
   //   |decoder_config| the configuration to use to initialize the decoder.
   //   |callback| called after initialization is complete.
   //
   // Returns an error code from pp_errors.h.
   int32_t (*Initialize)(PP_Resource video_decoder,
-                        PP_Resource context,
                         const PP_VideoConfigElement* decoder_config,
                         struct PP_CompletionCallback callback);
 
diff --git a/ppapi/c/dev/ppp_video_decoder_dev.h b/ppapi/c/dev/ppp_video_decoder_dev.h
index e18146d..af5eaaf 100644
--- a/ppapi/c/dev/ppp_video_decoder_dev.h
+++ b/ppapi/c/dev/ppp_video_decoder_dev.h
@@ -5,11 +5,9 @@
 #ifndef PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_
 #define PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_
 
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_resource.h"
 #include "ppapi/c/dev/pp_video_dev.h"
 
-#define PPP_VIDEODECODER_DEV_INTERFACE "PPP_VideoDecoder(Dev);0.4"
+#define PPP_VIDEODECODER_DEV_INTERFACE "PPP_VideoDecoder(Dev);0.3"
 
 // PPP_VideoDecoder_Dev structure contains the function pointers that the
 // plugin MUST implement to provide services needed by the video decoder
@@ -23,13 +21,11 @@ struct PPP_VideoDecoder_Dev {
   // Decoding will not proceed until buffers have been provided.
   //
   // Parameters:
-  //  |instance| the plugin instance to which the callback is responding.
-  //  |decoder| is pointer to the Pepper Video Decoder resource.
+  //  |decoder| is pointer to the Pepper Video Decoder instance.
   //  |req_num_of_bufs| tells how many buffers are needed by the decoder.
   //  |dimensions| tells the dimensions of the buffer to allocate.
   //  |type| specifies whether the buffer lives in system memory or GL texture.
   void (*ProvidePictureBuffers)(
-      PP_Instance instance,
       PP_Resource decoder,
       uint32_t req_num_of_bufs,
       struct PP_Size dimensions,
@@ -39,11 +35,9 @@ struct PPP_VideoDecoder_Dev {
   // the plugin.
   //
   // Parameters:
-  //  |instance| the plugin instance to which the callback is responding.
-  //  |decoder| is pointer to the Pepper Video Decoder resource.
+  //  |decoder| is pointer to the Pepper Video Decoder instance.
   //  |picture_buffer| points to the picture buffer that is no longer needed.
-  void (*DismissPictureBuffer)(PP_Instance instance,
-                               PP_Resource decoder,
+  void (*DismissPictureBuffer)(PP_Resource decoder,
                                int32_t picture_buffer_id);
 
   // Callback function for decoder to deliver decoded pictures ready to be
@@ -51,11 +45,9 @@ struct PPP_VideoDecoder_Dev {
   // decoder through ReusePictureBuffer function in PPB Video Decoder API.
   //
   // Parameters:
-  //  |instance| the plugin instance to which the callback is responding.
-  //  |decoder| is pointer to the Pepper Video Decoder resource.
+  //  |decoder| is pointer to the Pepper Video Decoder instance.
   //  |picture| is the picture that is ready.
-  void (*PictureReady)(PP_Instance instance,
-                       PP_Resource decoder,
+  void (*PictureReady)(PP_Resource decoder,
                        struct PP_Picture_Dev picture);
 
   // Callback function to tell the plugin that decoder has decoded end of stream
@@ -63,9 +55,8 @@ struct PPP_VideoDecoder_Dev {
   // stream.
   //
   // Parameters:
-  //  |instance| the plugin instance to which the callback is responding.
-  //  |decoder| is pointer to the Pepper Video Decoder resource.
-  void (*EndOfStream)(PP_Instance instance, PP_Resource decoder);
+  //  |decoder| is pointer to the Pepper Video Decoder instance.
+  void (*EndOfStream)(PP_Resource decoder);
 
   // Error handler callback for decoder to deliver information about detected
   // errors to the plugin.
@@ -73,12 +64,9 @@ struct PPP_VideoDecoder_Dev {
   // TODO(vmr): Fill out error result codes and corresponding actions.
   //
   // Parameters:
-  //  |instance| the plugin instance to which the callback is responding.
-  //  |decoder| is pointer to the Pepper Video Decoder resource.
+  //  |decoder| is pointer to the Pepper Video Decoder instance.
   //  |error| error is the enumeration specifying the error.
-  void (*NotifyError)(PP_Instance instance,
-                      PP_Resource decoder,
-                      enum PP_VideoDecodeError_Dev error);
+  void (*NotifyError)(PP_Resource decoder, enum PP_VideoDecodeError_Dev error);
 };
 
 #endif  /* PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_ */