diff options
Diffstat (limited to 'chromium/media/video/capture/video_capture_proxy.h')
| -rw-r--r-- | chromium/media/video/capture/video_capture_proxy.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/chromium/media/video/capture/video_capture_proxy.h b/chromium/media/video/capture/video_capture_proxy.h index 78c459d1849..fbb75776abe 100644 --- a/chromium/media/video/capture/video_capture_proxy.h +++ b/chromium/media/video/capture/video_capture_proxy.h @@ -50,9 +50,8 @@ class MEDIA_EXPORT VideoCaptureHandlerProxy virtual void OnPaused(VideoCapture* capture) OVERRIDE; virtual void OnError(VideoCapture* capture, int error_code) OVERRIDE; virtual void OnRemoved(VideoCapture* capture) OVERRIDE; - virtual void OnBufferReady( - VideoCapture* capture, - scoped_refptr<VideoCapture::VideoFrameBuffer> buffer) OVERRIDE; + virtual void OnFrameReady(VideoCapture* capture, + const scoped_refptr<VideoFrame>& frame) OVERRIDE; virtual void OnDeviceInfoReceived( VideoCapture* capture, const VideoCaptureParams& device_info) OVERRIDE; @@ -75,14 +74,12 @@ class MEDIA_EXPORT VideoCaptureHandlerProxy void OnRemovedOnMainThread( VideoCapture* capture, const VideoCaptureState& state); - void OnBufferReadyOnMainThread( - VideoCapture* capture, - const VideoCaptureState& state, - scoped_refptr<VideoCapture::VideoFrameBuffer> buffer); - void OnDeviceInfoReceivedOnMainThread( - VideoCapture* capture, - const VideoCaptureState& state, - const VideoCaptureParams& device_info); + void OnFrameReadyOnMainThread(VideoCapture* capture, + const VideoCaptureState& state, + const scoped_refptr<VideoFrame>& frame); + void OnDeviceInfoReceivedOnMainThread(VideoCapture* capture, + const VideoCaptureState& state, + const VideoCaptureParams& device_info); // Only accessed from main thread. VideoCapture::EventHandler* proxied_; |