Index: ppapi/c/ppb_video_decoder.h |
diff --git a/ppapi/c/ppb_video_decoder.h b/ppapi/c/ppb_video_decoder.h |
index 2fd633df22e4e6e6d3fba5ef245dafd2e537ddc3..91b200813d565e7bf61400ff2d16b305bdc7339d 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 Mon Sep 8 16:40:15 2014. */ |
+/* From ppb_video_decoder.idl modified Wed Nov 5 14:04:14 2014. */ |
#ifndef PPAPI_C_PPB_VIDEO_DECODER_H_ |
#define PPAPI_C_PPB_VIDEO_DECODER_H_ |
@@ -13,13 +13,16 @@ |
#include "ppapi/c/pp_completion_callback.h" |
#include "ppapi/c/pp_instance.h" |
#include "ppapi/c/pp_macros.h" |
+#include "ppapi/c/pp_point.h" |
+#include "ppapi/c/pp_rect.h" |
#include "ppapi/c/pp_resource.h" |
#include "ppapi/c/pp_size.h" |
#include "ppapi/c/pp_stdint.h" |
#define PPB_VIDEODECODER_INTERFACE_0_1 "PPB_VideoDecoder;0.1" |
#define PPB_VIDEODECODER_INTERFACE_0_2 "PPB_VideoDecoder;0.2" |
-#define PPB_VIDEODECODER_INTERFACE PPB_VIDEODECODER_INTERFACE_0_2 |
+#define PPB_VIDEODECODER_INTERFACE_1_0 "PPB_VideoDecoder;1.0" |
+#define PPB_VIDEODECODER_INTERFACE PPB_VIDEODECODER_INTERFACE_1_0 |
/** |
* @file |
@@ -54,7 +57,7 @@ |
* Chrome and ChromeOS: aac, h264. |
* ChromeOS: mpeg4. |
*/ |
-struct PPB_VideoDecoder_0_2 { |
+struct PPB_VideoDecoder_1_0 { |
/** |
* Creates a new video decoder resource. |
* |
@@ -217,7 +220,7 @@ struct PPB_VideoDecoder_0_2 { |
struct PP_CompletionCallback callback); |
}; |
-typedef struct PPB_VideoDecoder_0_2 PPB_VideoDecoder; |
+typedef struct PPB_VideoDecoder_1_0 PPB_VideoDecoder; |
struct PPB_VideoDecoder_0_1 { |
PP_Resource (*Create)(PP_Instance instance); |
@@ -233,7 +236,31 @@ struct PPB_VideoDecoder_0_1 { |
const void* buffer, |
struct PP_CompletionCallback callback); |
int32_t (*GetPicture)(PP_Resource video_decoder, |
- struct PP_VideoPicture* picture, |
+ struct PP_VideoPicture_0_1* 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); |
+}; |
+ |
+struct PPB_VideoDecoder_0_2 { |
+ 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_HardwareAcceleration acceleration, |
+ 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_0_1* picture, |
struct PP_CompletionCallback callback); |
void (*RecyclePicture)(PP_Resource video_decoder, |
const struct PP_VideoPicture* picture); |