Implement IPCs and VideoCapture::Client interfaces for texture capture

content/renderer/media/video_capture_impl.cc

Index: content/renderer/media/video_capture_impl.cc
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index 1912f090abcfc2b529257616e7c8d6c4a049789c..04a6fb45f0b72c2b7c233aca21df0102b97a7323 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -244,14 +244,16 @@ void VideoCaptureImpl::OnBufferDestroyed(int buffer_id) {
   client_buffers_.erase(iter);
 }
 
-void VideoCaptureImpl::OnBufferReceived(
-    int buffer_id,
-    base::TimeTicks timestamp,
-    const media::VideoCaptureFormat& format) {
+void VideoCaptureImpl::OnBufferReceived(int buffer_id,
+                                        const media::VideoCaptureFormat& format,
+                                        base::TimeTicks timestamp) {
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
 
+  // The capture pipeline supports only I420 for now.
+  DCHECK_EQ(format.pixel_format, media::PIXEL_FORMAT_I420);
+
   if (state_ != VIDEO_CAPTURE_STATE_STARTED || suspended_) {
-    Send(new VideoCaptureHostMsg_BufferReady(device_id_, buffer_id));
+    Send(new VideoCaptureHostMsg_BufferReady(device_id_, buffer_id, 0));
     return;
   }
 
@@ -272,12 +274,48 @@ void VideoCaptureImpl::OnBufferReceived(
           buffer->buffer_size,
           buffer->buffer->handle(),
           timestamp - first_frame_timestamp_,
-          media::BindToCurrentLoop(
-              base::Bind(
-                  &VideoCaptureImpl::OnClientBufferFinished,
-                  weak_this_factory_.GetWeakPtr(),
-                  buffer_id,
-                  buffer)));
+          media::BindToCurrentLoop(base::Bind(
+              &VideoCaptureImpl::OnClientBufferFinished,
+              weak_this_factory_.GetWeakPtr(),
+              buffer_id,
+              buffer,
+              base::Passed(scoped_ptr<gpu::MailboxHolder>().Pass()))));

[wjia(left Chromium), 2014/02/19 22:05:19]

extra Pass()?

[sheu, 2014/02/19 23:18:35]

TL;DR: not extraneous :-)

base::Passed() does have overload for the case where you pass it an address-of
scoped_ptr.  But you can't take the address of a temporary, which is what I'm
doing here; hence the explicit Pass().

+
+  for (ClientInfo::iterator it = clients_.begin(); it != clients_.end(); ++it)
+    it->first->OnFrameReady(this, frame);
+}
+
+static void NullReadPixelsCB(const SkBitmap& bitmap) { NOTIMPLEMENTED(); }
+
+void VideoCaptureImpl::OnMailboxBufferReceived(
+    int buffer_id,
+    const gpu::MailboxHolder& mailbox_holder,
+    const media::VideoCaptureFormat& format,
+    base::TimeTicks timestamp) {
+  DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
+
+  if (state_ != VIDEO_CAPTURE_STATE_STARTED || suspended_) {
+    Send(new VideoCaptureHostMsg_BufferReady(
+        device_id_, buffer_id, mailbox_holder.sync_point));
+    return;
+  }
+
+  last_frame_format_ = format;
+  if (first_frame_timestamp_.is_null())
+    first_frame_timestamp_ = timestamp;
+
+  scoped_refptr<media::VideoFrame> frame = media::VideoFrame::WrapNativeTexture(
+      make_scoped_ptr(new gpu::MailboxHolder(mailbox_holder)),
+      media::BindToCurrentLoop(
+          base::Bind(&VideoCaptureImpl::OnClientBufferFinished,
+                     weak_this_factory_.GetWeakPtr(),
+                     buffer_id,
+                     scoped_refptr<ClientBuffer>())),
+      last_frame_format_.frame_size,
+      gfx::Rect(last_frame_format_.frame_size),
+      last_frame_format_.frame_size,
+      timestamp - first_frame_timestamp_,
+      base::Bind(&NullReadPixelsCB));
 
   for (ClientInfo::iterator it = clients_.begin(); it != clients_.end(); ++it)
     it->first->OnFrameReady(this, frame);
@@ -285,9 +323,11 @@ void VideoCaptureImpl::OnBufferReceived(
 
 void VideoCaptureImpl::OnClientBufferFinished(
     int buffer_id,
-    const scoped_refptr<ClientBuffer>& buffer) {
+    const scoped_refptr<ClientBuffer>& /* ignored_buffer */,
+    scoped_ptr<gpu::MailboxHolder> mailbox_holder) {
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
-  Send(new VideoCaptureHostMsg_BufferReady(device_id_, buffer_id));
+  const uint32 sync_point = (mailbox_holder ? mailbox_holder->sync_point : 0);
+  Send(new VideoCaptureHostMsg_BufferReady(device_id_, buffer_id, sync_point));
 }
 
 void VideoCaptureImpl::OnStateChanged(VideoCaptureState state) {