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

Unified Diff: media/capture/video/linux/video_capture_device_factory_linux.h

Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build errors Created 4 years, 5 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: media/capture/video/linux/video_capture_device_factory_linux.h
diff --git a/media/capture/video/linux/video_capture_device_factory_linux.h b/media/capture/video/linux/video_capture_device_factory_linux.h
index 27905209afef47a7c259d84cd773621f0943eaa6..036be89650b0b1cd9bd85e8ef3f366a5cdf1027b 100644
--- a/media/capture/video/linux/video_capture_device_factory_linux.h
+++ b/media/capture/video/linux/video_capture_device_factory_linux.h
@@ -23,14 +23,17 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryLinux
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
~VideoCaptureDeviceFactoryLinux() override;
- std::unique_ptr<VideoCaptureDevice> Create(
- const VideoCaptureDevice::Name& device_name) override;
- void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
- void GetDeviceSupportedFormats(
- const VideoCaptureDevice::Name& device,
+ std::unique_ptr<VideoCaptureDevice> CreateDevice(
+ const VideoCaptureDeviceDescriptor& device_descriptor) override;
+ void GetDeviceDescriptors(
+ VideoCaptureDeviceDescriptors* device_descriptors) override;
+ void GetSupportedFormats(
+ const VideoCaptureDeviceDescriptor& device_descriptor,
VideoCaptureFormats* supported_formats) override;
private:
+ std::string GetDeviceModelId(const std::string& device_id);
+
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryLinux);
};

Powered by Google App Engine
This is Rietveld 408576698