diff options
author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 00:02:29 +0000 |
---|---|---|
committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 00:02:29 +0000 |
commit | c80a0baf8bc4a6dcf498b95effa8bb7916f60658 (patch) | |
tree | d7ca9c74fab5d9eed7846f0ce6f81fc788428d6b /content | |
parent | 9b22223811802910166004c95afcfa41d38997a4 (diff) | |
download | chromium_src-c80a0baf8bc4a6dcf498b95effa8bb7916f60658.zip chromium_src-c80a0baf8bc4a6dcf498b95effa8bb7916f60658.tar.gz chromium_src-c80a0baf8bc4a6dcf498b95effa8bb7916f60658.tar.bz2 |
Remove VideoDecodeAccelerator::Client::NotifyEndOfStream / PPP_VideoDecoder_Dev::EndOfStream
Nobody's ever called it and it doesn't make sense given the API: EOS is
signalled when no more bits are available to Decode(), via Flush().
BUG=109819
TEST=trybots
Review URL: http://codereview.chromium.org/9186022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
8 files changed, 5 insertions, 34 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; |