HW Video: Make media::VideoFrame handle the sync point of the compositor as well as webgl

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 b9a61f3d05b4db4a0b24afebb01adde58acd056a..80a403ec2ad1c18e8b150dba0a188040155c0730 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -254,7 +254,8 @@ void VideoCaptureImpl::OnBufferReceived(int buffer_id,
   DCHECK_EQ(format.pixel_format, media::PIXEL_FORMAT_I420);
 
   if (state_ != VIDEO_CAPTURE_STATE_STARTED || suspended_) {
-    Send(new VideoCaptureHostMsg_BufferReady(device_id_, buffer_id, 0));
+    Send(new VideoCaptureHostMsg_BufferReady(
+        device_id_, buffer_id, std::vector<uint32>()));
     return;
   }
 
@@ -282,12 +283,12 @@ void VideoCaptureImpl::OnBufferReceived(int buffer_id,
           buffer->buffer_size,
           buffer->buffer->handle(),
           timestamp - first_frame_timestamp_,
-          media::BindToCurrentLoop(base::Bind(
-              &VideoCaptureImpl::OnClientBufferFinished,
-              weak_factory_.GetWeakPtr(),
-              buffer_id,
-              buffer,
-              base::Passed(scoped_ptr<gpu::MailboxHolder>().Pass()))));
+          media::BindToCurrentLoop(
+              base::Bind(&VideoCaptureImpl::OnClientBufferFinished,
+                         weak_factory_.GetWeakPtr(),
+                         buffer_id,
+                         buffer,
+                         std::vector<uint32>())));
 
   for (ClientInfo::iterator it = clients_.begin(); it != clients_.end(); ++it)
     it->first->OnFrameReady(this, frame);
@@ -304,7 +305,7 @@ void VideoCaptureImpl::OnMailboxBufferReceived(
 
   if (state_ != VIDEO_CAPTURE_STATE_STARTED || suspended_) {
     Send(new VideoCaptureHostMsg_BufferReady(
-        device_id_, buffer_id, mailbox_holder.sync_point));
+        device_id_, buffer_id, std::vector<uint32>()));
     return;
   }
 
@@ -332,10 +333,10 @@ void VideoCaptureImpl::OnMailboxBufferReceived(
 void VideoCaptureImpl::OnClientBufferFinished(
     int buffer_id,
     const scoped_refptr<ClientBuffer>& /* ignored_buffer */,
-    scoped_ptr<gpu::MailboxHolder> mailbox_holder) {
+    const std::vector<uint32>& release_sync_points) {
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
-  const uint32 sync_point = (mailbox_holder ? mailbox_holder->sync_point : 0);
-  Send(new VideoCaptureHostMsg_BufferReady(device_id_, buffer_id, sync_point));
+  Send(new VideoCaptureHostMsg_BufferReady(
+      device_id_, buffer_id, release_sync_points));
 }
 
 void VideoCaptureImpl::OnStateChanged(VideoCaptureState state) {