| Index: webkit/plugins/ppapi/ppb_video_decoder_impl.cc
|
| diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
|
| index db8a8f662f65f795b911e2f6802098256f62443e..d49a248ebd4a1e2972a0b363ef856dc8d2d03adb 100644
|
| --- a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
|
| +++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
|
| @@ -85,7 +85,9 @@ static media::VideoCodecProfile PPToMediaProfile(
|
| PP_Resource PPB_VideoDecoder_Impl::Create(
|
| PP_Instance instance,
|
| PP_Resource graphics_context,
|
| - PP_VideoDecoder_Profile profile) {
|
| + PP_VideoDecoder_Profile profile,
|
| + const gfx::Size& frame_size,
|
| + const std::vector<uint8_t>& extra_data) {
|
| EnterResourceNoLock<PPB_Graphics3D_API> enter_context(graphics_context, true);
|
| if (enter_context.failed())
|
| return 0;
|
| @@ -95,7 +97,8 @@ PP_Resource PPB_VideoDecoder_Impl::Create(
|
| scoped_refptr<PPB_VideoDecoder_Impl> decoder(
|
| new PPB_VideoDecoder_Impl(instance));
|
| if (decoder->Init(graphics_context, graphics3d_impl->platform_context(),
|
| - graphics3d_impl->gles2_impl(), profile))
|
| + graphics3d_impl->gles2_impl(), profile, frame_size,
|
| + extra_data))
|
| return decoder->GetReference();
|
| return 0;
|
| }
|
| @@ -104,7 +107,9 @@ bool PPB_VideoDecoder_Impl::Init(
|
| PP_Resource graphics_context,
|
| PluginDelegate::PlatformContext3D* context,
|
| gpu::gles2::GLES2Implementation* gles2_impl,
|
| - PP_VideoDecoder_Profile profile) {
|
| + PP_VideoDecoder_Profile profile,
|
| + const gfx::Size& frame_size,
|
| + const std::vector<uint8_t>& extra_data) {
|
| InitCommon(graphics_context, gles2_impl);
|
|
|
| int command_buffer_route_id = context->GetCommandBufferRouteId();
|
| @@ -121,7 +126,8 @@ bool PPB_VideoDecoder_Impl::Init(
|
| return false;
|
|
|
| FlushCommandBuffer();
|
| - return platform_video_decoder_->Initialize(PPToMediaProfile(profile));
|
| + return platform_video_decoder_->Initialize(
|
| + PPToMediaProfile(profile), frame_size, extra_data);
|
| }
|
|
|
| int32_t PPB_VideoDecoder_Impl::Decode(
|
|
|