diff options
23 files changed, 38 insertions, 115 deletions
diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h index 06f7d0f..d41f9c3 100644 --- a/content/common/gpu/gpu_messages.h +++ b/content/common/gpu/gpu_messages.h @@ -477,9 +477,6 @@ IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_FlushDone) // Confirm decoder has been reset. IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_ResetDone) -// Decoder has faced end of stream marker in the stream. -IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_EndOfStream) - // Video decoder has encountered an error. IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_ErrorNotification, uint32) /* Error ID */ diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc index 11e3803..5f9444f 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc @@ -97,11 +97,6 @@ void GpuVideoDecodeAccelerator::PictureReady( } } -void GpuVideoDecodeAccelerator::NotifyEndOfStream() { - if (!Send(new AcceleratedVideoDecoderHostMsg_EndOfStream(host_route_id_))) - DLOG(ERROR) << "Send(AcceleratedVideoDecoderHostMsg_EndOfStream) failed"; -} - void GpuVideoDecodeAccelerator::NotifyError( media::VideoDecodeAccelerator::Error error) { if (init_done_msg_) { diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h index aa9f726..c6a8d3e 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.h +++ b/content/common/gpu/media/gpu_video_decode_accelerator.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -34,7 +34,6 @@ class GpuVideoDecodeAccelerator virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE; virtual void PictureReady(const media::Picture& picture) OVERRIDE; virtual void NotifyInitializeDone() OVERRIDE; - virtual void NotifyEndOfStream() OVERRIDE; virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE; virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) OVERRIDE; virtual void NotifyFlushDone() OVERRIDE; diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc index e52720d..7d98c5c 100644 --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc @@ -560,7 +560,6 @@ class EglRenderingVDAClient : public VideoDecodeAccelerator::Client { virtual void PictureReady(const media::Picture& picture); // Simple state changes. virtual void NotifyInitializeDone(); - virtual void NotifyEndOfStream(); virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id); virtual void NotifyFlushDone(); virtual void NotifyResetDone(); @@ -746,10 +745,6 @@ void EglRenderingVDAClient::NotifyInitializeDone() { DecodeNextNALUs(); } -void EglRenderingVDAClient::NotifyEndOfStream() { - SetState(CS_DONE); -} - void EglRenderingVDAClient::NotifyEndOfBitstreamBuffer( int32 bitstream_buffer_id) { ++num_done_bitstream_buffers_; diff --git a/content/renderer/gpu/gpu_video_decode_accelerator_host.cc b/content/renderer/gpu/gpu_video_decode_accelerator_host.cc index dfc265f..da294f1 100644 --- a/content/renderer/gpu/gpu_video_decode_accelerator_host.cc +++ b/content/renderer/gpu/gpu_video_decode_accelerator_host.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -48,8 +48,6 @@ bool GpuVideoDecodeAcceleratorHost::OnMessageReceived(const IPC::Message& msg) { OnFlushDone) IPC_MESSAGE_HANDLER(AcceleratedVideoDecoderHostMsg_ResetDone, OnResetDone) - IPC_MESSAGE_HANDLER(AcceleratedVideoDecoderHostMsg_EndOfStream, - OnEndOfStream) IPC_MESSAGE_HANDLER(AcceleratedVideoDecoderHostMsg_ErrorNotification, OnErrorNotification) IPC_MESSAGE_UNHANDLED(handled = false) @@ -165,12 +163,6 @@ void GpuVideoDecodeAcceleratorHost::OnResetDone() { client_->NotifyResetDone(); } -void GpuVideoDecodeAcceleratorHost::OnEndOfStream() { - DCHECK(CalledOnValidThread()); - if (client_) - client_->NotifyEndOfStream(); -} - void GpuVideoDecodeAcceleratorHost::OnErrorNotification(uint32 error) { DCHECK(CalledOnValidThread()); if (!client_) diff --git a/content/renderer/gpu/gpu_video_decode_accelerator_host.h b/content/renderer/gpu/gpu_video_decode_accelerator_host.h index 45d8c234..b926e8e 100644 --- a/content/renderer/gpu/gpu_video_decode_accelerator_host.h +++ b/content/renderer/gpu/gpu_video_decode_accelerator_host.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -52,7 +52,6 @@ class GpuVideoDecodeAcceleratorHost void OnPictureReady(int32 picture_buffer_id, int32 bitstream_buffer_id); void OnFlushDone(); void OnResetDone(); - void OnEndOfStream(); void OnErrorNotification(uint32 error); // Sends IPC messages to the Gpu process. diff --git a/content/renderer/pepper_platform_video_decoder_impl.cc b/content/renderer/pepper_platform_video_decoder_impl.cc index 662d6ec..d815399 100644 --- a/content/renderer/pepper_platform_video_decoder_impl.cc +++ b/content/renderer/pepper_platform_video_decoder_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -82,11 +82,6 @@ void PlatformVideoDecoderImpl::Destroy() { decoder_ = NULL; } -void PlatformVideoDecoderImpl::NotifyEndOfStream() { - DCHECK(RenderThreadImpl::current()); - client_->NotifyEndOfStream(); -} - void PlatformVideoDecoderImpl::NotifyError( VideoDecodeAccelerator::Error error) { DCHECK(RenderThreadImpl::current()); diff --git a/content/renderer/pepper_platform_video_decoder_impl.h b/content/renderer/pepper_platform_video_decoder_impl.h index 2771756..9bd1c07 100644 --- a/content/renderer/pepper_platform_video_decoder_impl.h +++ b/content/renderer/pepper_platform_video_decoder_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -37,7 +37,6 @@ class PlatformVideoDecoderImpl virtual void PictureReady(const media::Picture& picture) OVERRIDE; virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE; virtual void NotifyInitializeDone() OVERRIDE; - virtual void NotifyEndOfStream() OVERRIDE; virtual void NotifyError( media::VideoDecodeAccelerator::Error error) OVERRIDE; virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) OVERRIDE; diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc index a41f744..cf91a5f 100644 --- a/media/filters/gpu_video_decoder.cc +++ b/media/filters/gpu_video_decoder.cc @@ -413,11 +413,6 @@ void GpuVideoDecoder::PutSHM(SHMBuffer* shm_buffer) { available_shm_segments_.push_back(shm_buffer); } -void GpuVideoDecoder::NotifyEndOfStream() { - // TODO(fischman): remove with http://crbug.com/109819 - NOTREACHED() << "NotifyEndOfStream is never called."; -} - void GpuVideoDecoder::NotifyEndOfBitstreamBuffer(int32 id) { if (MessageLoop::current() != message_loop_) { message_loop_->PostTask(FROM_HERE, base::Bind( diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h index ffe508c..80c8011 100644 --- a/media/filters/gpu_video_decoder.h +++ b/media/filters/gpu_video_decoder.h @@ -73,7 +73,6 @@ class MEDIA_EXPORT GpuVideoDecoder const gfx::Size& size) OVERRIDE; virtual void DismissPictureBuffer(int32 id) OVERRIDE; virtual void PictureReady(const media::Picture& picture) OVERRIDE; - virtual void NotifyEndOfStream() OVERRIDE; virtual void NotifyEndOfBitstreamBuffer(int32 id) OVERRIDE; virtual void NotifyFlushDone() OVERRIDE; virtual void NotifyResetDone() OVERRIDE; diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h index 3118a84..623cf1e 100644 --- a/media/video/video_decode_accelerator.h +++ b/media/video/video_decode_accelerator.h @@ -64,10 +64,6 @@ class MEDIA_EXPORT VideoDecodeAccelerator // Callback to deliver decoded pictures ready to be displayed. virtual void PictureReady(const Picture& picture) = 0; - // Callback to notify that decoder has decoded end of stream marker and has - // outputted all displayable pictures. - virtual void NotifyEndOfStream() = 0; - // Callback to notify that decoded has decoded the end of the current // bitstream buffer. virtual void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) = 0; diff --git a/ppapi/api/dev/ppp_video_decoder_dev.idl b/ppapi/api/dev/ppp_video_decoder_dev.idl index 529a7eb..2a6e419 100644 --- a/ppapi/api/dev/ppp_video_decoder_dev.idl +++ b/ppapi/api/dev/ppp_video_decoder_dev.idl @@ -7,7 +7,8 @@ * This file defines the <code>PPP_VideoDecoder_Dev</code> interface. */ label Chrome { - M14 = 0.9 + M14 = 0.9, + M18 = 0.10 }; /** @@ -76,6 +77,7 @@ interface PPP_VideoDecoder_Dev { * |instance| the plugin instance to which the callback is responding. * |decoder| the PPB_VideoDecoder_Dev resource. */ + [deprecate=0.10] void EndOfStream( [in] PP_Instance instance, [in] PP_Resource decoder); diff --git a/ppapi/c/dev/ppp_video_decoder_dev.h b/ppapi/c/dev/ppp_video_decoder_dev.h index 8ad59f0..a06b582 100644 --- a/ppapi/c/dev/ppp_video_decoder_dev.h +++ b/ppapi/c/dev/ppp_video_decoder_dev.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* From dev/ppp_video_decoder_dev.idl modified Tue Oct 11 10:01:39 2011. */ +/* From dev/ppp_video_decoder_dev.idl modified Wed Jan 11 14:58:58 2012. */ #ifndef PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_ #define PPAPI_C_DEV_PPP_VIDEO_DECODER_DEV_H_ @@ -16,7 +16,8 @@ #include "ppapi/c/pp_stdint.h" #define PPP_VIDEODECODER_DEV_INTERFACE_0_9 "PPP_VideoDecoder(Dev);0.9" -#define PPP_VIDEODECODER_DEV_INTERFACE PPP_VIDEODECODER_DEV_INTERFACE_0_9 +#define PPP_VIDEODECODER_DEV_INTERFACE_0_10 "PPP_VideoDecoder(Dev);0.10" +#define PPP_VIDEODECODER_DEV_INTERFACE PPP_VIDEODECODER_DEV_INTERFACE_0_10 /** * @file @@ -35,7 +36,7 @@ * * See PPB_VideoDecoder_Dev for general usage tips. */ -struct PPP_VideoDecoder_Dev_0_9 { +struct PPP_VideoDecoder_Dev_0_10 { /** * Callback function to provide buffers for the decoded output pictures. If * succeeds plugin must provide buffers through AssignPictureBuffers function @@ -80,16 +81,6 @@ struct PPP_VideoDecoder_Dev_0_9 { PP_Resource decoder, const struct PP_Picture_Dev* picture); /** - * Callback function to tell the plugin that decoder has decoded end of stream - * marker and output all the pictures that should be displayed from the - * stream. - * - * Parameters: - * |instance| the plugin instance to which the callback is responding. - * |decoder| the PPB_VideoDecoder_Dev resource. - */ - void (*EndOfStream)(PP_Instance instance, PP_Resource decoder); - /** * Error handler callback for decoder to deliver information about detected * errors to the plugin. * @@ -103,7 +94,24 @@ struct PPP_VideoDecoder_Dev_0_9 { PP_VideoDecodeError_Dev error); }; -typedef struct PPP_VideoDecoder_Dev_0_9 PPP_VideoDecoder_Dev; +typedef struct PPP_VideoDecoder_Dev_0_10 PPP_VideoDecoder_Dev; + +struct PPP_VideoDecoder_Dev_0_9 { + void (*ProvidePictureBuffers)(PP_Instance instance, + PP_Resource decoder, + uint32_t req_num_of_bufs, + const struct PP_Size* dimensions); + void (*DismissPictureBuffer)(PP_Instance instance, + PP_Resource decoder, + int32_t picture_buffer_id); + void (*PictureReady)(PP_Instance instance, + PP_Resource decoder, + const struct PP_Picture_Dev* picture); + void (*EndOfStream)(PP_Instance instance, PP_Resource decoder); + void (*NotifyError)(PP_Instance instance, + PP_Resource decoder, + PP_VideoDecodeError_Dev error); +}; /** * @} */ diff --git a/ppapi/cpp/dev/video_decoder_client_dev.cc b/ppapi/cpp/dev/video_decoder_client_dev.cc index 6186745..20cd329 100644 --- a/ppapi/cpp/dev/video_decoder_client_dev.cc +++ b/ppapi/cpp/dev/video_decoder_client_dev.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -50,15 +50,6 @@ void PictureReady(PP_Instance instance, static_cast<VideoDecoderClient_Dev*>(object)->PictureReady(decoder, *picture); } -void EndOfStream(PP_Instance instance, - PP_Resource decoder) { - void* object = pp::Instance::GetPerInstanceObject( - instance, kPPPVideoDecoderInterface); - if (!object) - return; - static_cast<VideoDecoderClient_Dev*>(object)->EndOfStream(decoder); -} - void NotifyError(PP_Instance instance, PP_Resource decoder, PP_VideoDecodeError_Dev error) { @@ -73,7 +64,6 @@ static PPP_VideoDecoder_Dev videodecoder_interface = { &ProvidePictureBuffers, &DismissPictureBuffer, &PictureReady, - &EndOfStream, &NotifyError, }; diff --git a/ppapi/cpp/dev/video_decoder_client_dev.h b/ppapi/cpp/dev/video_decoder_client_dev.h index 5510b4c..7280736 100644 --- a/ppapi/cpp/dev/video_decoder_client_dev.h +++ b/ppapi/cpp/dev/video_decoder_client_dev.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -36,10 +36,6 @@ class VideoDecoderClient_Dev { virtual void PictureReady(PP_Resource decoder, const PP_Picture_Dev& picture) = 0; - // Callback to notify that decoder has decoded end of stream marker and has - // outputted all displayable pictures. - virtual void EndOfStream(PP_Resource decoder) = 0; - // Callback to notify about decoding errors. virtual void NotifyError(PP_Resource decoder, PP_VideoDecodeError_Dev error) = 0; diff --git a/ppapi/examples/gles2/gles2.cc b/ppapi/examples/gles2/gles2.cc index 9e0ea6c..a475230 100644 --- a/ppapi/examples/gles2/gles2.cc +++ b/ppapi/examples/gles2/gles2.cc @@ -66,7 +66,6 @@ class GLES2DemoInstance : public pp::Instance, virtual void DismissPictureBuffer(PP_Resource decoder, int32_t picture_buffer_id); virtual void PictureReady(PP_Resource decoder, const PP_Picture_Dev& picture); - virtual void EndOfStream(PP_Resource decoder); virtual void NotifyError(PP_Resource decoder, PP_VideoDecodeError_Dev error); private: @@ -398,9 +397,6 @@ void GLES2DemoInstance::PictureReady(PP_Resource decoder, assert(context_->SwapBuffers(cb) == PP_OK_COMPLETIONPENDING); } -void GLES2DemoInstance::EndOfStream(PP_Resource decoder) { -} - void GLES2DemoInstance::NotifyError(PP_Resource decoder, PP_VideoDecodeError_Dev error) { LogError(this).s() << "Received error: " << error; diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index 0b47a71..085be37 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -489,8 +489,6 @@ IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoDecoder_DismissPictureBuffer, IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoDecoder_PictureReady, ppapi::HostResource /* video_decoder */, PP_Picture_Dev /* output picture */) -IPC_MESSAGE_ROUTED1(PpapiMsg_PPPVideoDecoder_NotifyEndOfStream, - ppapi::HostResource /* video_decoder */) IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoDecoder_NotifyError, ppapi::HostResource /* video_decoder */, PP_VideoDecodeError_Dev /* error */) diff --git a/ppapi/proxy/ppp_video_decoder_proxy.cc b/ppapi/proxy/ppp_video_decoder_proxy.cc index d0cb1f3..6330b11 100644 --- a/ppapi/proxy/ppp_video_decoder_proxy.cc +++ b/ppapi/proxy/ppp_video_decoder_proxy.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -53,15 +53,6 @@ void PictureReady(PP_Instance instance, PP_Resource decoder, API_ID_PPP_VIDEO_DECODER_DEV, decoder_resource, *picture)); } -void EndOfStream(PP_Instance instance, PP_Resource decoder) { - HostResource decoder_resource; - decoder_resource.SetHostResource(instance, decoder); - - HostDispatcher::GetForInstance(instance)->Send( - new PpapiMsg_PPPVideoDecoder_NotifyEndOfStream( - API_ID_PPP_VIDEO_DECODER_DEV, decoder_resource)); -} - void NotifyError(PP_Instance instance, PP_Resource decoder, PP_VideoDecodeError_Dev error) { HostResource decoder_resource; @@ -76,7 +67,6 @@ static const PPP_VideoDecoder_Dev video_decoder_interface = { &ProvidePictureBuffers, &DismissPictureBuffer, &PictureReady, - &EndOfStream, &NotifyError }; @@ -119,8 +109,6 @@ bool PPP_VideoDecoder_Proxy::OnMessageReceived(const IPC::Message& msg) { OnMsgDismissPictureBuffer) IPC_MESSAGE_HANDLER(PpapiMsg_PPPVideoDecoder_PictureReady, OnMsgPictureReady) - IPC_MESSAGE_HANDLER(PpapiMsg_PPPVideoDecoder_NotifyEndOfStream, - OnMsgNotifyEndOfStream) IPC_MESSAGE_HANDLER(PpapiMsg_PPPVideoDecoder_NotifyError, OnMsgNotifyError) IPC_MESSAGE_UNHANDLED(handled = false) @@ -154,14 +142,6 @@ void PPP_VideoDecoder_Proxy::OnMsgPictureReady( decoder.instance(), plugin_decoder, &picture); } -void PPP_VideoDecoder_Proxy::OnMsgNotifyEndOfStream( - const HostResource& decoder) { - PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()-> - PluginResourceForHostResource(decoder); - ppp_video_decoder_impl_->EndOfStream(decoder.instance(), - plugin_decoder); -} - void PPP_VideoDecoder_Proxy::OnMsgNotifyError( const HostResource& decoder, PP_VideoDecodeError_Dev error) { PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()-> diff --git a/ppapi/proxy/ppp_video_decoder_proxy.h b/ppapi/proxy/ppp_video_decoder_proxy.h index e12c668..c4ff4c3 100644 --- a/ppapi/proxy/ppp_video_decoder_proxy.h +++ b/ppapi/proxy/ppp_video_decoder_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -35,7 +35,6 @@ class PPP_VideoDecoder_Proxy : public InterfaceProxy { int32_t picture_id); void OnMsgPictureReady(const ppapi::HostResource& decoder, const PP_Picture_Dev& picture_buffer); - void OnMsgNotifyEndOfStream(const ppapi::HostResource& decoder); void OnMsgNotifyError(const ppapi::HostResource& decoder, PP_VideoDecodeError_Dev error); diff --git a/ppapi/tests/arch_dependent_sizes_32.h b/ppapi/tests/arch_dependent_sizes_32.h index 4be5ad7..755907f 100644 --- a/ppapi/tests/arch_dependent_sizes_32.h +++ b/ppapi/tests/arch_dependent_sizes_32.h @@ -17,6 +17,6 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CompletionCallback_Func, 4); PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLLoaderTrusted_StatusCallback, 4); PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_CompletionCallback, 12); PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPB_VideoDecoder_Dev, 32); -PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 20); +PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 16); #endif /* PPAPI_TESTS_ARCH_DEPENDENT_SIZES_32_H_ */ diff --git a/ppapi/tests/arch_dependent_sizes_64.h b/ppapi/tests/arch_dependent_sizes_64.h index 68f4e05..bd30300 100644 --- a/ppapi/tests/arch_dependent_sizes_64.h +++ b/ppapi/tests/arch_dependent_sizes_64.h @@ -17,6 +17,6 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CompletionCallback_Func, 8); PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLLoaderTrusted_StatusCallback, 8); PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_CompletionCallback, 24); PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPB_VideoDecoder_Dev, 64); -PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 40); +PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 32); #endif /* PPAPI_TESTS_ARCH_DEPENDENT_SIZES_64_H_ */ diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc index c83152c..9d34734 100644 --- a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc +++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -218,12 +218,6 @@ void PPB_VideoDecoder_Impl::DismissPictureBuffer(int32 picture_buffer_id) { picture_buffer_id); } -void PPB_VideoDecoder_Impl::NotifyEndOfStream() { - if (!ppp_videodecoder_) - return; - ppp_videodecoder_->EndOfStream(pp_instance(), pp_resource()); -} - void PPB_VideoDecoder_Impl::NotifyError( media::VideoDecodeAccelerator::Error error) { if (!ppp_videodecoder_) diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.h b/webkit/plugins/ppapi/ppb_video_decoder_impl.h index 3d5c9bb..990e980 100644 --- a/webkit/plugins/ppapi/ppb_video_decoder_impl.h +++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.h @@ -56,7 +56,6 @@ class PPB_VideoDecoder_Impl : public ::ppapi::PPB_VideoDecoder_Shared, virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE; virtual void PictureReady(const media::Picture& picture) OVERRIDE; virtual void NotifyInitializeDone() OVERRIDE; - virtual void NotifyEndOfStream() OVERRIDE; virtual void NotifyError( media::VideoDecodeAccelerator::Error error) OVERRIDE; virtual void NotifyFlushDone() OVERRIDE; |