Remove deprecated video decode interfaces.

And clarify the texture_target parameter.

BUG=None.
TEST=None.

Review URL: https://codereview.chromium.org/104373006

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

3 files changed, 5 insertions, 83 deletions

diff --git a/ppapi/api/dev/ppp_video_decoder_dev.idl b/ppapi/api/dev/ppp_video_decoder_dev.idl
index 1f6d8c6..42546ec 100644
--- a/ppapi/api/dev/ppp_video_decoder_dev.idl
+++ b/ppapi/api/dev/ppp_video_decoder_dev.idl
@@ -7,8 +7,6 @@
  * This file defines the <code>PPP_VideoDecoder_Dev</code> interface.
  */
 label Chrome {
-  M14 = 0.9,
-  M18 = 0.10,
   M21 = 0.11
 };
 
@@ -33,28 +31,8 @@ interface PPP_VideoDecoder_Dev {
    *  |decoder| the PPB_VideoDecoder_Dev resource.
    *  |req_num_of_bufs| tells how many buffers are needed by the decoder.
    *  |dimensions| tells the dimensions of the buffer to allocate.
-   */
-  [deprecate=0.11]
-  void ProvidePictureBuffers(
-      [in] PP_Instance instance,
-      [in] PP_Resource decoder,
-      [in] uint32_t req_num_of_bufs,
-      [in] PP_Size dimensions);
-
-  /**
-   * Callback function to provide buffers for the decoded output pictures. If
-   * succeeds plugin must provide buffers through AssignPictureBuffers function
-   * to the API. If |req_num_of_bufs| matching exactly the specification
-   * given in the parameters cannot be allocated decoder should be destroyed.
-   *
-   * Decoding will not proceed until buffers have been provided.
-   *
-   * Parameters:
-   *  |instance| the plugin instance to which the callback is responding.
-   *  |decoder| the PPB_VideoDecoder_Dev resource.
-   *  |req_num_of_bufs| tells how many buffers are needed by the decoder.
-   *  |dimensions| tells the dimensions of the buffer to allocate.
-   *  |texture_target| the type of texture used.
+   *  |texture_target| the type of texture used. Sample targets in use are
+   *      TEXTURE_2D (most platforms) and TEXTURE_EXTERNAL_OES (on ARM).
    */
   [version=0.11]
   void ProvidePictureBuffers(
@@ -94,20 +72,6 @@ interface PPP_VideoDecoder_Dev {
       [in] PP_Picture_Dev picture);
 
   /**
-   * Callback function to tell the plugin that decoder has decoded end of stream
-   * marker and output all the pictures that should be displayed from the
-   * stream.
-   *
-   * Parameters:
-   *  |instance| the plugin instance to which the callback is responding.
-   *  |decoder| the PPB_VideoDecoder_Dev resource.
-   */
-  [deprecate=0.10]
-  void EndOfStream(
-      [in] PP_Instance instance,
-      [in] PP_Resource decoder);
-
-  /**
    * Error handler callback for decoder to deliver information about detected
    * errors to the plugin.
    *
diff --git a/ppapi/c/dev/ppp_video_decoder_dev.h b/ppapi/c/dev/ppp_video_decoder_dev.h
index 20c4e8c..d98161f 100644
--- a/ppapi/c/dev/ppp_video_decoder_dev.h
+++ b/ppapi/c/dev/ppp_video_decoder_dev.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From dev/ppp_video_decoder_dev.idl modified Tue May 29 10:59:23 2012. */
+/* From dev/ppp_video_decoder_dev.idl modified Fri Dec 13 15:21:30 2013. */
 
 #ifndef PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_
 #define PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_
@@ -15,8 +15,6 @@
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPP_VIDEODECODER_DEV_INTERFACE_0_9 "PPP_VideoDecoder(Dev);0.9"
-#define PPP_VIDEODECODER_DEV_INTERFACE_0_10 "PPP_VideoDecoder(Dev);0.10"
 #define PPP_VIDEODECODER_DEV_INTERFACE_0_11 "PPP_VideoDecoder(Dev);0.11"
 #define PPP_VIDEODECODER_DEV_INTERFACE PPP_VIDEODECODER_DEV_INTERFACE_0_11
 
@@ -51,7 +49,8 @@ struct PPP_VideoDecoder_Dev_0_11 {
    *  |decoder| the PPB_VideoDecoder_Dev resource.
    *  |req_num_of_bufs| tells how many buffers are needed by the decoder.
    *  |dimensions| tells the dimensions of the buffer to allocate.
-   *  |texture_target| the type of texture used.
+   *  |texture_target| the type of texture used. Sample targets in use are
+   *      TEXTURE_2D (most platforms) and TEXTURE_EXTERNAL_OES (on ARM).
    */
   void (*ProvidePictureBuffers)(PP_Instance instance,
                                 PP_Resource decoder,
@@ -98,39 +97,6 @@ struct PPP_VideoDecoder_Dev_0_11 {
 };
 
 typedef struct PPP_VideoDecoder_Dev_0_11 PPP_VideoDecoder_Dev;
-
-struct PPP_VideoDecoder_Dev_0_9 {
-  void (*ProvidePictureBuffers)(PP_Instance instance,
-                                PP_Resource decoder,
-                                uint32_t req_num_of_bufs,
-                                const struct PP_Size* dimensions);
-  void (*DismissPictureBuffer)(PP_Instance instance,
-                               PP_Resource decoder,
-                               int32_t picture_buffer_id);
-  void (*PictureReady)(PP_Instance instance,
-                       PP_Resource decoder,
-                       const struct PP_Picture_Dev* picture);
-  void (*EndOfStream)(PP_Instance instance, PP_Resource decoder);
-  void (*NotifyError)(PP_Instance instance,
-                      PP_Resource decoder,
-                      PP_VideoDecodeError_Dev error);
-};
-
-struct PPP_VideoDecoder_Dev_0_10 {
-  void (*ProvidePictureBuffers)(PP_Instance instance,
-                                PP_Resource decoder,
-                                uint32_t req_num_of_bufs,
-                                const struct PP_Size* dimensions);
-  void (*DismissPictureBuffer)(PP_Instance instance,
-                               PP_Resource decoder,
-                               int32_t picture_buffer_id);
-  void (*PictureReady)(PP_Instance instance,
-                       PP_Resource decoder,
-                       const struct PP_Picture_Dev* picture);
-  void (*NotifyError)(PP_Instance instance,
-                      PP_Resource decoder,
-                      PP_VideoDecodeError_Dev error);
-};
 /**
  * @}
  */
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
index bb9b089..ad7260b 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -2370,10 +2370,6 @@ static struct PP_Var Pnacl_M13_PPP_Selection_Dev_GetSelectedText(PP_Instance ins
 
 /* Not generating wrapper methods for PPP_VideoCapture_Dev_0_1 */
 
-/* Not generating wrapper methods for PPP_VideoDecoder_Dev_0_9 */
-
-/* Not generating wrapper methods for PPP_VideoDecoder_Dev_0_10 */
-
 /* Not generating wrapper methods for PPP_VideoDecoder_Dev_0_11 */
 
 /* Not generating wrapper methods for PPP_Widget_Dev_0_2 */
@@ -4703,10 +4699,6 @@ struct PPP_Selection_Dev_0_3 Pnacl_Wrappers_PPP_Selection_Dev_0_3 = {
 
 /* Not generating wrapper interface for PPP_VideoCapture_Dev_0_1 */
 
-/* Not generating wrapper interface for PPP_VideoDecoder_Dev_0_9 */
-
-/* Not generating wrapper interface for PPP_VideoDecoder_Dev_0_10 */
-
 /* Not generating wrapper interface for PPP_VideoDecoder_Dev_0_11 */
 
 /* Not generating wrapper interface for PPP_Widget_Dev_0_2 */