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

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

Issue 2729783003: [Mojo Video Capture] Add content_browsertest for exercising video capture (Closed)
Patch Set: incorporated miu@'s suggestions Created 3 years, 9 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_manager.h
diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index 56300ff10f9f57a27bce21ac60e17938eda3d1bf..7aa6b59e98f0beef2917083e18df58f9241a2390 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -68,8 +68,8 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
// Implements MediaStreamProvider.
void RegisterListener(MediaStreamProviderListener* listener) override;
- void UnregisterListener() override;
- int Open(const StreamDeviceInfo& device) override;
+ void UnregisterListener(MediaStreamProviderListener* listener) override;
+ int Open(const MediaStreamDevice& device) override;
void Close(int capture_session_id) override;
// Called by VideoCaptureHost to locate a capture device for |capture_params|,
@@ -83,7 +83,8 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
//
// On success, the controller is returned via calling |done_cb|, indicating
// that the client was successfully added. A NULL controller is passed to
- // the callback on failure.
+ // the callback on failure. |done_cb| is not allowed to synchronously call
+ // StopCaptureForClient().
void StartCaptureForClient(media::VideoCaptureSessionId session_id,
const media::VideoCaptureParams& capture_params,
VideoCaptureControllerID client_id,
@@ -326,7 +327,7 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
// Only accessed on Browser::IO thread.
- MediaStreamProviderListener* listener_;
+ base::ObserverList<MediaStreamProviderListener> listeners_;
media::VideoCaptureSessionId new_capture_session_id_;
// An entry is kept in this map for every session that has been created via

Powered by Google App Engine
This is Rietveld 408576698