| 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 9688b464680fb8271cbec4a7882ef16391324f5d..77d9ac1fcee556fa3f8c12aabf6e6a93708cd432 100644
|
| --- a/content/renderer/media/video_capture_impl.cc
|
| +++ b/content/renderer/media/video_capture_impl.cc
|
| @@ -258,8 +258,6 @@ void VideoCaptureImpl::OnBufferReceived(int buffer_id,
|
| }
|
| }
|
|
|
| -static void NullReadPixelsCB(const SkBitmap& bitmap) { NOTIMPLEMENTED(); }
|
| -
|
| void VideoCaptureImpl::OnMailboxBufferReceived(
|
| int buffer_id,
|
| const gpu::MailboxHolder& mailbox_holder,
|
| @@ -278,16 +276,11 @@ void VideoCaptureImpl::OnMailboxBufferReceived(
|
|
|
| scoped_refptr<media::VideoFrame> frame = media::VideoFrame::WrapNativeTexture(
|
| make_scoped_ptr(new gpu::MailboxHolder(mailbox_holder)),
|
| - media::BindToCurrentLoop(
|
| - base::Bind(&VideoCaptureImpl::OnClientBufferFinished,
|
| - weak_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));
|
| + media::BindToCurrentLoop(base::Bind(
|
| + &VideoCaptureImpl::OnClientBufferFinished, weak_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_);
|
|
|
| for (ClientInfoMap::iterator it = clients_.begin(); it != clients_.end();
|
| ++it) {
|
|
|