Index: ppapi/thunk/ppb_video_decoder_dev_thunk.cc |
diff --git a/ppapi/thunk/ppb_video_decoder_thunk.cc b/ppapi/thunk/ppb_video_decoder_dev_thunk.cc |
similarity index 81% |
rename from ppapi/thunk/ppb_video_decoder_thunk.cc |
rename to ppapi/thunk/ppb_video_decoder_dev_thunk.cc |
index 2472d8ab321f641e3327deaa78150640b42c5955..b0d85dae316d1390a58b8b791c6bbd38a70e8119 100644 |
--- a/ppapi/thunk/ppb_video_decoder_thunk.cc |
+++ b/ppapi/thunk/ppb_video_decoder_dev_thunk.cc |
@@ -5,16 +5,16 @@ |
#include "ppapi/c/pp_errors.h" |
#include "ppapi/shared_impl/tracked_callback.h" |
#include "ppapi/thunk/enter.h" |
-#include "ppapi/thunk/thunk.h" |
-#include "ppapi/thunk/ppb_video_decoder_api.h" |
+#include "ppapi/thunk/ppb_video_decoder_dev_api.h" |
#include "ppapi/thunk/resource_creation_api.h" |
+#include "ppapi/thunk/thunk.h" |
namespace ppapi { |
namespace thunk { |
namespace { |
-typedef EnterResource<PPB_VideoDecoder_API> EnterVideoDecoder; |
+typedef EnterResource<PPB_VideoDecoder_Dev_API> EnterVideoDecoder; |
PP_Resource Create(PP_Instance instance, |
PP_Resource graphics_3d, |
@@ -36,8 +36,8 @@ int32_t Decode(PP_Resource video_decoder, |
EnterVideoDecoder enter(video_decoder, callback, true); |
if (enter.failed()) |
return enter.retval(); |
- return enter.SetResult(enter.object()->Decode(bitstream_buffer, |
- enter.callback())); |
+ return enter.SetResult( |
+ enter.object()->Decode(bitstream_buffer, enter.callback())); |
} |
void AssignPictureBuffers(PP_Resource video_decoder, |
@@ -61,8 +61,7 @@ int32_t Flush(PP_Resource video_decoder, PP_CompletionCallback callback) { |
return enter.SetResult(enter.object()->Flush(enter.callback())); |
} |
-int32_t Reset(PP_Resource video_decoder, |
- PP_CompletionCallback callback) { |
+int32_t Reset(PP_Resource video_decoder, PP_CompletionCallback callback) { |
EnterVideoDecoder enter(video_decoder, callback, true); |
if (enter.failed()) |
return enter.retval(); |
@@ -75,21 +74,20 @@ void Destroy(PP_Resource video_decoder) { |
enter.object()->Destroy(); |
} |
-const PPB_VideoDecoder_Dev g_ppb_videodecoder_thunk = { |
- &Create, |
- &IsVideoDecoder, |
- &Decode, |
- &AssignPictureBuffers, |
- &ReusePictureBuffer, |
- &Flush, |
- &Reset, |
- &Destroy |
-}; |
+const PPB_VideoDecoder_Dev g_ppb_videodecoder_dev_thunk = { |
+ &Create, |
+ &IsVideoDecoder, |
+ &Decode, |
+ &AssignPictureBuffers, |
+ &ReusePictureBuffer, |
+ &Flush, |
+ &Reset, |
+ &Destroy}; |
teravest
2014/05/05 22:42:25
Is this from clang format?
bbudge
2014/05/05 22:55:25
Yep, fixed.
|
} // namespace |
const PPB_VideoDecoder_Dev_0_16* GetPPB_VideoDecoder_Dev_0_16_Thunk() { |
- return &g_ppb_videodecoder_thunk; |
+ return &g_ppb_videodecoder_dev_thunk; |
} |
} // namespace thunk |