| Index: content/browser/renderer_host/media/video_capture_host.h
|
| diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h
|
| index 1094c7a5825087dc17f8936f50074f6f580c3c95..89dd1d64ed1d68fc72cd3cf8143fff8dcc38084f 100644
|
| --- a/content/browser/renderer_host/media/video_capture_host.h
|
| +++ b/content/browser/renderer_host/media/video_capture_host.h
|
| @@ -140,7 +140,7 @@ class CONTENT_EXPORT VideoCaptureHost
|
| int device_id,
|
| media::VideoCaptureSessionId capture_session_id);
|
|
|
| - // Send a newly created buffer to the VideoCaptureMessageFilter.
|
| + // Sends a newly created buffer to the VideoCaptureMessageFilter.
|
| void DoSendNewBufferOnIOThread(
|
| const VideoCaptureControllerID& controller_id,
|
| base::SharedMemoryHandle handle,
|
| @@ -151,14 +151,14 @@ class CONTENT_EXPORT VideoCaptureHost
|
| const VideoCaptureControllerID& controller_id,
|
| int buffer_id);
|
|
|
| - // Send a filled buffer to the VideoCaptureMessageFilter.
|
| + // Sends a filled buffer to the VideoCaptureMessageFilter.
|
| void DoSendFilledBufferOnIOThread(
|
| const VideoCaptureControllerID& controller_id,
|
| int buffer_id,
|
| const media::VideoCaptureFormat& format,
|
| base::TimeTicks timestamp);
|
|
|
| - // Send a filled texture mailbox buffer to the VideoCaptureMessageFilter.
|
| + // Sends a filled texture mailbox buffer to the VideoCaptureMessageFilter.
|
| void DoSendFilledMailboxBufferOnIOThread(
|
| const VideoCaptureControllerID& controller_id,
|
| int buffer_id,
|
| @@ -166,13 +166,15 @@ class CONTENT_EXPORT VideoCaptureHost
|
| const media::VideoCaptureFormat& format,
|
| base::TimeTicks timestamp);
|
|
|
| - // Handle error coming from VideoCaptureDevice.
|
| + // Handles error coming from VideoCaptureDevice.
|
| void DoHandleErrorOnIOThread(const VideoCaptureControllerID& controller_id);
|
|
|
| void DoEndedOnIOThread(const VideoCaptureControllerID& controller_id);
|
|
|
| + // Deletes the controller and notifies the VideoCaptureManager. |on_error| is
|
| + // true if this is triggered by VideoCaptureControllerEventHandler::OnError.
|
| void DeleteVideoCaptureControllerOnIOThread(
|
| - const VideoCaptureControllerID& controller_id);
|
| + const VideoCaptureControllerID& controller_id, bool on_error);
|
|
|
| MediaStreamManager* media_stream_manager_;
|
|
|
|
|