diff options
author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 09:45:58 +0000 |
---|---|---|
committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 09:45:58 +0000 |
commit | e5ca636dd1b50cc61275d0f686aea895d2f42ee2 (patch) | |
tree | 7cd49f805653764a7e501d0f494b83ba09cf3c9b /content/renderer/media | |
parent | 0d47474882642ea12d5c81170621cd826085b09c (diff) | |
download | chromium_src-e5ca636dd1b50cc61275d0f686aea895d2f42ee2.zip chromium_src-e5ca636dd1b50cc61275d0f686aea895d2f42ee2.tar.gz chromium_src-e5ca636dd1b50cc61275d0f686aea895d2f42ee2.tar.bz2 |
Replace the unnecessary VDA::Profile typedef with media::VideoCodecProfile
Originally landed as: http://src.chromium.org/viewvc/chrome?view=rev&revision=129752
Reverted in: http://src.chromium.org/viewvc/chrome?view=rev&revision=129765
Review URL: http://codereview.chromium.org/9863027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media')
4 files changed, 6 insertions, 6 deletions
diff --git a/content/renderer/media/pepper_platform_video_decoder_impl.cc b/content/renderer/media/pepper_platform_video_decoder_impl.cc index 65ed487..503cd43 100644 --- a/content/renderer/media/pepper_platform_video_decoder_impl.cc +++ b/content/renderer/media/pepper_platform_video_decoder_impl.cc @@ -24,7 +24,7 @@ PlatformVideoDecoderImpl::PlatformVideoDecoderImpl( PlatformVideoDecoderImpl::~PlatformVideoDecoderImpl() {} -bool PlatformVideoDecoderImpl::Initialize(Profile profile) { +bool PlatformVideoDecoderImpl::Initialize(media::VideoCodecProfile profile) { // TODO(vrk): Support multiple decoders. if (decoder_) return true; diff --git a/content/renderer/media/pepper_platform_video_decoder_impl.h b/content/renderer/media/pepper_platform_video_decoder_impl.h index ac7c02a..2927277 100644 --- a/content/renderer/media/pepper_platform_video_decoder_impl.h +++ b/content/renderer/media/pepper_platform_video_decoder_impl.h @@ -21,7 +21,7 @@ class PlatformVideoDecoderImpl int32 command_buffer_route_id); // PlatformVideoDecoder (a.k.a. VideoDecodeAccelerator) implementation. - virtual bool Initialize(Profile profile) OVERRIDE; + virtual bool Initialize(media::VideoCodecProfile profile) OVERRIDE; virtual void Decode( const media::BitstreamBuffer& bitstream_buffer) OVERRIDE; virtual void AssignPictureBuffers( diff --git a/content/renderer/media/renderer_gpu_video_decoder_factories.cc b/content/renderer/media/renderer_gpu_video_decoder_factories.cc index 5f940b53..9125666 100644 --- a/content/renderer/media/renderer_gpu_video_decoder_factories.cc +++ b/content/renderer/media/renderer_gpu_video_decoder_factories.cc @@ -44,7 +44,7 @@ void RendererGpuVideoDecoderFactories::AsyncGetContext( media::VideoDecodeAccelerator* RendererGpuVideoDecoderFactories::CreateVideoDecodeAccelerator( - media::VideoDecodeAccelerator::Profile profile, + media::VideoCodecProfile profile, media::VideoDecodeAccelerator::Client* client) { DCHECK_NE(MessageLoop::current(), message_loop_); media::VideoDecodeAccelerator* vda = NULL; @@ -57,7 +57,7 @@ RendererGpuVideoDecoderFactories::CreateVideoDecodeAccelerator( } void RendererGpuVideoDecoderFactories::AsyncCreateVideoDecodeAccelerator( - media::VideoDecodeAccelerator::Profile profile, + media::VideoCodecProfile profile, media::VideoDecodeAccelerator::Client* client, media::VideoDecodeAccelerator** vda, base::WaitableEvent* waiter) { diff --git a/content/renderer/media/renderer_gpu_video_decoder_factories.h b/content/renderer/media/renderer_gpu_video_decoder_factories.h index 5924a20..1999418 100644 --- a/content/renderer/media/renderer_gpu_video_decoder_factories.h +++ b/content/renderer/media/renderer_gpu_video_decoder_factories.h @@ -41,7 +41,7 @@ class CONTENT_EXPORT RendererGpuVideoDecoderFactories WebGraphicsContext3DCommandBufferImpl* wgc3dcbi); virtual media::VideoDecodeAccelerator* CreateVideoDecodeAccelerator( - media::VideoDecodeAccelerator::Profile profile, + media::VideoCodecProfile profile, media::VideoDecodeAccelerator::Client* client) OVERRIDE; virtual bool CreateTextures(int32 count, const gfx::Size& size, @@ -68,7 +68,7 @@ class CONTENT_EXPORT RendererGpuVideoDecoderFactories // AsyncCreateSharedMemory runs on the renderer thread and the rest run on // |message_loop_|. void AsyncCreateVideoDecodeAccelerator( - media::VideoDecodeAccelerator::Profile profile, + media::VideoCodecProfile profile, media::VideoDecodeAccelerator::Client* client, media::VideoDecodeAccelerator** vda, base::WaitableEvent* waiter); |