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..a1fc57b72df937cb0c32aa3102d44263d3f1d3cd 100644 |
--- a/content/browser/renderer_host/media/video_capture_controller.h |
+++ b/content/browser/renderer_host/media/video_capture_controller.h |
@@ -98,11 +98,14 @@ class CONTENT_EXPORT VideoCaptureController { |
// prematurely closed. |
void StopSession(int session_id); |
- // Return a buffer previously given in |
- // VideoCaptureControllerEventHandler::OnBufferReady. |
+ // Return a buffer with id |buffer_id| previously given in |
+ // VideoCaptureControllerEventHandler::OnBufferReady. In the case that the |
+ // buffer was backed by a texture, |sync_point| will be waited on before |
+ // destroying or recycling the texture. |
jiayl
2014/01/31 19:32:39
The use of |sync_point| still seems unclear to som
sheu
2014/02/07 00:37:25
Syncpoints are used for cross-process/cross-contex
jiayl
2014/02/07 01:22:08
Is it possible to add a link in the comment to pro
sheu
2014/02/14 01:59:29
Honestly, I think that the syncpoint mechanism sho
jiayl
2014/02/14 17:39:44
But the code will be read, used, and maintained by
sheu
2014/02/14 20:23:19
I'm sorry if I sound a little obstinate or obstruc
|
void ReturnBuffer(const VideoCaptureControllerID& id, |
VideoCaptureControllerEventHandler* event_handler, |
- int buffer_id); |
+ int buffer_id, |
+ uint32 sync_point); |
const media::VideoCaptureFormat& GetVideoCaptureFormat() const; |
@@ -113,10 +116,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(); |