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 d84617c696c55858de08b5ea2f928039f0d3c862..703d100e3087ad9a3d97a8723341f641b3fecf95 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 Tue May 6 05:06:35 2014. |
+// From ppb_video_decoder.idl modified Thu Aug 21 16:59:07 2014. |
#include "ppapi/c/pp_completion_callback.h" |
#include "ppapi/c/pp_errors.h" |
@@ -31,10 +31,25 @@ PP_Bool IsVideoDecoder(PP_Resource resource) { |
return PP_FromBool(enter.succeeded()); |
} |
+int32_t Initialize_0_1(PP_Resource video_decoder, |
+ PP_Resource graphics3d_context, |
+ PP_VideoProfile profile, |
+ PP_Bool allow_software_fallback, |
+ 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()->Initialize0_1(graphics3d_context, |
+ profile, |
+ allow_software_fallback, |
+ enter.callback())); |
+} |
+ |
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) { |
VLOG(4) << "PPB_VideoDecoder::Initialize()"; |
EnterResource<PPB_VideoDecoder_API> enter(video_decoder, callback, true); |
@@ -42,7 +57,7 @@ int32_t Initialize(PP_Resource video_decoder, |
return enter.retval(); |
return enter.SetResult(enter.object()->Initialize(graphics3d_context, |
profile, |
- allow_software_fallback, |
+ acceleration, |
enter.callback())); |
} |
@@ -101,6 +116,17 @@ int32_t Reset(PP_Resource video_decoder, |
const PPB_VideoDecoder_0_1 g_ppb_videodecoder_thunk_0_1 = { |
&Create, |
&IsVideoDecoder, |
+ &Initialize_0_1, |
+ &Decode, |
+ &GetPicture, |
+ &RecyclePicture, |
+ &Flush, |
+ &Reset |
+}; |
+ |
+const PPB_VideoDecoder_0_2 g_ppb_videodecoder_thunk_0_2 = { |
+ &Create, |
+ &IsVideoDecoder, |
&Initialize, |
&Decode, |
&GetPicture, |
@@ -116,5 +142,10 @@ PPAPI_THUNK_EXPORT const PPB_VideoDecoder_0_1* |
return &g_ppb_videodecoder_thunk_0_1; |
} |
+PPAPI_THUNK_EXPORT const PPB_VideoDecoder_0_2* |
+ GetPPB_VideoDecoder_0_2_Thunk() { |
+ return &g_ppb_videodecoder_thunk_0_2; |
+} |
+ |
} // namespace thunk |
} // namespace ppapi |