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

Unified Diff: media/video/capture/video_capture_device.h

Issue 517273004: Win Video Capture: add DirectShow WDM devices capabilities enumeration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 3 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
« no previous file with comments | « no previous file | media/video/capture/video_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/video_capture_device.h
diff --git a/media/video/capture/video_capture_device.h b/media/video/capture/video_capture_device.h
index 382dad6cdc461d7d6d20bf04ab8e7e91693ae503..901d57426ac544a63b84b5cd2f5205fbb5fc9816 100644
--- a/media/video/capture/video_capture_device.h
+++ b/media/video/capture/video_capture_device.h
@@ -46,7 +46,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
enum CaptureApiType {
MEDIA_FOUNDATION,
DIRECT_SHOW,
- DIRECT_SHOW_WDM,
+ DIRECT_SHOW_WDM_CROSSBAR,
API_TYPE_UNKNOWN
};
#endif
@@ -106,6 +106,16 @@ class MEDIA_EXPORT VideoCaptureDevice {
return capture_api_class_.capture_api_type();
}
#endif
+#if defined(OS_WIN)
+ // Certain devices need an ID different from the |unique_id_| for
+ // capabilities retrieval.
+ const std::string& capabilities_id() const {
+ return capabilities_id_;
+ }
+ void set_capabilities_id(const std::string& id) {
+ capabilities_id_ = id;
+ }
+#endif
#if defined(OS_MACOSX)
TransportType transport_type() const {
return transport_type_;
@@ -139,6 +149,10 @@ class MEDIA_EXPORT VideoCaptureDevice {
CaptureApiClass capture_api_class_;
#endif
+#if defined(OS_WIN)
+ // ID used for capabilities retrieval. By default is equal to |unique_id|.
+ std::string capabilities_id_;
+#endif
#if defined(OS_MACOSX)
TransportType transport_type_;
// Flag used to mark blacklisted devices for QTKit Api.
« no previous file with comments | « no previous file | media/video/capture/video_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698