| Index: ppapi/cpp/dev/video_decoder_dev.cc
|
| ===================================================================
|
| --- ppapi/cpp/dev/video_decoder_dev.cc (revision 87917)
|
| +++ ppapi/cpp/dev/video_decoder_dev.cc (working copy)
|
| @@ -22,24 +22,19 @@
|
|
|
| } // namespace
|
|
|
| -VideoDecoder::VideoDecoder(const Instance* instance, Client* client)
|
| +VideoDecoder::VideoDecoder(const Instance* instance,
|
| + const PP_VideoConfigElement* config,
|
| + CompletionCallback callback,
|
| + Client* client)
|
| : client_(client) {
|
| if (!has_interface<PPB_VideoDecoder_Dev>())
|
| return;
|
| PassRefFromConstructor(get_interface<PPB_VideoDecoder_Dev>()->Create(
|
| - instance->pp_instance()));
|
| + instance->pp_instance(), config, callback.pp_completion_callback()));
|
| }
|
|
|
| VideoDecoder::~VideoDecoder() {}
|
|
|
| -int32_t VideoDecoder::Initialize(const PP_VideoConfigElement* config,
|
| - CompletionCallback callback) {
|
| - if (!has_interface<PPB_VideoDecoder_Dev>())
|
| - return PP_ERROR_NOINTERFACE;
|
| - return get_interface<PPB_VideoDecoder_Dev>()->Initialize(
|
| - pp_resource(), config, callback.pp_completion_callback());
|
| -}
|
| -
|
| bool VideoDecoder::GetConfigs(Instance* instance,
|
| const PP_VideoConfigElement* prototype_config,
|
| PP_VideoConfigElement* matching_configs,
|
| @@ -68,15 +63,12 @@
|
| pp_resource(), buffers.size(), &buffers[0]);
|
| }
|
|
|
| -int32_t VideoDecoder::Decode(
|
| - const PP_VideoBitstreamBuffer_Dev& bitstream_buffer,
|
| - CompletionCallback callback) {
|
| - if (!has_interface<PPB_VideoDecoder_Dev>())
|
| - return PP_ERROR_NOINTERFACE;
|
| - if (!pp_resource())
|
| - return PP_ERROR_BADRESOURCE;
|
| - return get_interface<PPB_VideoDecoder_Dev>()->Decode(
|
| - pp_resource(), &bitstream_buffer, callback.pp_completion_callback());
|
| +bool VideoDecoder::Decode(const PP_VideoBitstreamBuffer_Dev& bitstream_buffer,
|
| + CompletionCallback callback) {
|
| + if (!has_interface<PPB_VideoDecoder_Dev>() || !pp_resource())
|
| + return false;
|
| + return PPBoolToBool(get_interface<PPB_VideoDecoder_Dev>()->Decode(
|
| + pp_resource(), &bitstream_buffer, callback.pp_completion_callback()));
|
| }
|
|
|
| void VideoDecoder::ReusePictureBuffer(int32_t picture_buffer_id) {
|
| @@ -86,22 +78,18 @@
|
| pp_resource(), picture_buffer_id);
|
| }
|
|
|
| -int32_t VideoDecoder::Flush(CompletionCallback callback) {
|
| - if (!has_interface<PPB_VideoDecoder_Dev>())
|
| - return PP_ERROR_NOINTERFACE;
|
| - if (!pp_resource())
|
| - return PP_ERROR_BADRESOURCE;
|
| - return get_interface<PPB_VideoDecoder_Dev>()->Flush(
|
| - pp_resource(), callback.pp_completion_callback());
|
| +bool VideoDecoder::Flush(CompletionCallback callback) {
|
| + if (!has_interface<PPB_VideoDecoder_Dev>() || !pp_resource())
|
| + return false;
|
| + return PPBoolToBool(get_interface<PPB_VideoDecoder_Dev>()->Flush(
|
| + pp_resource(), callback.pp_completion_callback()));
|
| }
|
|
|
| -int32_t VideoDecoder::Abort(CompletionCallback callback) {
|
| - if (!has_interface<PPB_VideoDecoder_Dev>())
|
| - return PP_ERROR_NOINTERFACE;
|
| - if (!pp_resource())
|
| - return PP_ERROR_BADRESOURCE;
|
| - return get_interface<PPB_VideoDecoder_Dev>()->Abort(
|
| - pp_resource(), callback.pp_completion_callback());
|
| +bool VideoDecoder::Abort(CompletionCallback callback) {
|
| + if (!has_interface<PPB_VideoDecoder_Dev>() || !pp_resource())
|
| + return false;
|
| + return PPBoolToBool(get_interface<PPB_VideoDecoder_Dev>()->Abort(
|
| + pp_resource(), callback.pp_completion_callback()));
|
| }
|
|
|
| } // namespace pp
|
|
|