| Index: ppapi/c/ppb_video_decoder.h
|
| diff --git a/ppapi/c/ppb_video_decoder.h b/ppapi/c/ppb_video_decoder.h
|
| index edab7bcafdc01a645dc35fa74340386a9e0a7001..d11d0e41214c1cea6ce527f1a460bbbd22e02174 100644
|
| --- a/ppapi/c/ppb_video_decoder.h
|
| +++ b/ppapi/c/ppb_video_decoder.h
|
| @@ -3,7 +3,7 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -/* From ppb_video_decoder.idl modified Fri Jul 11 18:06:37 2014. */
|
| +/* From ppb_video_decoder.idl modified Thu Aug 21 16:59:07 2014. */
|
|
|
| #ifndef PPAPI_C_PPB_VIDEO_DECODER_H_
|
| #define PPAPI_C_PPB_VIDEO_DECODER_H_
|
| @@ -18,6 +18,7 @@
|
| #include "ppapi/c/pp_stdint.h"
|
|
|
| #define PPB_VIDEODECODER_INTERFACE_0_1 "PPB_VideoDecoder;0.1" /* dev */
|
| +#define PPB_VIDEODECODER_INTERFACE_0_2 "PPB_VideoDecoder;0.2" /* dev */
|
| /**
|
| * @file
|
| * This file defines the <code>PPB_VideoDecoder</code> interface.
|
| @@ -51,7 +52,7 @@
|
| * Chrome and ChromeOS: aac, h264.
|
| * ChromeOS: mpeg4.
|
| */
|
| -struct PPB_VideoDecoder_0_1 { /* dev */
|
| +struct PPB_VideoDecoder_0_2 { /* dev */
|
| /**
|
| * Creates a new video decoder resource.
|
| *
|
| @@ -82,9 +83,9 @@ struct PPB_VideoDecoder_0_1 { /* dev */
|
| * during decoding.
|
| * @param[in] profile A <code>PP_VideoProfile</code> specifying the video
|
| * codec profile.
|
| - * @param[in] allow_software_fallback A <code>PP_Bool</code> specifying
|
| - * whether the decoder can fall back to software decoding if a suitable
|
| - * hardware decoder isn't available.
|
| + * @param[in] hardware_acceleration A <code>PP_HardwareAcceleration</code>
|
| + * specifying whether to use a hardware accelerated or a software resource
|
| + * implementation.
|
| * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon
|
| * completion.
|
| *
|
| @@ -96,7 +97,7 @@ struct PPB_VideoDecoder_0_1 { /* dev */
|
| int32_t (*Initialize)(PP_Resource video_decoder,
|
| PP_Resource graphics3d_context,
|
| PP_VideoProfile profile,
|
| - PP_Bool allow_software_fallback,
|
| + PP_HardwareAcceleration acceleration,
|
| struct PP_CompletionCallback callback);
|
| /**
|
| * Decodes a bitstream buffer. Copies |size| bytes of data from the plugin's
|
| @@ -214,6 +215,30 @@ struct PPB_VideoDecoder_0_1 { /* dev */
|
| int32_t (*Reset)(PP_Resource video_decoder,
|
| struct PP_CompletionCallback callback);
|
| };
|
| +
|
| +struct PPB_VideoDecoder_0_1 { /* dev */
|
| + PP_Resource (*Create)(PP_Instance instance);
|
| + PP_Bool (*IsVideoDecoder)(PP_Resource resource);
|
| + int32_t (*Initialize)(PP_Resource video_decoder,
|
| + PP_Resource graphics3d_context,
|
| + PP_VideoProfile profile,
|
| + PP_Bool allow_software_fallback,
|
| + struct PP_CompletionCallback callback);
|
| + int32_t (*Decode)(PP_Resource video_decoder,
|
| + uint32_t decode_id,
|
| + uint32_t size,
|
| + const void* buffer,
|
| + struct PP_CompletionCallback callback);
|
| + int32_t (*GetPicture)(PP_Resource video_decoder,
|
| + struct PP_VideoPicture* picture,
|
| + struct PP_CompletionCallback callback);
|
| + void (*RecyclePicture)(PP_Resource video_decoder,
|
| + const struct PP_VideoPicture* picture);
|
| + int32_t (*Flush)(PP_Resource video_decoder,
|
| + struct PP_CompletionCallback callback);
|
| + int32_t (*Reset)(PP_Resource video_decoder,
|
| + struct PP_CompletionCallback callback);
|
| +};
|
| /**
|
| * @}
|
| */
|
|
|