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..891ea16bb0a1baa31083b0b65fce7362e3f22d4e 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 Jun 24 11:44:18 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, |
@@ -129,7 +144,7 @@ const PPB_VideoDecoder_0_1 g_ppb_videodecoder_thunk_0_1 = {&Create, |
const PPB_VideoDecoder_0_2 g_ppb_videodecoder_thunk_0_2 = {&Create, |
&IsVideoDecoder, |
- &Initialize, |
+ &Initialize_0_2, |
&Decode, |
&GetPicture_0_1, |
&RecyclePicture, |
@@ -138,6 +153,15 @@ const PPB_VideoDecoder_0_2 g_ppb_videodecoder_thunk_0_2 = {&Create, |
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, |
@@ -159,5 +183,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 |