Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(629)

Unified Diff: content/browser/renderer_host/media/video_capture_host.h

Issue 10391065: handle the case when device is closed before media pipeline is fully initialized. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: code review Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/video_capture_host.h
===================================================================
--- content/browser/renderer_host/media/video_capture_host.h (revision 138673)
+++ content/browser/renderer_host/media/video_capture_host.h (working copy)
@@ -78,6 +78,7 @@
int width,
int height,
int frame_per_second) OVERRIDE;
+ virtual void OnPaused(const VideoCaptureControllerID& id) OVERRIDE;
virtual void OnReadyToDelete(const VideoCaptureControllerID& id) OVERRIDE;
private:
@@ -114,29 +115,32 @@
// Called on the IO thread when VideoCaptureController have
// reported that all DIBs have been returned.
- void DoDeleteVideoCaptureController(const VideoCaptureControllerID& id);
+ void DoDeleteVideoCaptureControllerOnIOThread(
+ const VideoCaptureControllerID& id);
// Send a newly created buffer to the VideoCaptureMessageFilter.
- void DoSendNewBuffer(int device_id,
- base::SharedMemoryHandle handle,
- int length,
- int buffer_id);
+ void DoSendNewBufferOnIOThread(int device_id,
+ base::SharedMemoryHandle handle,
+ int length,
+ int buffer_id);
// Send a filled buffer to the VideoCaptureMessageFilter.
- void DoSendFilledBuffer(int device_id,
- int buffer_id,
- base::Time timestamp);
+ void DoSendFilledBufferOnIOThread(int device_id,
+ int buffer_id,
+ base::Time timestamp);
// Send a information about frame resolution and frame rate
// to the VideoCaptureMessageFilter.
- void DoSendFrameInfo(int device_id,
- int width,
- int height,
- int frame_per_second);
+ void DoSendFrameInfoOnIOThread(int device_id,
+ int width,
+ int height,
+ int frame_per_second);
// Handle error coming from VideoCaptureDevice.
- void DoHandleError(int device_id);
+ void DoHandleErrorOnIOThread(int device_id);
+ void DoPausedOnIOThread(int device_id);
+
// Helpers.
media_stream::VideoCaptureManager* GetVideoCaptureManager();

Powered by Google App Engine
This is Rietveld 408576698