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

Unified Diff: services/video_capture/device_factory_media_to_mojo_adapter.h

Issue 2818513003: [Mojo Video Capture] Adapt video_capture service to refactored video capture stack (Closed)
Patch Set: Fix compile errors 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
« no previous file with comments | « services/video_capture/BUILD.gn ('k') | services/video_capture/device_factory_media_to_mojo_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/video_capture/device_factory_media_to_mojo_adapter.h
diff --git a/services/video_capture/device_factory_media_to_mojo_adapter.h b/services/video_capture/device_factory_media_to_mojo_adapter.h
index 1eb16054097c632f78a43efbf90400d32ed8a36b..6c10ff70dfd4359be006234ae1f5406d1b39a182 100644
--- a/services/video_capture/device_factory_media_to_mojo_adapter.h
+++ b/services/video_capture/device_factory_media_to_mojo_adapter.h
@@ -8,7 +8,7 @@
#include <map>
#include "media/capture/video/video_capture_device_client.h"
-#include "media/capture/video/video_capture_device_factory.h"
+#include "media/capture/video/video_capture_system.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/video_capture/public/interfaces/device_factory.mojom.h"
@@ -16,15 +16,14 @@ namespace video_capture {
class DeviceMediaToMojoAdapter;
-// Wraps a media::VideoCaptureDeviceFactory and exposes its functionality
-// through the mojom::DeviceFactory interface.
-// Keeps track of device instances that have been created to ensure that
-// it does not create more than one instance of the same
-// media::VideoCaptureDevice at the same time.
+// Wraps a media::VideoCaptureSystem and exposes its functionality through the
+// mojom::DeviceFactory interface. Keeps track of device instances that have
+// been created to ensure that it does not create more than one instance of the
+// same media::VideoCaptureDevice at the same time.
class DeviceFactoryMediaToMojoAdapter : public mojom::DeviceFactory {
public:
DeviceFactoryMediaToMojoAdapter(
- std::unique_ptr<media::VideoCaptureDeviceFactory> device_factory,
+ std::unique_ptr<media::VideoCaptureSystem> capture_system,
const media::VideoCaptureJpegDecoderFactoryCB&
jpeg_decoder_factory_callback);
~DeviceFactoryMediaToMojoAdapter() override;
@@ -51,11 +50,7 @@ class DeviceFactoryMediaToMojoAdapter : public mojom::DeviceFactory {
void OnClientConnectionErrorOrClose(const std::string& device_id);
- // Returns false if no descriptor found.
- bool LookupDescriptorFromId(const std::string& device_id,
- media::VideoCaptureDeviceDescriptor* descriptor);
-
- const std::unique_ptr<media::VideoCaptureDeviceFactory> device_factory_;
+ const std::unique_ptr<media::VideoCaptureSystem> capture_system_;
const media::VideoCaptureJpegDecoderFactoryCB jpeg_decoder_factory_callback_;
std::map<std::string, ActiveDeviceEntry> active_devices_by_id_;
};
« no previous file with comments | « services/video_capture/BUILD.gn ('k') | services/video_capture/device_factory_media_to_mojo_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698