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

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

Issue 2885653002: [Mojo Video Capture] Do not instantiate in-process VideoCaptureSystem when using service (Closed)
Patch Set: Use SEQUENCE_CHECKER macros and Rebase to May 19th Created 3 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/in_process_video_capture_provider.h
diff --git a/content/browser/renderer_host/media/in_process_video_capture_provider.h b/content/browser/renderer_host/media/in_process_video_capture_provider.h
index 83603438f9751c3497b1e9e27e5b6b3630bae63b..33cb8543990f27577d61771bc70efc151bd9a168 100644
--- a/content/browser/renderer_host/media/in_process_video_capture_provider.h
+++ b/content/browser/renderer_host/media/in_process_video_capture_provider.h
@@ -19,21 +19,31 @@ class CONTENT_EXPORT InProcessVideoCaptureProvider
InProcessVideoCaptureProvider(
std::unique_ptr<media::VideoCaptureSystem> video_capture_system,
scoped_refptr<base::SingleThreadTaskRunner> device_task_runner);
+
~InProcessVideoCaptureProvider() override;
+ static std::unique_ptr<VideoCaptureProvider>
+ CreateInstanceForNonDeviceCapture(
+ scoped_refptr<base::SingleThreadTaskRunner> device_task_runner);
+
+ static std::unique_ptr<VideoCaptureProvider> CreateInstance(
+ std::unique_ptr<media::VideoCaptureSystem> video_capture_system,
+ scoped_refptr<base::SingleThreadTaskRunner> device_task_runner);
+
void Uninitialize() override;
void GetDeviceInfosAsync(
- const base::Callback<void(
- const std::vector<media::VideoCaptureDeviceInfo>&)>& result_callback)
- override;
+ const GetDeviceInfosCallback& result_callback) override;
std::unique_ptr<VideoCaptureDeviceLauncher> CreateDeviceLauncher() override;
private:
+ // Can be nullptr.
const std::unique_ptr<media::VideoCaptureSystem> video_capture_system_;
// The message loop of media stream device thread, where VCD's live.
- scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
+ const scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
+
+ SEQUENCE_CHECKER(sequence_checker_);
};
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698