Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2843)

Unified Diff: content/renderer/gpu_video_decode_accelerator_host.cc

Issue 6979017: Revert 86681 - Updated OMX decoder for recent PPAPI changes, and added to the build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/gpu/omx_video_decode_accelerator.cc ('k') | content/renderer/pepper_platform_video_decoder_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu_video_decode_accelerator_host.cc
===================================================================
--- content/renderer/gpu_video_decode_accelerator_host.cc (revision 86686)
+++ content/renderer/gpu_video_decode_accelerator_host.cc (working copy)
@@ -14,6 +14,7 @@
#include "ipc/ipc_message_utils.h"
using media::VideoDecodeAccelerator;
+using media::VideoDecodeAcceleratorCallback;
GpuVideoDecodeAcceleratorHost::GpuVideoDecodeAcceleratorHost(
MessageRouter* router,
@@ -104,11 +105,11 @@
std::vector<uint32> context_ids;
std::vector<gfx::Size> sizes;
for (uint32 i = 0; i < buffers.size(); i++) {
- 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());
+ 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());
}
if (!ipc_sender_->Send(new AcceleratedVideoDecoderMsg_AssignGLESBuffers(
decoder_id_, buffer_ids, texture_ids, context_ids, sizes))) {
« no previous file with comments | « content/gpu/omx_video_decode_accelerator.cc ('k') | content/renderer/pepper_platform_video_decoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698