Index: content/browser/renderer_host/media/video_capture_controller.h |
diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h |
index 9eed94ddb551d27c7726d08cc5a20e1a98bfc16e..47c37703245b8330b4c08e879b0a8465c9e24119 100644 |
--- a/content/browser/renderer_host/media/video_capture_controller.h |
+++ b/content/browser/renderer_host/media/video_capture_controller.h |
@@ -102,7 +102,8 @@ class CONTENT_EXPORT VideoCaptureController { |
// VideoCaptureControllerEventHandler::OnBufferReady. |
void ReturnBuffer(const VideoCaptureControllerID& id, |
VideoCaptureControllerEventHandler* event_handler, |
- int buffer_id); |
+ int buffer_id, |
+ uint32 sync_point); |
mcasas
2014/01/21 14:34:02
There's no explanation in struct MailboxHolder abo
sheu
2014/01/29 01:19:20
Done.
|
const media::VideoCaptureFormat& GetVideoCaptureFormat() const; |
@@ -113,10 +114,10 @@ class CONTENT_EXPORT VideoCaptureController { |
typedef std::list<ControllerClient*> ControllerClients; |
// Worker functions on IO thread. Called by the VideoCaptureDeviceClient. |
- void DoIncomingCapturedI420BufferOnIOThread( |
- scoped_refptr<media::VideoCaptureDevice::Client::Buffer> buffer, |
- const gfx::Size& dimensions, |
- int frame_rate, |
+ void DoIncomingCapturedVideoFrameOnIOThread( |
+ const scoped_refptr<media::VideoCaptureDevice::Client::Buffer>& buffer, |
+ const media::VideoCaptureFormat& format, |
+ const scoped_refptr<media::VideoFrame>& frame, |
base::TimeTicks timestamp); |
void DoErrorOnIOThread(); |
void DoDeviceStoppedOnIOThread(); |