diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 19:57:49 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 19:57:49 +0000 |
| commit | 5cd02a973830086a36ec7ef766bab1c84042a645 (patch) | |
| tree | 7b434e9e3f7ba33226223af8703cd77352c9a534 /content/renderer | |
| parent | 11f764bbe5614c7973203308235d907fd275f1f6 (diff) | |
| download | chromium_src-5cd02a973830086a36ec7ef766bab1c84042a645.zip chromium_src-5cd02a973830086a36ec7ef766bab1c84042a645.tar.gz chromium_src-5cd02a973830086a36ec7ef766bab1c84042a645.tar.bz2 | |
Updated OMX decoder for recent PPAPI changes, and added to the build.
Had to move from content/gpu to content/common/gpu to allow gpu_video_service.cc
to depend on the decoder.
Removed some dead code and did some random cleanup while I was in there.
BUG=none
TEST=chrome compiles on cros/arm!
Review URL: http://codereview.chromium.org/7057027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/gpu_video_decode_accelerator_host.cc | 11 | ||||
| -rw-r--r-- | content/renderer/pepper_platform_video_decoder_impl.cc | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/content/renderer/gpu_video_decode_accelerator_host.cc b/content/renderer/gpu_video_decode_accelerator_host.cc index 2b2d027..ef9ef7f 100644 --- a/content/renderer/gpu_video_decode_accelerator_host.cc +++ b/content/renderer/gpu_video_decode_accelerator_host.cc @@ -14,7 +14,6 @@ #include "ipc/ipc_message_utils.h" using media::VideoDecodeAccelerator; -using media::VideoDecodeAcceleratorCallback; GpuVideoDecodeAcceleratorHost::GpuVideoDecodeAcceleratorHost( MessageRouter* router, @@ -105,11 +104,11 @@ void GpuVideoDecodeAcceleratorHost::AssignGLESBuffers( std::vector<uint32> context_ids; std::vector<gfx::Size> sizes; for (uint32 i = 0; i < buffers.size(); i++) { - const media::BufferInfo& info = buffers[i].buffer_info(); - texture_ids.push_back(buffers[i].texture_id()); - context_ids.push_back(buffers[i].context_id()); - buffer_ids.push_back(info.id()); - sizes.push_back(info.size()); + const media::GLESBuffer& buffer = buffers[i]; + texture_ids.push_back(buffer.texture_id()); + context_ids.push_back(buffer.context_id()); + buffer_ids.push_back(buffer.id()); + sizes.push_back(buffer.size()); } if (!ipc_sender_->Send(new AcceleratedVideoDecoderMsg_AssignGLESBuffers( decoder_id_, buffer_ids, texture_ids, context_ids, sizes))) { diff --git a/content/renderer/pepper_platform_video_decoder_impl.cc b/content/renderer/pepper_platform_video_decoder_impl.cc index 7d46cf4..88ccb3a 100644 --- a/content/renderer/pepper_platform_video_decoder_impl.cc +++ b/content/renderer/pepper_platform_video_decoder_impl.cc @@ -15,7 +15,6 @@ #include "content/renderer/render_thread.h" using media::BitstreamBuffer; -using media::VideoDecodeAcceleratorCallback; PlatformVideoDecoderImpl::PlatformVideoDecoderImpl( VideoDecodeAccelerator::Client* client) |