Index: ppapi/thunk/ppb_video_decoder_thunk.cc |
diff --git a/ppapi/thunk/ppb_video_decoder_thunk.cc b/ppapi/thunk/ppb_video_decoder_thunk.cc |
index 511e35a745e21b8693b44cb7e5fe73746f8abcfa..4039c3e6d312adfb260aa37b6f012cd119bce008 100644 |
--- a/ppapi/thunk/ppb_video_decoder_thunk.cc |
+++ b/ppapi/thunk/ppb_video_decoder_thunk.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-// From ppb_video_decoder.idl modified Thu Jan 29 16:28:15 2015. |
+// From ppb_video_decoder.idl modified Wed Aug 12 17:59:47 2015. |
#include "ppapi/c/pp_completion_callback.h" |
#include "ppapi/c/pp_errors.h" |
@@ -44,17 +44,32 @@ int32_t Initialize_0_1(PP_Resource video_decoder, |
graphics3d_context, profile, allow_software_fallback, enter.callback())); |
} |
+int32_t Initialize_0_2(PP_Resource video_decoder, |
+ PP_Resource graphics3d_context, |
+ PP_VideoProfile profile, |
+ PP_HardwareAcceleration acceleration, |
+ struct PP_CompletionCallback callback) { |
+ VLOG(4) << "PPB_VideoDecoder::Initialize_0_2()"; |
+ EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true); |
+ if (enter.failed()) |
+ return enter.retval(); |
+ return enter.SetResult(enter.object()->Initialize0_2( |
+ graphics3d_context, profile, acceleration, enter.callback())); |
+} |
+ |
int32_t Initialize(PP_Resource video_decoder, |
PP_Resource graphics3d_context, |
PP_VideoProfile profile, |
PP_HardwareAcceleration acceleration, |
+ uint32_t min_picture_count, |
struct PP_CompletionCallback callback) { |
VLOG(4) << "PPB_VideoDecoder::Initialize()"; |
EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true); |
if (enter.failed()) |
return enter.retval(); |
- return enter.SetResult(enter.object()->Initialize( |
- graphics3d_context, profile, acceleration, enter.callback())); |
+ return enter.SetResult( |
+ enter.object()->Initialize(graphics3d_context, profile, acceleration, |
+ min_picture_count, enter.callback())); |
} |
int32_t Decode(PP_Resource video_decoder, |
@@ -118,32 +133,21 @@ int32_t Reset(PP_Resource video_decoder, |
return enter.SetResult(enter.object()->Reset(enter.callback())); |
} |
-const PPB_VideoDecoder_0_1 g_ppb_videodecoder_thunk_0_1 = {&Create, |
- &IsVideoDecoder, |
- &Initialize_0_1, |
- &Decode, |
- &GetPicture_0_1, |
- &RecyclePicture, |
- &Flush, |
- &Reset}; |
- |
-const PPB_VideoDecoder_0_2 g_ppb_videodecoder_thunk_0_2 = {&Create, |
- &IsVideoDecoder, |
- &Initialize, |
- &Decode, |
- &GetPicture_0_1, |
- &RecyclePicture, |
- &Flush, |
- &Reset}; |
- |
-const PPB_VideoDecoder_1_0 g_ppb_videodecoder_thunk_1_0 = {&Create, |
- &IsVideoDecoder, |
- &Initialize, |
- &Decode, |
- &GetPicture, |
- &RecyclePicture, |
- &Flush, |
- &Reset}; |
+const PPB_VideoDecoder_0_1 g_ppb_videodecoder_thunk_0_1 = { |
+ &Create, &IsVideoDecoder, &Initialize_0_1, &Decode, |
+ &GetPicture_0_1, &RecyclePicture, &Flush, &Reset}; |
+ |
+const PPB_VideoDecoder_0_2 g_ppb_videodecoder_thunk_0_2 = { |
+ &Create, &IsVideoDecoder, &Initialize_0_2, &Decode, |
+ &GetPicture_0_1, &RecyclePicture, &Flush, &Reset}; |
+ |
+const PPB_VideoDecoder_1_0 g_ppb_videodecoder_thunk_1_0 = { |
+ &Create, &IsVideoDecoder, &Initialize_0_2, &Decode, |
+ &GetPicture, &RecyclePicture, &Flush, &Reset}; |
+ |
+const PPB_VideoDecoder_1_1 g_ppb_videodecoder_thunk_1_1 = { |
+ &Create, &IsVideoDecoder, &Initialize, &Decode, |
+ &GetPicture, &RecyclePicture, &Flush, &Reset}; |
} // namespace |
@@ -159,5 +163,9 @@ PPAPI_THUNK_EXPORT const PPB_VideoDecoder_1_0* GetPPB_VideoDecoder_1_0_Thunk() { |
return &g_ppb_videodecoder_thunk_1_0; |
} |
+PPAPI_THUNK_EXPORT const PPB_VideoDecoder_1_1* GetPPB_VideoDecoder_1_1_Thunk() { |
+ return &g_ppb_videodecoder_thunk_1_1; |
+} |
+ |
} // namespace thunk |
} // namespace ppapi |