Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(714)

Unified Diff: ppapi/thunk/ppb_video_decoder_thunk.cc

Issue 7474006: PPB_VideoDecoder_Dev::Initialize is now synchronous! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: vrk CR update. Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/thunk/ppb_video_decoder_api.h ('k') | ppapi/thunk/resource_creation_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f1b7c44926169646e37d8430c5aceb38e548f6f6..cb0485c8fde124862d195c0832be1606ef12f6b6 100644
--- a/ppapi/thunk/ppb_video_decoder_thunk.cc
+++ b/ppapi/thunk/ppb_video_decoder_thunk.cc
@@ -16,11 +16,13 @@ namespace {
typedef EnterResource<PPB_VideoDecoder_API> EnterVideoDecoder;
-PP_Resource Create(PP_Instance instance) {
+PP_Resource Create(PP_Instance instance,
+ PP_Resource context_3d,
+ const PP_VideoConfigElement* config) {
EnterFunction<ResourceCreationAPI> enter(instance, true);
if (enter.failed())
return 0;
- return enter.functions()->CreateVideoDecoder(instance);
+ return enter.functions()->CreateVideoDecoder(instance, context_3d, config);
}
PP_Bool IsVideoDecoder(PP_Resource resource) {
@@ -28,18 +30,6 @@ PP_Bool IsVideoDecoder(PP_Resource resource) {
return PP_FromBool(enter.succeeded());
}
-int32_t Initialize(PP_Resource video_decoder,
- PP_Resource context_id,
- const PP_VideoConfigElement* decoder_config,
- PP_CompletionCallback callback) {
- EnterVideoDecoder enter(video_decoder, true);
- if (enter.failed())
- return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
- int32_t result =
- enter.object()->Initialize(context_id, decoder_config, callback);
- return MayForceCallback(callback, result);
-}
-
int32_t Decode(PP_Resource video_decoder,
const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
PP_CompletionCallback callback) {
@@ -90,7 +80,6 @@ void Destroy(PP_Resource video_decoder) {
const PPB_VideoDecoder_Dev g_ppb_videodecoder_thunk = {
&Create,
&IsVideoDecoder,
- &Initialize,
&Decode,
&AssignPictureBuffers,
&ReusePictureBuffer,
« no previous file with comments | « ppapi/thunk/ppb_video_decoder_api.h ('k') | ppapi/thunk/resource_creation_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698