| Index: media/capture/video/win/video_capture_device_factory_win.h
|
| diff --git a/media/capture/video/win/video_capture_device_factory_win.h b/media/capture/video/win/video_capture_device_factory_win.h
|
| index 86477a3040c5d144c769017796ecba526e56c587..f73827a6cbb090068a1577043406d19408271e0b 100644
|
| --- a/media/capture/video/win/video_capture_device_factory_win.h
|
| +++ b/media/capture/video/win/video_capture_device_factory_win.h
|
| @@ -22,14 +22,17 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryWin
|
| VideoCaptureDeviceFactoryWin();
|
| ~VideoCaptureDeviceFactoryWin() 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);
|
| +
|
| // Media Foundation is available in Win7 and later, use it if explicitly
|
| // forced via flag, else use DirectShow.
|
| const bool use_media_foundation_;
|
|
|