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

Side by Side Diff: Source/modules/mediastream/MediaDeviceInfo.cpp

Issue 145583015: MediaStream API: Implement Navigator.getMediaDevices Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "modules/mediastream/SourceInfo.h" 27 #include "modules/mediastream/MediaDeviceInfo.h"
28 28
29 #include "wtf/text/WTFString.h" 29 #include "wtf/text/WTFString.h"
30 30
31 namespace WebCore { 31 namespace WebCore {
32 32
33 PassRefPtr<SourceInfo> SourceInfo::create(const blink::WebSourceInfo& webSourceI nfo) 33 PassRefPtr<MediaDeviceInfo> MediaDeviceInfo::create(const blink::WebMediaDeviceI nfo& webMediaDeviceInfo)
34 { 34 {
35 ASSERT(!webSourceInfo.isNull()); 35 ASSERT(!webMediaDeviceInfo.isNull());
36 return adoptRef(new SourceInfo(webSourceInfo)); 36 return adoptRef(new MediaDeviceInfo(webMediaDeviceInfo));
37 } 37 }
38 38
39 SourceInfo::SourceInfo(const blink::WebSourceInfo& webSourceInfo) 39 MediaDeviceInfo::MediaDeviceInfo(const blink::WebMediaDeviceInfo& webMediaDevice Info)
40 : m_webSourceInfo(webSourceInfo) 40 : m_webMediaDeviceInfo(webMediaDeviceInfo)
41 { 41 {
42 ScriptWrappable::init(this); 42 ScriptWrappable::init(this);
43 } 43 }
44 44
45 String SourceInfo::id() const 45 String MediaDeviceInfo::deviceId() const
46 { 46 {
47 return m_webSourceInfo.id(); 47 return m_webMediaDeviceInfo.deviceId();
48 } 48 }
49 49
50 String SourceInfo::kind() const 50 String MediaDeviceInfo::kind() const
51 { 51 {
52 switch (m_webSourceInfo.kind()) { 52 switch (m_webMediaDeviceInfo.kind()) {
53 case blink::WebSourceInfo::SourceKindAudio: 53 case blink::WebMediaDeviceInfo::MediaDeviceKindAudioInput:
54 return "audio"; 54 return "audioinput";
55 case blink::WebSourceInfo::SourceKindVideo: 55 case blink::WebMediaDeviceInfo::MediaDeviceKindAudioOutput:
56 return "video"; 56 return "audiooutput";
57 case blink::WebSourceInfo::SourceKindNone: 57 case blink::WebMediaDeviceInfo::MediaDeviceKindVideoInput:
58 return "none"; 58 return "videoinput";
59 } 59 }
60 60
61 ASSERT_NOT_REACHED(); 61 ASSERT_NOT_REACHED();
62 return String(); 62 return String();
63 } 63 }
64 64
65 String SourceInfo::label() const 65 String MediaDeviceInfo::label() const
66 { 66 {
67 return m_webSourceInfo.label(); 67 return m_webMediaDeviceInfo.label();
68 } 68 }
69 69
70 String SourceInfo::facing() const 70 String MediaDeviceInfo::groupId() const
71 { 71 {
72 switch (m_webSourceInfo.facing()) { 72 return m_webMediaDeviceInfo.groupId();
73 case blink::WebSourceInfo::VideoFacingModeNone:
74 return String();
75 case blink::WebSourceInfo::VideoFacingModeUser:
76 return "user";
77 case blink::WebSourceInfo::VideoFacingModeEnvironment:
78 return "environment";
79 }
80
81 ASSERT_NOT_REACHED();
82 return String();
83 } 73 }
84 74
85 } // namespace WebCore 75 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698