Index: content/renderer/media/rtc_video_capture_delegate.cc |
diff --git a/content/renderer/media/rtc_video_capture_delegate.cc b/content/renderer/media/rtc_video_capture_delegate.cc |
index 842039b71be3b5af3f0fe248dd07464c89b1db5b..25cf621bc8b9eb5271fe2a814982b5c7bf5f58d7 100644 |
--- a/content/renderer/media/rtc_video_capture_delegate.cc |
+++ b/content/renderer/media/rtc_video_capture_delegate.cc |
@@ -82,13 +82,15 @@ void RtcVideoCaptureDelegate::OnRemoved(media::VideoCapture* capture) { |
Release(); |
} |
-void RtcVideoCaptureDelegate::OnBufferReady( |
+void RtcVideoCaptureDelegate::OnFrameReady( |
media::VideoCapture* capture, |
- scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf) { |
+ const scoped_refptr<media::VideoFrame>& frame) { |
message_loop_proxy_->PostTask( |
FROM_HERE, |
- base::Bind(&RtcVideoCaptureDelegate::OnBufferReadyOnCaptureThread, |
- this, capture, buf)); |
+ base::Bind(&RtcVideoCaptureDelegate::OnFrameReadyOnCaptureThread, |
+ this, |
+ capture, |
+ frame)); |
} |
void RtcVideoCaptureDelegate::OnDeviceInfoReceived( |
@@ -103,9 +105,9 @@ void RtcVideoCaptureDelegate::OnDeviceInfoChanged( |
NOTIMPLEMENTED(); |
} |
-void RtcVideoCaptureDelegate::OnBufferReadyOnCaptureThread( |
+void RtcVideoCaptureDelegate::OnFrameReadyOnCaptureThread( |
media::VideoCapture* capture, |
- scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf) { |
+ const scoped_refptr<media::VideoFrame>& frame) { |
if (!captured_callback_.is_null()) { |
if (!got_first_frame_) { |
got_first_frame_ = true; |
@@ -113,9 +115,8 @@ void RtcVideoCaptureDelegate::OnBufferReadyOnCaptureThread( |
state_callback_.Run(CAPTURE_RUNNING); |
} |
- captured_callback_.Run(*buf.get()); |
+ captured_callback_.Run(frame); |
} |
- capture->FeedBuffer(buf); |
} |
void RtcVideoCaptureDelegate::OnErrorOnCaptureThread( |