| 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..3438d9fef6fa1dccd8888852610d11caa3588ff3 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,21 @@ enum MediaDeviceType {
|
| };
|
|
|
| struct CONTENT_EXPORT MediaDeviceInfo {
|
| - MediaDeviceInfo() = default;
|
| + MediaDeviceInfo();
|
| + ~MediaDeviceInfo();
|
| MediaDeviceInfo(const std::string& device_id,
|
| const std::string& label,
|
| const std::string& group_id);
|
| 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>;
|
|
|