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

Unified Diff: media/capture/video/win/video_capture_device_factory_win.h

Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed emircan's comments 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/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_;

Powered by Google App Engine
This is Rietveld 408576698