| 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);
|
| };
|
|
|