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

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

Issue 17402002: Reconnect support for DirectShow video capture devices in parallel to MediaFoundation ones. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: retry patch Created 7 years, 6 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/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 9177302a92f9528d60da6b6c999c12b5f2b0b4f0..93b426eed257680cbfd6ce902ce8a91e15e79ae0 100644
--- a/media/video/capture/video_capture_device.h
+++ b/media/video/capture/video_capture_device.h
@@ -31,6 +31,22 @@ class MEDIA_EXPORT VideoCaptureDevice {
// Unique name of a device. Even if there are multiple devices with the same
// friendly name connected to the computer this will be unique.
std::string unique_id;
+
+#if defined(OS_WIN)
+ enum CaptureApiType {
+ DIRECT_SHOW,
+ MEDIA_FOUNDATION,
+ };
+ CaptureApiType capture_api_type;
+ // Following operators are needed to call std::list methods merge() and
+ // unique(). These are used when creating the Windows device names list.
+ bool operator==(const Name& other) {
+ return (unique_id == other.unique_id);
+ }
+ bool operator<(const Name& other) {
+ return (unique_id < other.unique_id);
+ }
+#endif //if defined(OS_WIN)
};
typedef std::list<Name> Names;

Powered by Google App Engine
This is Rietveld 408576698