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

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

Issue 1314803003: Include default communication devices in audio device enumerations. This removes heuristic that pic… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comment Created 5 years, 3 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_stream_options.h" 5 #include "content/common/media/media_stream_options.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 const char kMediaStreamSource[] = "chromeMediaSource"; 11 const char kMediaStreamSource[] = "chromeMediaSource";
12 const char kMediaStreamSourceId[] = "chromeMediaSourceId"; 12 const char kMediaStreamSourceId[] = "chromeMediaSourceId";
13 const char kMediaStreamSourceInfoId[] = "sourceId"; 13 const char kMediaStreamSourceInfoId[] = "sourceId";
14 const char kMediaStreamSourceTab[] = "tab"; 14 const char kMediaStreamSourceTab[] = "tab";
15 const char kMediaStreamSourceScreen[] = "screen"; 15 const char kMediaStreamSourceScreen[] = "screen";
16 const char kMediaStreamSourceDesktop[] = "desktop"; 16 const char kMediaStreamSourceDesktop[] = "desktop";
17 const char kMediaStreamSourceSystem[] = "system"; 17 const char kMediaStreamSourceSystem[] = "system";
18 const char kMediaStreamRenderToAssociatedSink[] = 18 const char kMediaStreamRenderToAssociatedSink[] =
19 "chromeRenderToAssociatedSink"; 19 "chromeRenderToAssociatedSink";
20 // The prefix of this constant is 'goog' to match with other getUserMedia 20 // The prefix of this constant is 'goog' to match with other getUserMedia
21 // constraints for audio. 21 // constraints for audio.
22 const char kMediaStreamAudioDucking[] = "googDucking";
23 const char kMediaStreamAudioHotword[] = "googHotword"; 22 const char kMediaStreamAudioHotword[] = "googHotword";
24 23
25 namespace { 24 namespace {
26 25
27 bool GetFirstConstraintByName(const StreamOptions::Constraints& constraints, 26 bool GetFirstConstraintByName(const StreamOptions::Constraints& constraints,
28 const std::string& name, 27 const std::string& name,
29 std::string* value) { 28 std::string* value) {
30 for (StreamOptions::Constraints::const_iterator it = constraints.begin(); 29 for (StreamOptions::Constraints::const_iterator it = constraints.begin();
31 it != constraints.end(); ++it ) { 30 it != constraints.end(); ++it ) {
32 if (it->name == name) { 31 if (it->name == name) {
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } 121 }
123 122
124 // static 123 // static
125 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first, 124 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first,
126 const StreamDeviceInfo& second) { 125 const StreamDeviceInfo& second) {
127 return first.device.IsEqual(second.device) && 126 return first.device.IsEqual(second.device) &&
128 first.session_id == second.session_id; 127 first.session_id == second.session_id;
129 } 128 }
130 129
131 } // namespace content 130 } // namespace content
OLDNEW
« no previous file with comments | « content/common/media/media_stream_options.h ('k') | content/renderer/media/media_stream_audio_processor_options.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698