Revert 86681 - Updated OMX decoder for recent PPAPI changes, and added to the build.

content/renderer/gpu_video_decode_accelerator_host.cc

 // Copyright (c) 2011 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.
 
 #include "content/renderer/gpu_video_decode_accelerator_host.h"
 
 #include "base/logging.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/render_thread.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 
 using media::VideoDecodeAccelerator;
+using media::VideoDecodeAcceleratorCallback;
 
 GpuVideoDecodeAcceleratorHost::GpuVideoDecodeAcceleratorHost(
     MessageRouter* router,
     IPC::Message::Sender* ipc_sender,
     int32 decoder_host_id,
     VideoDecodeAccelerator::Client* client)
     : router_(router),
       ipc_sender_(ipc_sender),
       decoder_host_id_(decoder_host_id),
       decoder_id_(0),
@@ skipping 70 matching lines @@
 }
 
 void GpuVideoDecodeAcceleratorHost::AssignGLESBuffers(
     const std::vector<media::GLESBuffer>& buffers) {
   // Rearrange data for IPC command.
   std::vector<int32> buffer_ids;
   std::vector<uint32> texture_ids;
   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))) {
     LOG(ERROR) << "Send(AcceleratedVideoDecoderMsg_AssignGLESBuffers) failed";
   }
 }
 
 void GpuVideoDecodeAcceleratorHost::AssignSysmemBuffers(
     const std::vector<media::SysmemBuffer>& buffers) {
   // TODO(vrk): Implement.
@@ skipping 69 matching lines @@
 }
 
 void GpuVideoDecodeAcceleratorHost::OnEndOfStream() {
   client_->NotifyEndOfStream();
 }
 
 void GpuVideoDecodeAcceleratorHost::OnErrorNotification(uint32 error) {
   client_->NotifyError(
       static_cast<media::VideoDecodeAccelerator::Error>(error));
 }