Allow rendering from non-stream GL_TEXTURE_EXTERNAL_OES

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 "content/common/gpu/client/gpu_channel_host.h"
@@ skipping 85 matching lines @@
       decoder_route_id_, handle, bitstream_buffer.id(),
       bitstream_buffer.size()));
 }
 
 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::PictureBuffer& buffer = buffers[i];
+    if (buffer.size() != picture_buffer_dimensions_) {
+      OnErrorNotification(INVALID_ARGUMENT);
+      return;
+    }
     texture_ids.push_back(buffer.texture_id());
     buffer_ids.push_back(buffer.id());
-    sizes.push_back(buffer.size());
   }
   Send(new AcceleratedVideoDecoderMsg_AssignPictureBuffers(
-      decoder_route_id_, buffer_ids, texture_ids, sizes));
+      decoder_route_id_, buffer_ids, texture_ids));
 }
 
 void GpuVideoDecodeAcceleratorHost::ReusePictureBuffer(
     int32 picture_buffer_id) {
   DCHECK(CalledOnValidThread());
   Send(new AcceleratedVideoDecoderMsg_ReusePictureBuffer(
       decoder_route_id_, picture_buffer_id));
 }
 
 void GpuVideoDecodeAcceleratorHost::Flush() {
@@ skipping 52 matching lines @@
 
 void GpuVideoDecodeAcceleratorHost::OnBitstreamBufferProcessed(
     int32 bitstream_buffer_id) {
   DCHECK(CalledOnValidThread());
   if (client_)
     client_->NotifyEndOfBitstreamBuffer(bitstream_buffer_id);
 }
 
 void GpuVideoDecodeAcceleratorHost::OnProvidePictureBuffer(
     uint32 num_requested_buffers,
-    const gfx::Size& buffer_size,
+    const gfx::Size& dimensions,
     uint32 texture_target) {
   DCHECK(CalledOnValidThread());
+  picture_buffer_dimensions_ = dimensions;
   if (client_) {
     client_->ProvidePictureBuffers(
-        num_requested_buffers, buffer_size, texture_target);
+        num_requested_buffers, dimensions, texture_target);
   }
 }
 
 void GpuVideoDecodeAcceleratorHost::OnDismissPictureBuffer(
     int32 picture_buffer_id) {
   DCHECK(CalledOnValidThread());
   if (client_)
     client_->DismissPictureBuffer(picture_buffer_id);
 }
 
@@ skipping 25 matching lines @@
 
   // 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