| Index: ppapi/cpp/dev/video_decoder_client_dev.cc
|
| diff --git a/ppapi/cpp/dev/video_decoder_client_dev.cc b/ppapi/cpp/dev/video_decoder_client_dev.cc
|
| index aa00c6f14770277ec251bfe65c1129534203bd60..e0c174ce5668aa5975236d6fcdfd01e023bf8381 100644
|
| --- a/ppapi/cpp/dev/video_decoder_client_dev.cc
|
| +++ b/ppapi/cpp/dev/video_decoder_client_dev.cc
|
| @@ -18,7 +18,6 @@ const char kPPPVideoDecoderInterface[] = PPP_VIDEODECODER_DEV_INTERFACE;
|
|
|
| // Callback to provide buffers for the decoded output pictures.
|
| void ProvidePictureBuffers(PP_Instance instance,
|
| - PP_Resource decoder_id,
|
| uint32_t req_num_of_bufs,
|
| struct PP_Size dimensions,
|
| enum PP_PictureBufferType_Dev type) {
|
| @@ -27,49 +26,41 @@ void ProvidePictureBuffers(PP_Instance instance,
|
| if (!object)
|
| return;
|
| static_cast<VideoDecoderClient_Dev*>(object)->ProvidePictureBuffers(
|
| - VideoDecoder_Dev(decoder_id), req_num_of_bufs, dimensions, type);
|
| + req_num_of_bufs, dimensions, type);
|
| }
|
|
|
| void DismissPictureBuffer(PP_Instance instance,
|
| - PP_Resource decoder_id,
|
| int32_t picture_buffer_id) {
|
| void* object = pp::Instance::GetPerInstanceObject(
|
| instance, kPPPVideoDecoderInterface);
|
| if (!object)
|
| return;
|
| static_cast<VideoDecoderClient_Dev*>(object)->DismissPictureBuffer(
|
| - VideoDecoder_Dev(decoder_id), picture_buffer_id);
|
| + picture_buffer_id);
|
| }
|
|
|
| -void PictureReady(PP_Instance instance,
|
| - PP_Resource decoder_id,
|
| - PP_Picture_Dev picture) {
|
| +void PictureReady(PP_Instance instance, PP_Picture_Dev picture) {
|
| void* object = pp::Instance::GetPerInstanceObject(
|
| instance, kPPPVideoDecoderInterface);
|
| if (!object)
|
| return;
|
| - static_cast<VideoDecoderClient_Dev*>(object)->PictureReady(
|
| - VideoDecoder_Dev(decoder_id), picture);
|
| + static_cast<VideoDecoderClient_Dev*>(object)->PictureReady(picture);
|
| }
|
|
|
| -void EndOfStream(PP_Instance instance, PP_Resource decoder_id) {
|
| +void EndOfStream(PP_Instance instance) {
|
| void* object = pp::Instance::GetPerInstanceObject(
|
| instance, kPPPVideoDecoderInterface);
|
| if (!object)
|
| return;
|
| - static_cast<VideoDecoderClient_Dev*>(object)->EndOfStream(
|
| - VideoDecoder_Dev(decoder_id));
|
| + static_cast<VideoDecoderClient_Dev*>(object)->EndOfStream();
|
| }
|
|
|
| -void NotifyError(PP_Instance instance,
|
| - PP_Resource decoder_id,
|
| - PP_VideoDecodeError_Dev error) {
|
| +void NotifyError(PP_Instance instance, PP_VideoDecodeError_Dev error) {
|
| void* object = pp::Instance::GetPerInstanceObject(
|
| instance, kPPPVideoDecoderInterface);
|
| if (!object)
|
| return;
|
| - static_cast<VideoDecoderClient_Dev*>(object)->NotifyError(
|
| - VideoDecoder_Dev(decoder_id), error);
|
| + static_cast<VideoDecoderClient_Dev*>(object)->NotifyError(error);
|
| }
|
|
|
| static PPP_VideoDecoder_Dev videodecoder_interface = {
|
|
|