media: Let VideoFrame carry more than one native texture.

content/browser/renderer_host/media/video_capture_device_client.cc

 // Copyright 2015 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/browser/renderer_host/media/video_capture_device_client.h"
 
 #include "base/bind.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/compositor/image_transport_factory.h"
@@ skipping 225 matching lines @@
       << " Rotation must be a multiple of 90, now: " << rotation;
   libyuv::RotationMode rotation_mode = libyuv::kRotate0;
   if (rotation == 90)
     rotation_mode = libyuv::kRotate90;
   else if (rotation == 180)
     rotation_mode = libyuv::kRotate180;
   else if (rotation == 270)
     rotation_mode = libyuv::kRotate270;
 
   const gfx::Size dimensions(destination_width, destination_height);
-  if (!VideoFrame::IsValidConfig(VideoFrame::I420,
-                                 dimensions,
-                                 gfx::Rect(dimensions),
+  if (!VideoFrame::IsValidConfig(VideoFrame::I420, VideoFrame::TEXTURE_NONE,
+                                 dimensions, gfx::Rect(dimensions),
                                  dimensions)) {
     return;
   }
 
   scoped_ptr<Buffer> buffer(
       ReserveOutputBuffer(media::PIXEL_FORMAT_I420, dimensions));
   if (!buffer.get())
     return;
 
   uint8* const yplane = reinterpret_cast<uint8*>(buffer->data());
@@ skipping 283 matching lines @@
                                             GL_BGRA_EXT);
   DCHECK(image_id);
 
   GLuint texture_id = gl_helper_->CreateTexture();
   DCHECK(texture_id);
   {
     content::ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(gl, texture_id);
     gl->BindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id);
   }
 
-  scoped_ptr<gpu::MailboxHolder> mailbox_holder(new gpu::MailboxHolder(
-      gl_helper_->ProduceMailboxHolderFromTexture(texture_id)));
-  DCHECK(!mailbox_holder->mailbox.IsZero());
-  DCHECK(mailbox_holder->mailbox.Verify());
-  DCHECK(mailbox_holder->texture_target);
-  DCHECK(mailbox_holder->sync_point);
+  const gpu::MailboxHolder& mailbox_holder(
+      gl_helper_->ProduceMailboxHolderFromTexture(texture_id));
+  DCHECK(!mailbox_holder.mailbox.IsZero());
+  DCHECK(mailbox_holder.mailbox.Verify());
+  DCHECK(mailbox_holder.texture_target);
+  DCHECK(mailbox_holder.sync_point);
 
   scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::WrapNativeTexture(
-          mailbox_holder.Pass(),
-          media::BindToCurrentLoop(
-              base::Bind(&VideoCaptureDeviceClient::TextureWrapHelper::
-                             ReleaseCallback,
-                         this, image_id, texture_id)),
-          frame_format.frame_size,
-          gfx::Rect(frame_format.frame_size),
-          frame_format.frame_size,
-          base::TimeDelta(),
-          true /* allow_overlay */);
+          mailbox_holder,
+          media::BindToCurrentLoop(base::Bind(
+              &VideoCaptureDeviceClient::TextureWrapHelper::ReleaseCallback,
+              this, image_id, texture_id)),
+          frame_format.frame_size, gfx::Rect(frame_format.frame_size),
+          frame_format.frame_size, base::TimeDelta(), true /* allow_overlay */);
   video_frame->metadata()->SetDouble(media::VideoFrameMetadata::FRAME_RATE,
                                      frame_format.frame_rate);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread,
           controller_, base::Passed(&buffer), video_frame, timestamp));
 }
 
@@ skipping 83 matching lines @@
 void VideoCaptureDeviceClient::TextureWrapHelper::OnError(
     const std::string& message) {
   DCHECK(capture_task_runner_->BelongsToCurrentThread());
   DLOG(ERROR) << message;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureController::DoErrorOnIOThread, controller_));
 }
 
 }  // namespace content