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

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

Issue 2769543002: [Mojo Video Capture] Introduce abstraction VideoCaptureSystem (Closed)
Patch Set: Incorporated suggestions from PatchSet 5 Created 3 years, 8 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_buildable_video_capture_device.h
diff --git a/content/browser/renderer_host/media/in_process_buildable_video_capture_device.h b/content/browser/renderer_host/media/in_process_buildable_video_capture_device.h
index b7c563982c4fe8476623f2a341e6656da6e499b9..a4cdfede7faa69b0f27143b81548a80cf3dc691b 100644
--- a/content/browser/renderer_host/media/in_process_buildable_video_capture_device.h
+++ b/content/browser/renderer_host/media/in_process_buildable_video_capture_device.h
@@ -10,7 +10,7 @@
#include "media/capture/video/video_capture_device.h"
#include "media/capture/video/video_capture_device_client.h"
#include "media/capture/video/video_capture_device_descriptor.h"
-#include "media/capture/video/video_capture_device_factory.h"
+#include "media/capture/video/video_capture_system.h"
namespace content {
@@ -23,7 +23,7 @@ class InProcessBuildableVideoCaptureDevice
public:
InProcessBuildableVideoCaptureDevice(
scoped_refptr<base::SingleThreadTaskRunner> device_task_runner,
- media::VideoCaptureDeviceFactory* device_factory);
+ media::VideoCaptureSystem* video_capture_system);
~InProcessBuildableVideoCaptureDevice() override;
// BuildableVideoCaptureDevice implementation:
@@ -70,7 +70,7 @@ class InProcessBuildableVideoCaptureDevice
std::unique_ptr<media::VideoCaptureDevice> device);
void DoStartDeviceCaptureOnDeviceThread(
- const media::VideoCaptureDeviceDescriptor& descriptor,
+ const std::string& device_id,
const media::VideoCaptureParams& params,
std::unique_ptr<media::VideoCaptureDeviceClient> client,
ReceiveDeviceCallback result_callback);
@@ -93,7 +93,7 @@ class InProcessBuildableVideoCaptureDevice
base::OnceClosure done_cb);
const scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
- media::VideoCaptureDeviceFactory* const device_factory_;
+ media::VideoCaptureSystem* const video_capture_system_;
std::unique_ptr<media::VideoCaptureDevice> device_;
State state_ = State::NO_DEVICE;
};

Powered by Google App Engine
This is Rietveld 408576698