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..81327b1207697e5676aff0b183cef97dadae8638 100644 |
--- a/media/capture/video/win/video_capture_device_factory_win.h |
+++ b/media/capture/video/win/video_capture_device_factory_win.h |
@@ -23,13 +23,20 @@ class CAPTURE_EXPORT 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, |
- VideoCaptureFormats* supported_formats) override; |
+ const VideoCaptureDeviceDescriptor& device_descriptor) override; |
+ void GetDeviceDescriptors( |
+ VideoCaptureDeviceDescriptors* device_descriptors) override; |
+ void GetDeviceInfo(const VideoCaptureDeviceDescriptor& device_descriptor, |
+ VideoCaptureDeviceInfo* device_info) override; |
private: |
+ void GetDeviceSupportedFormats( |
+ const VideoCaptureDeviceDescriptor& device_descriptor, |
+ VideoCaptureFormats* supported_formats); |
+ |
+ std::string GetDeviceModelId( |
+ const VideoCaptureDeviceDescriptor& device_descriptor); |
+ |
// Media Foundation is available in Win7 and later, use it if explicitly |
// forced via flag, else use DirectShow. |
const bool use_media_foundation_; |