media: Let VideoFrame carry more than one native texture.

content/browser/renderer_host/media/video_capture_device_client.cc

Index: content/browser/renderer_host/media/video_capture_device_client.cc
diff --git a/content/browser/renderer_host/media/video_capture_device_client.cc b/content/browser/renderer_host/media/video_capture_device_client.cc
index 3fdbca2279847bcc186e08b42b89eda43bfdd9b8..9f211042915c8c55d68fd84f54092032d9859c49 100644
--- a/content/browser/renderer_host/media/video_capture_device_client.cc
+++ b/content/browser/renderer_host/media/video_capture_device_client.cc
@@ -243,9 +243,8 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
     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;
   }
@@ -549,25 +548,21 @@ VideoCaptureDeviceClient::TextureWrapHelper::OnIncomingCapturedGpuMemoryBuffer(
     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);