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 01f117df3bc91733a08bda3e0a4a77967d844be9..f9e4be89150f8706066a47506c474f609ebc26c6 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; |
} |
@@ -280,7 +281,7 @@ void VideoCaptureImpl::OnBufferReceived(int buffer_id, |
weak_factory_.GetWeakPtr(), |
buffer_id, |
buffer, |
- base::Passed(scoped_ptr<gpu::MailboxHolder>().Pass())))); |
+ std::vector<uint32>()))); |
for (ClientInfo::iterator it = clients_.begin(); it != clients_.end(); ++it) |
it->first->OnFrameReady(this, frame); |
@@ -297,7 +298,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; |
} |
@@ -325,10 +326,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) { |