| 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;
|
|
|
|
|