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

Side by Side Diff: content/common/media/media_devices.cc

Issue 2703393007: Show meaningful name for cameras (Closed)
Patch Set: rebase Created 3 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | extensions/strings/extensions_strings.grd » ('j') | media/capture/video/DEPS » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "media/capture/video/video_capture_device_descriptor.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 MediaDeviceInfo::MediaDeviceInfo() = default; 11 MediaDeviceInfo::MediaDeviceInfo() = default;
12 12
13 MediaDeviceInfo::MediaDeviceInfo(const MediaDeviceInfo& other) = default; 13 MediaDeviceInfo::MediaDeviceInfo(const MediaDeviceInfo& other) = default;
14 14
15 MediaDeviceInfo::MediaDeviceInfo(MediaDeviceInfo&& other) = default; 15 MediaDeviceInfo::MediaDeviceInfo(MediaDeviceInfo&& other) = default;
16 16
17 MediaDeviceInfo::MediaDeviceInfo(const std::string& device_id, 17 MediaDeviceInfo::MediaDeviceInfo(const std::string& device_id,
18 const std::string& label, 18 const std::string& label,
19 const std::string& group_id) 19 const std::string& group_id)
20 : device_id(device_id), label(label), group_id(group_id) {} 20 : device_id(device_id), label(label), group_id(group_id) {}
21 21
22 MediaDeviceInfo::MediaDeviceInfo( 22 MediaDeviceInfo::MediaDeviceInfo(
23 const media::AudioDeviceDescription& device_description) 23 const media::AudioDeviceDescription& device_description)
24 : device_id(device_description.unique_id), 24 : device_id(device_description.unique_id),
25 label(device_description.device_name), 25 label(device_description.device_name),
26 group_id(device_description.group_id) {} 26 group_id(device_description.group_id) {}
27 27
28 MediaDeviceInfo::MediaDeviceInfo( 28 MediaDeviceInfo::MediaDeviceInfo(
29 const media::VideoCaptureDeviceDescriptor& descriptor) 29 const media::VideoCaptureDeviceDescriptor& descriptor)
30 : device_id(descriptor.device_id), label(descriptor.GetNameAndModel()) {} 30 : device_id(descriptor.device_id),
31 label(descriptor.GetHumanReadableName()) {}
31 32
32 MediaDeviceInfo::~MediaDeviceInfo() = default; 33 MediaDeviceInfo::~MediaDeviceInfo() = default;
33 34
34 MediaDeviceInfo& MediaDeviceInfo::operator=(const MediaDeviceInfo& other) = 35 MediaDeviceInfo& MediaDeviceInfo::operator=(const MediaDeviceInfo& other) =
35 default; 36 default;
36 37
37 MediaDeviceInfo& MediaDeviceInfo::operator=(MediaDeviceInfo&& other) = default; 38 MediaDeviceInfo& MediaDeviceInfo::operator=(MediaDeviceInfo&& other) = default;
38 39
39 bool operator==(const MediaDeviceInfo& first, const MediaDeviceInfo& second) { 40 bool operator==(const MediaDeviceInfo& first, const MediaDeviceInfo& second) {
40 return first.device_id == second.device_id && first.label == second.label; 41 return first.device_id == second.device_id && first.label == second.label;
41 } 42 }
42 43
43 } // namespace content 44 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | extensions/strings/extensions_strings.grd » ('j') | media/capture/video/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698