| Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| 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 8755c1ee235e087b3c860cda29f21891a73f2fa6..aed6fd40c1bf4b047310c7e29c637e13c4c59537 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
|
| @@ -30,6 +30,7 @@
|
| #include "ppapi/c/ppb_graphics_3d.h"
|
| #include "ppapi/c/ppb_host_resolver.h"
|
| #include "ppapi/c/ppb_input_event.h"
|
| +#include "ppapi/c/ppb_media_codec_video_decoder.h"
|
| #include "ppapi/c/ppb_media_stream_audio_track.h"
|
| #include "ppapi/c/ppb_media_stream_video_track.h"
|
| #include "ppapi/c/ppb_message_loop.h"
|
| @@ -114,6 +115,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_1_0;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamVideoTrack_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MessageLoop_1_0;
|
| @@ -990,6 +992,50 @@ static void Pnacl_M13_PPB_IMEInputEvent_GetSelection(PP_Resource ime_event, uint
|
|
|
| /* Not generating wrapper methods for PPB_Instance_1_0 */
|
|
|
| +/* Begin wrapper methods for PPB_MediaCodecVideoDecoder_0_1 */
|
| +
|
| +static PP_Resource Pnacl_M36_PPB_MediaCodecVideoDecoder_Create(PP_Instance instance) {
|
| + const struct PPB_MediaCodecVideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1.real_iface;
|
| + return iface->Create(instance);
|
| +}
|
| +
|
| +static PP_Bool Pnacl_M36_PPB_MediaCodecVideoDecoder_IsMediaCodecVideoDecoder(PP_Resource resource) {
|
| + const struct PPB_MediaCodecVideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1.real_iface;
|
| + return iface->IsMediaCodecVideoDecoder(resource);
|
| +}
|
| +
|
| +static int32_t Pnacl_M36_PPB_MediaCodecVideoDecoder_Initialize(PP_Resource video_decoder, PP_Resource context, PP_MediaCodec_Profile profile, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_MediaCodecVideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1.real_iface;
|
| + return iface->Initialize(video_decoder, context, profile, *callback);
|
| +}
|
| +
|
| +static int32_t Pnacl_M36_PPB_MediaCodecVideoDecoder_Decode(PP_Resource video_decoder, uint32_t picture_id, uint32_t size, const void* buffer, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_MediaCodecVideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1.real_iface;
|
| + return iface->Decode(video_decoder, picture_id, size, buffer, *callback);
|
| +}
|
| +
|
| +static int32_t Pnacl_M36_PPB_MediaCodecVideoDecoder_GetPictureBuffer(PP_Resource video_decoder, struct PP_MediaCodec_PictureBuffer* picture_buffer, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_MediaCodecVideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1.real_iface;
|
| + return iface->GetPictureBuffer(video_decoder, picture_buffer, *callback);
|
| +}
|
| +
|
| +static void Pnacl_M36_PPB_MediaCodecVideoDecoder_RecyclePictureBuffer(PP_Resource video_decoder, const struct PP_MediaCodec_PictureBuffer* picture_buffer) {
|
| + const struct PPB_MediaCodecVideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1.real_iface;
|
| + iface->RecyclePictureBuffer(video_decoder, picture_buffer);
|
| +}
|
| +
|
| +static int32_t Pnacl_M36_PPB_MediaCodecVideoDecoder_Flush(PP_Resource video_decoder, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_MediaCodecVideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1.real_iface;
|
| + return iface->Flush(video_decoder, *callback);
|
| +}
|
| +
|
| +static int32_t Pnacl_M36_PPB_MediaCodecVideoDecoder_Reset(PP_Resource video_decoder, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_MediaCodecVideoDecoder_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1.real_iface;
|
| + return iface->Reset(video_decoder, *callback);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_MediaCodecVideoDecoder_0_1 */
|
| +
|
| /* Begin wrapper methods for PPB_MediaStreamAudioTrack_0_1 */
|
|
|
| static PP_Bool Pnacl_M35_PPB_MediaStreamAudioTrack_IsMediaStreamAudioTrack(PP_Resource resource) {
|
| @@ -4512,6 +4558,17 @@ static const struct PPB_IMEInputEvent_1_0 Pnacl_Wrappers_PPB_IMEInputEvent_1_0 =
|
|
|
| /* Not generating wrapper interface for PPB_Instance_1_0 */
|
|
|
| +static const struct PPB_MediaCodecVideoDecoder_0_1 Pnacl_Wrappers_PPB_MediaCodecVideoDecoder_0_1 = {
|
| + .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M36_PPB_MediaCodecVideoDecoder_Create,
|
| + .IsMediaCodecVideoDecoder = (PP_Bool (*)(PP_Resource resource))&Pnacl_M36_PPB_MediaCodecVideoDecoder_IsMediaCodecVideoDecoder,
|
| + .Initialize = (int32_t (*)(PP_Resource video_decoder, PP_Resource context, PP_MediaCodec_Profile profile, struct PP_CompletionCallback callback))&Pnacl_M36_PPB_MediaCodecVideoDecoder_Initialize,
|
| + .Decode = (int32_t (*)(PP_Resource video_decoder, uint32_t picture_id, uint32_t size, const void* buffer, struct PP_CompletionCallback callback))&Pnacl_M36_PPB_MediaCodecVideoDecoder_Decode,
|
| + .GetPictureBuffer = (int32_t (*)(PP_Resource video_decoder, struct PP_MediaCodec_PictureBuffer* picture_buffer, struct PP_CompletionCallback callback))&Pnacl_M36_PPB_MediaCodecVideoDecoder_GetPictureBuffer,
|
| + .RecyclePictureBuffer = (void (*)(PP_Resource video_decoder, const struct PP_MediaCodec_PictureBuffer* picture_buffer))&Pnacl_M36_PPB_MediaCodecVideoDecoder_RecyclePictureBuffer,
|
| + .Flush = (int32_t (*)(PP_Resource video_decoder, struct PP_CompletionCallback callback))&Pnacl_M36_PPB_MediaCodecVideoDecoder_Flush,
|
| + .Reset = (int32_t (*)(PP_Resource video_decoder, struct PP_CompletionCallback callback))&Pnacl_M36_PPB_MediaCodecVideoDecoder_Reset
|
| +};
|
| +
|
| static const struct PPB_MediaStreamAudioTrack_0_1 Pnacl_Wrappers_PPB_MediaStreamAudioTrack_0_1 = {
|
| .IsMediaStreamAudioTrack = (PP_Bool (*)(PP_Resource resource))&Pnacl_M35_PPB_MediaStreamAudioTrack_IsMediaStreamAudioTrack,
|
| .Configure = (int32_t (*)(PP_Resource audio_track, const int32_t attrib_list[], struct PP_CompletionCallback callback))&Pnacl_M35_PPB_MediaStreamAudioTrack_Configure,
|
| @@ -5548,6 +5605,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_1_0 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1 = {
|
| + .iface_macro = PPB_MEDIACODECVIDEODECODER_INTERFACE_0_1,
|
| + .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_MediaCodecVideoDecoder_0_1,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1 = {
|
| .iface_macro = PPB_MEDIASTREAMAUDIOTRACK_INTERFACE_0_1,
|
| .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_MediaStreamAudioTrack_0_1,
|
| @@ -6073,6 +6136,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_2,
|
| &Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0,
|
| &Pnacl_WrapperInfo_PPB_IMEInputEvent_1_0,
|
| + &Pnacl_WrapperInfo_PPB_MediaCodecVideoDecoder_0_1,
|
| &Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1,
|
| &Pnacl_WrapperInfo_PPB_MediaStreamVideoTrack_0_1,
|
| &Pnacl_WrapperInfo_PPB_MessageLoop_1_0,
|
|
|