OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/common/media/media_devices.h" | 5 #include "content/common/media/media_devices.h" |
6 #include "media/audio/audio_device_description.h" | 6 #include "media/audio/audio_device_description.h" |
| 7 #include "media/capture/video/video_capture_device_descriptor.h" |
7 | 8 |
8 namespace content { | 9 namespace content { |
9 | 10 |
10 MediaDeviceInfo::MediaDeviceInfo(const std::string& device_id, | 11 MediaDeviceInfo::MediaDeviceInfo(const std::string& device_id, |
11 const std::string& label, | 12 const std::string& label, |
12 const std::string& group_id) | 13 const std::string& group_id) |
13 : device_id(device_id), label(label), group_id(group_id) {} | 14 : device_id(device_id), label(label), group_id(group_id) {} |
14 | 15 |
15 MediaDeviceInfo::MediaDeviceInfo( | 16 MediaDeviceInfo::MediaDeviceInfo( |
16 const media::AudioDeviceDescription& device_description) | 17 const media::AudioDeviceDescription& device_description) |
17 : device_id(device_description.unique_id), | 18 : device_id(device_description.unique_id), |
18 label(device_description.device_name), | 19 label(device_description.device_name), |
19 group_id(device_description.group_id) {} | 20 group_id(device_description.group_id) {} |
20 | 21 |
| 22 MediaDeviceInfo::MediaDeviceInfo( |
| 23 const media::VideoCaptureDeviceDescriptor& descriptor) |
| 24 : device_id(descriptor.device_id), |
| 25 label(descriptor.GetNameAndModel()), |
| 26 model_id(descriptor.model_id) {} |
| 27 |
21 bool operator==(const MediaDeviceInfo& first, const MediaDeviceInfo& second) { | 28 bool operator==(const MediaDeviceInfo& first, const MediaDeviceInfo& second) { |
22 return first.device_id == second.device_id && first.label == second.label; | 29 return first.device_id == second.device_id && first.label == second.label; |
23 } | 30 } |
24 | 31 |
25 } // namespace content | 32 } // namespace content |
OLD | NEW |