Clean up video frame sizes, types in Video Decode API

content/renderer/gpu/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/gpu_video_decode_accelerator_host.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
@@ skipping 85 matching lines @@
 }
 
 void GpuVideoDecodeAcceleratorHost::Decode(
     const media::BitstreamBuffer& bitstream_buffer) {
   DCHECK(CalledOnValidThread());
   Send(new AcceleratedVideoDecoderMsg_Decode(
       command_buffer_route_id_, SyncTokens(), bitstream_buffer.handle(),
       bitstream_buffer.id(), bitstream_buffer.size()));
 }
 
-void GpuVideoDecodeAcceleratorHost::AssignGLESBuffers(
-    const std::vector<media::GLESBuffer>& buffers) {
+void GpuVideoDecodeAcceleratorHost::AssignPictureBuffers(
+    const std::vector<media::PictureBuffer>& buffers) {
   DCHECK(CalledOnValidThread());
   // Rearrange data for IPC command.
   std::vector<int32> buffer_ids;
   std::vector<uint32> texture_ids;
   std::vector<gfx::Size> sizes;
   for (uint32 i = 0; i < buffers.size(); i++) {
-    const media::GLESBuffer& buffer = buffers[i];
+    const media::PictureBuffer& buffer = buffers[i];
     texture_ids.push_back(buffer.texture_id());
     buffer_ids.push_back(buffer.id());
     sizes.push_back(buffer.size());
   }
-  Send(new AcceleratedVideoDecoderMsg_AssignGLESBuffers(
+  Send(new AcceleratedVideoDecoderMsg_AssignPictureBuffers(
       command_buffer_route_id_, SyncTokens(), buffer_ids, texture_ids, sizes));
 }
 
 void GpuVideoDecodeAcceleratorHost::ReusePictureBuffer(
     int32 picture_buffer_id) {
   DCHECK(CalledOnValidThread());
   Send(new AcceleratedVideoDecoderMsg_ReusePictureBuffer(
       command_buffer_route_id_, SyncTokens(), picture_buffer_id));
 }
 
@@ skipping 27 matching lines @@
 }
 
 void GpuVideoDecodeAcceleratorHost::OnBitstreamBufferProcessed(
     int32 bitstream_buffer_id) {
   DCHECK(CalledOnValidThread());
   client_->NotifyEndOfBitstreamBuffer(bitstream_buffer_id);
 }
 
 void GpuVideoDecodeAcceleratorHost::OnProvidePictureBuffer(
     uint32 num_requested_buffers,
-    const gfx::Size& buffer_size,
-    int32 mem_type) {
+    const gfx::Size& buffer_size) {
   DCHECK(CalledOnValidThread());
-  media::VideoDecodeAccelerator::MemoryType converted_mem_type =
-      static_cast<media::VideoDecodeAccelerator::MemoryType>(mem_type);
-  client_->ProvidePictureBuffers(
-      num_requested_buffers, buffer_size, converted_mem_type);
+  client_->ProvidePictureBuffers(num_requested_buffers, buffer_size);
 }
 
 void GpuVideoDecodeAcceleratorHost::OnDismissPictureBuffer(
     int32 picture_buffer_id) {
   DCHECK(CalledOnValidThread());
   client_->DismissPictureBuffer(picture_buffer_id);
 }
 
 void GpuVideoDecodeAcceleratorHost::OnInitializeDone() {
   DCHECK(CalledOnValidThread());
   client_->NotifyInitializeDone();
 }
 
 void GpuVideoDecodeAcceleratorHost::OnPictureReady(
-    int32 picture_buffer_id, int32 bitstream_buffer_id,
-    const gfx::Size& visible_size, const gfx::Size& decoded_size) {
+    int32 picture_buffer_id, int32 bitstream_buffer_id) {
   DCHECK(CalledOnValidThread());
-  media::Picture picture(
-      picture_buffer_id, bitstream_buffer_id, visible_size, decoded_size);
+  media::Picture picture(picture_buffer_id, bitstream_buffer_id);
   client_->PictureReady(picture);
 }
 
 void GpuVideoDecodeAcceleratorHost::OnFlushDone() {
   DCHECK(CalledOnValidThread());
   client_->NotifyFlushDone();
 }
 
 void GpuVideoDecodeAcceleratorHost::OnResetDone() {
   DCHECK(CalledOnValidThread());
   client_->NotifyResetDone();
 }
 
 void GpuVideoDecodeAcceleratorHost::OnEndOfStream() {
   DCHECK(CalledOnValidThread());
   client_->NotifyEndOfStream();
 }
 
 void GpuVideoDecodeAcceleratorHost::OnErrorNotification(uint32 error) {
   DCHECK(CalledOnValidThread());
   client_->NotifyError(
       static_cast<media::VideoDecodeAccelerator::Error>(error));
 }