Index: content/common/media/media_devices.h |
diff --git a/content/common/media/media_devices.h b/content/common/media/media_devices.h |
index 6ac1e2c5d7e5de67e65b00002ac59b7cb7a59ed9..c460f4da6eede02eb3cfe07d36664c0f6ffd0b5c 100644 |
--- a/content/common/media/media_devices.h |
+++ b/content/common/media/media_devices.h |
@@ -12,6 +12,7 @@ |
namespace media { |
struct AudioDeviceDescription; |
+struct VideoCaptureDeviceDescriptor; |
} |
namespace content { |
@@ -24,16 +25,22 @@ enum MediaDeviceType { |
}; |
struct CONTENT_EXPORT MediaDeviceInfo { |
- MediaDeviceInfo() = default; |
+ MediaDeviceInfo(); |
+ MediaDeviceInfo(const MediaDeviceInfo& other); |
jochen (gone - plz use gerrit)
2017/01/12 11:54:42
why do you need the copy ctor here?
shenghao
2017/01/13 11:09:34
Required by chromium trybot checks. A complex clas
|
+ ~MediaDeviceInfo(); |
MediaDeviceInfo(const std::string& device_id, |
const std::string& label, |
const std::string& group_id); |
jochen (gone - plz use gerrit)
2017/01/12 11:54:42
this should also take the model_id
shenghao
2017/01/13 11:09:34
Not every media device has model_id. Ex. Audio dev
|
explicit MediaDeviceInfo( |
const media::AudioDeviceDescription& device_description); |
+ explicit MediaDeviceInfo( |
+ const media::VideoCaptureDeviceDescriptor& descriptor); |
std::string device_id; |
std::string label; |
std::string group_id; |
+ // Format is "vid:pid". Ex. "E2A1:34D0". |
+ std::string model_id; |
}; |
using MediaDeviceInfoArray = std::vector<MediaDeviceInfo>; |