| Index: content/browser/renderer_host/media/video_capture_host.h
|
| ===================================================================
|
| --- content/browser/renderer_host/media/video_capture_host.h (revision 106642)
|
| +++ content/browser/renderer_host/media/video_capture_host.h (working copy)
|
| @@ -88,6 +88,12 @@
|
| // between a VideCaptureMessageFilter and a VideoCaptureHost.
|
| void OnStartCapture(int device_id,
|
| const media::VideoCaptureParams& params);
|
| + void OnControllerAdded(
|
| + int device_id, const media::VideoCaptureParams& params,
|
| + VideoCaptureController* controller);
|
| + void DoControllerAddedOnIOThreead(
|
| + int device_id, const media::VideoCaptureParams params,
|
| + VideoCaptureController* controller);
|
|
|
| // IPC message: Stop capture on device referenced by |device_id|.
|
| void OnStopCapture(int device_id);
|
| @@ -125,13 +131,20 @@
|
| // Handle error coming from VideoCaptureDevice.
|
| void DoHandleError(int device_id);
|
|
|
| + // Helpers.
|
| + media_stream::VideoCaptureManager* GetVideoCaptureManager();
|
| +
|
| typedef std::map<VideoCaptureControllerID,
|
| - scoped_refptr<VideoCaptureController> >EntryMap;
|
| -
|
| + scoped_refptr<VideoCaptureController> > EntryMap;
|
| // A map of VideoCaptureControllerID to VideoCaptureController
|
| // objects that is currently active.
|
| EntryMap entries_;
|
|
|
| + typedef std::map<VideoCaptureControllerID,
|
| + media::VideoCapture::State> EntryState;
|
| + // Record state of each VideoCaptureControllerID.
|
| + EntryState entry_state_;
|
| +
|
| // Used to get a pointer to VideoCaptureManager to start/stop capture devices.
|
| const content::ResourceContext* resource_context_;
|
|
|
|
|