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

Side by Side Diff: trunk/src/content/renderer/media/media_stream_impl.cc

Issue 474483002: Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
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/renderer/media/media_stream_impl.h" 5 #include "content/renderer/media/media_stream_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/hash.h" 9 #include "base/hash.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 options.audio_requested = true; 130 options.audio_requested = true;
131 CopyStreamConstraints(user_media_request.audioConstraints(), 131 CopyStreamConstraints(user_media_request.audioConstraints(),
132 &options.mandatory_audio, 132 &options.mandatory_audio,
133 &options.optional_audio); 133 &options.optional_audio);
134 134
135 // Check if this input device should be used to select a matching output 135 // Check if this input device should be used to select a matching output
136 // device for audio rendering. 136 // device for audio rendering.
137 std::string enable; 137 std::string enable;
138 if (options.GetFirstAudioConstraintByName( 138 if (options.GetFirstAudioConstraintByName(
139 kMediaStreamRenderToAssociatedSink, &enable, NULL) && 139 kMediaStreamRenderToAssociatedSink, &enable, NULL) &&
140 base::LowerCaseEqualsASCII(enable, "true")) { 140 LowerCaseEqualsASCII(enable, "true")) {
141 enable_automatic_output_device_selection = true; 141 enable_automatic_output_device_selection = true;
142 } 142 }
143 } 143 }
144 if (user_media_request.video()) { 144 if (user_media_request.video()) {
145 options.video_requested = true; 145 options.video_requested = true;
146 CopyStreamConstraints(user_media_request.videoConstraints(), 146 CopyStreamConstraints(user_media_request.videoConstraints(),
147 &options.mandatory_video, 147 &options.mandatory_video,
148 &options.optional_video); 148 &options.optional_video);
149 } 149 }
150 150
(...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 return; 947 return;
948 } 948 }
949 } 949 }
950 } 950 }
951 951
952 bool MediaStreamImpl::UserMediaRequestInfo::HasPendingSources() const { 952 bool MediaStreamImpl::UserMediaRequestInfo::HasPendingSources() const {
953 return !sources_waiting_for_callback_.empty(); 953 return !sources_waiting_for_callback_.empty();
954 } 954 }
955 955
956 } // namespace content 956 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/renderer/fetchers/resource_fetcher_impl.cc ('k') | trunk/src/content/renderer/npapi/webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698