Allow multiple texture ids per picture buffer.

content/common/gpu/client/gpu_video_decode_accelerator_host.cc

 // Copyright (c) 2012 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/common/gpu/client/gpu_video_decode_accelerator_host.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 117 matching lines @@
       new AcceleratedVideoDecoderMsg_Decode(decoder_route_id_, buffer_to_send));
 }
 
 void GpuVideoDecodeAcceleratorHost::AssignPictureBuffers(
     const std::vector<media::PictureBuffer>& buffers) {
   DCHECK(CalledOnValidThread());
   if (!channel_)
     return;
   // Rearrange data for IPC command.
   std::vector<int32_t> buffer_ids;
-  std::vector<uint32_t> texture_ids;
+  std::vector<media::PictureBuffer::TextureIds> texture_ids;
   for (uint32_t i = 0; i < buffers.size(); i++) {
     const media::PictureBuffer& buffer = buffers[i];
     if (buffer.size() != picture_buffer_dimensions_) {
       DLOG(ERROR) << "buffer.size() invalid: expected "
                   << picture_buffer_dimensions_.ToString()
                   << ", got " << buffer.size().ToString();
       PostNotifyError(INVALID_ARGUMENT);
       return;
     }
-    texture_ids.push_back(buffer.texture_id());
+    texture_ids.push_back(buffer.texture_ids());
     buffer_ids.push_back(buffer.id());
   }
   Send(new AcceleratedVideoDecoderMsg_AssignPictureBuffers(
       decoder_route_id_, buffer_ids, texture_ids));
 }
 
 void GpuVideoDecodeAcceleratorHost::ReusePictureBuffer(
     int32_t picture_buffer_id) {
   DCHECK(CalledOnValidThread());
   if (!channel_)
@@ skipping 57 matching lines @@
 
 void GpuVideoDecodeAcceleratorHost::OnBitstreamBufferProcessed(
     int32_t bitstream_buffer_id) {
   DCHECK(CalledOnValidThread());
   if (client_)
     client_->NotifyEndOfBitstreamBuffer(bitstream_buffer_id);
 }
 
 void GpuVideoDecodeAcceleratorHost::OnProvidePictureBuffer(
     uint32_t num_requested_buffers,
+    uint32_t textures_per_buffer,
     const gfx::Size& dimensions,
     uint32_t texture_target) {
   DCHECK(CalledOnValidThread());
   picture_buffer_dimensions_ = dimensions;
+
+  const int kMaxVideoPlanes = 4;
+  if (textures_per_buffer > kMaxVideoPlanes) {
+    PostNotifyError(PLATFORM_FAILURE);
+    return;
+  }
+
   if (client_) {
-    client_->ProvidePictureBuffers(
-        num_requested_buffers, dimensions, texture_target);
+    client_->ProvidePictureBuffers(num_requested_buffers, textures_per_buffer,
+                                   dimensions, texture_target);
   }
 }
 
 void GpuVideoDecodeAcceleratorHost::OnDismissPictureBuffer(
     int32_t picture_buffer_id) {
   DCHECK(CalledOnValidThread());
   if (client_)
     client_->DismissPictureBuffer(picture_buffer_id);
 }
 
@@ skipping 31 matching lines @@
   weak_this_factory_.InvalidateWeakPtrs();
 
   // Client::NotifyError() may Destroy() |this|, so calling it needs to be the
   // last thing done on this stack!
   media::VideoDecodeAccelerator::Client* client = NULL;
   std::swap(client, client_);
   client->NotifyError(static_cast<media::VideoDecodeAccelerator::Error>(error));
 }
 
 }  // namespace content