<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187168] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187168">187168</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-22 11:09:08 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Need the ability to give only best source UIDs to UserMedia request
https://bugs.webkit.org/show_bug.cgi?id=147171
<rdar://problem/21931121>
Patch by Matthew Daiter <mdaiter@apple.com> on 2015-07-22
Reviewed by Eric Carlson.
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::constraintsValidated):
* Modules/mediastream/UserMediaRequest.h:
(WebCore::UserMediaRequest::videoDeviceUIDs):
(WebCore::UserMediaRequest::audioDeviceUIDs):
* platform/mediastream/MediaStreamCreationClient.h:
* platform/mediastream/mac/AVCaptureDeviceManager.h:
* platform/mediastream/mac/AVCaptureDeviceManager.mm:
(WebCore::AVCaptureDeviceManager::bestSourcesForTypeAndConstraints):
(WebCore::AVCaptureDeviceManager::bestSourceForTypeAndConstraints): Deleted.
* platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
(WebCore::RealtimeMediaSourceCenterMac::validateRequestConstraints):
(WebCore::RealtimeMediaSourceCenterMac::createMediaStream):
* platform/mock/MockRealtimeMediaSourceCenter.cpp:
(WebCore::MockRealtimeMediaSourceCenter::validateRequestConstraints):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequesth">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamCreationClienth">trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagerh">trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagermm">trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeMediaSourceCenterMaccpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceCenterOwrcpp">trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourceCentercpp">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187167 => 187168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-22 18:04:12 UTC (rev 187167)
+++ trunk/Source/WebCore/ChangeLog 2015-07-22 18:09:08 UTC (rev 187168)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-07-22 Matthew Daiter <mdaiter@apple.com>
+
+ Need the ability to give only best source UIDs to UserMedia request
+ https://bugs.webkit.org/show_bug.cgi?id=147171
+ <rdar://problem/21931121>
+
+ Reviewed by Eric Carlson.
+
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::constraintsValidated):
+ * Modules/mediastream/UserMediaRequest.h:
+ (WebCore::UserMediaRequest::videoDeviceUIDs):
+ (WebCore::UserMediaRequest::audioDeviceUIDs):
+ * platform/mediastream/MediaStreamCreationClient.h:
+ * platform/mediastream/mac/AVCaptureDeviceManager.h:
+ * platform/mediastream/mac/AVCaptureDeviceManager.mm:
+ (WebCore::AVCaptureDeviceManager::bestSourcesForTypeAndConstraints):
+ (WebCore::AVCaptureDeviceManager::bestSourceForTypeAndConstraints): Deleted.
+ * platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp:
+ (WebCore::RealtimeMediaSourceCenterMac::validateRequestConstraints):
+ (WebCore::RealtimeMediaSourceCenterMac::createMediaStream):
+ * platform/mock/MockRealtimeMediaSourceCenter.cpp:
+ (WebCore::MockRealtimeMediaSourceCenter::validateRequestConstraints):
+
</ins><span class="cx"> 2015-07-22 Mark Dittmer <mark.s.dittmer@gmail.com>
</span><span class="cx">
</span><span class="cx"> Fix toJSDOMWindow() in the case of an object that has the actual JS DOM window in its prototype chain.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (187167 => 187168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-07-22 18:04:12 UTC (rev 187167)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-07-22 18:09:08 UTC (rev 187168)
</span><span class="lines">@@ -121,8 +121,12 @@
</span><span class="cx"> RealtimeMediaSourceCenter::singleton().validateRequestConstraints(this, m_audioConstraints, m_videoConstraints);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UserMediaRequest::constraintsValidated()
</del><ins>+void UserMediaRequest::constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>& videoTracks, const Vector<RefPtr<RealtimeMediaSource>>& audioTracks)
</ins><span class="cx"> {
</span><ins>+ for (auto& audioTrack : audioTracks)
+ m_audioDeviceUIDs.append(audioTrack->id());
+ for (auto& videoTrack : videoTracks)
+ m_videoDeviceUIDs.append(videoTrack->id());
</ins><span class="cx"> RefPtr<UserMediaRequest> protectedThis(this);
</span><span class="cx"> callOnMainThread([protectedThis] {
</span><span class="cx"> // 2 - The constraints are valid, ask the user for access to media.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (187167 => 187168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-07-22 18:04:12 UTC (rev 187167)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-07-22 18:09:08 UTC (rev 187168)
</span><span class="lines">@@ -69,12 +69,15 @@
</span><span class="cx">
</span><span class="cx"> bool requiresAudio() const { return m_audioConstraints; }
</span><span class="cx"> bool requiresVideo() const { return m_videoConstraints; }
</span><ins>+
+ const Vector<String>& videoDeviceUIDs() const { return m_videoDeviceUIDs; }
+ const Vector<String>& audioDeviceUIDs() const { return m_audioDeviceUIDs; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> UserMediaRequest(ScriptExecutionContext*, UserMediaController*, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints, MediaDevices::Promise&&);
</span><span class="cx">
</span><span class="cx"> // MediaStreamCreationClient
</span><del>- virtual void constraintsValidated() override final;
</del><ins>+ virtual void constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>&, const Vector<RefPtr<RealtimeMediaSource>>&) override final;
</ins><span class="cx"> virtual void constraintsInvalid(const String& constraintName) override final;
</span><span class="cx"> virtual void didCreateStream(PassRefPtr<MediaStreamPrivate>) override final;
</span><span class="cx"> virtual void failedToCreateStreamWithConstraintsError(const String& constraintName) override final;
</span><span class="lines">@@ -86,6 +89,9 @@
</span><span class="cx"> RefPtr<MediaConstraints> m_audioConstraints;
</span><span class="cx"> RefPtr<MediaConstraints> m_videoConstraints;
</span><span class="cx">
</span><ins>+ Vector<String> m_videoDeviceUIDs;
+ Vector<String> m_audioDeviceUIDs;
+
</ins><span class="cx"> UserMediaController* m_controller;
</span><span class="cx">
</span><span class="cx"> MediaDevices::Promise m_promise;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamCreationClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h (187167 => 187168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h 2015-07-22 18:04:12 UTC (rev 187167)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamCreationClient.h 2015-07-22 18:09:08 UTC (rev 187168)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~MediaStreamCreationClient() { }
</span><span class="cx">
</span><del>- virtual void constraintsValidated() = 0;
</del><ins>+ virtual void constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>& videoTracks, const Vector<RefPtr<RealtimeMediaSource>>& audioTracks) = 0;
</ins><span class="cx"> virtual void constraintsInvalid(const String& constraintName) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void didCreateStream(PassRefPtr<MediaStreamPrivate>) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h (187167 => 187168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h 2015-07-22 18:04:12 UTC (rev 187167)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h 2015-07-22 18:09:08 UTC (rev 187168)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<TrackSourceInfo>> getSourcesInfo(const String&);
</span><span class="cx"> bool verifyConstraintsForMediaType(RealtimeMediaSource::Type, MediaConstraints*, String&);
</span><del>- RefPtr<RealtimeMediaSource> bestSourceForTypeAndConstraints(RealtimeMediaSource::Type, PassRefPtr<MediaConstraints>);
</del><ins>+ Vector<RefPtr<RealtimeMediaSource>> bestSourcesForTypeAndConstraints(RealtimeMediaSource::Type, PassRefPtr<MediaConstraints>);
</ins><span class="cx"> RefPtr<RealtimeMediaSource> sourceWithUID(String&, RealtimeMediaSource::Type, MediaConstraints*);
</span><span class="cx">
</span><span class="cx"> enum ValidConstraints { Width = 0, Height, FrameRate, FacingMode, Gain };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVCaptureDeviceManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm (187167 => 187168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2015-07-22 18:04:12 UTC (rev 187167)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2015-07-22 18:09:08 UTC (rev 187168)
</span><span class="lines">@@ -378,39 +378,39 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<RealtimeMediaSource> AVCaptureDeviceManager::bestSourceForTypeAndConstraints(RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)
</del><ins>+Vector<RefPtr<RealtimeMediaSource>> AVCaptureDeviceManager::bestSourcesForTypeAndConstraints(RealtimeMediaSource::Type type, PassRefPtr<MediaConstraints> constraints)
</ins><span class="cx"> {
</span><ins>+ Vector<RefPtr<RealtimeMediaSource>> bestSourcesList;
+
</ins><span class="cx"> if (!isAvailable())
</span><del>- return 0;
</del><ins>+ return bestSourcesList;
</ins><span class="cx">
</span><del>- Vector<CaptureDevice>& devices = captureDeviceList();
- size_t count = devices.size();
- for (size_t i = 0; i < count; ++i) {
- if (!devices[i].m_enabled)
</del><ins>+ for (auto& captureDevice : captureDeviceList()) {
+ if (!captureDevice.m_enabled)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // FIXME: consider the constraints when choosing among multiple devices. For now just select the first available
</span><span class="cx"> // device of the appropriate type.
</span><del>- if (type == RealtimeMediaSource::Audio && !devices[i].m_audioSourceId.isEmpty()) {
- if (!devices[i].m_audioSource) {
- AVCaptureDeviceType *device = [AVCaptureDevice deviceWithUniqueID:devices[i].m_captureDeviceID];
</del><ins>+ if (type == RealtimeMediaSource::Audio && !captureDevice.m_audioSourceId.isEmpty()) {
+ if (!captureDevice.m_audioSource) {
+ AVCaptureDeviceType *device = [AVCaptureDevice deviceWithUniqueID:captureDevice.m_captureDeviceID];
</ins><span class="cx"> ASSERT(device);
</span><del>- devices[i].m_audioSource = AVAudioCaptureSource::create(device, devices[i].m_audioSourceId, constraints);
</del><ins>+ captureDevice.m_audioSource = AVAudioCaptureSource::create(device, captureDevice.m_audioSourceId, constraints);
</ins><span class="cx"> }
</span><del>- return devices[i].m_audioSource;
</del><ins>+ bestSourcesList.append(captureDevice.m_audioSource);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (type == RealtimeMediaSource::Video && !devices[i].m_videoSourceId.isEmpty()) {
- if (!devices[i].m_videoSource) {
- AVCaptureDeviceType *device = [AVCaptureDevice deviceWithUniqueID:devices[i].m_captureDeviceID];
</del><ins>+ if (type == RealtimeMediaSource::Video && !captureDevice.m_videoSourceId.isEmpty()) {
+ if (!captureDevice.m_videoSource) {
+ AVCaptureDeviceType *device = [AVCaptureDevice deviceWithUniqueID:captureDevice.m_captureDeviceID];
</ins><span class="cx"> ASSERT(device);
</span><del>- devices[i].m_videoSource = AVVideoCaptureSource::create(device, devices[i].m_videoSourceId, constraints);
</del><ins>+ captureDevice.m_videoSource = AVVideoCaptureSource::create(device, captureDevice.m_videoSourceId, constraints);
</ins><span class="cx"> }
</span><del>- return devices[i].m_videoSource;
</del><ins>+ bestSourcesList.append(captureDevice.m_videoSource);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return bestSourcesList;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<RealtimeMediaSource> AVCaptureDeviceManager::sourceWithUID(String &deviceUID, RealtimeMediaSource::Type type, MediaConstraints* constraints)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeMediaSourceCenterMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp (187167 => 187168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2015-07-22 18:04:12 UTC (rev 187167)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp 2015-07-22 18:09:08 UTC (rev 187168)
</span><span class="lines">@@ -79,10 +79,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ Vector<RefPtr<RealtimeMediaSource>> bestVideoSources = AVCaptureDeviceManager::singleton().bestSourcesForTypeAndConstraints(RealtimeMediaSource::Type::Video, videoConstraints);
+ Vector<RefPtr<RealtimeMediaSource>> bestAudioSources = AVCaptureDeviceManager::singleton().bestSourcesForTypeAndConstraints(RealtimeMediaSource::Type::Audio, audioConstraints);
+ client->constraintsValidated(bestVideoSources, bestAudioSources);
+}
</ins><span class="cx">
</span><del>- client->constraintsValidated();
-}
-
</del><span class="cx"> void RealtimeMediaSourceCenterMac::createMediaStream(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<MediaStreamCreationClient> client = prpQueryClient;
</span><span class="lines">@@ -99,8 +100,9 @@
</span><span class="cx"> client->failedToCreateStreamWithConstraintsError(invalidConstraint);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- RefPtr<RealtimeMediaSource> audioSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(RealtimeMediaSource::Audio, audioConstraints.get());
</del><ins>+ // FIXME: Consider the constraints when choosing among multiple devices. For now just select the first available
+ // device of the appropriate type.
+ RefPtr<RealtimeMediaSource> audioSource = AVCaptureDeviceManager::singleton().bestSourcesForTypeAndConstraints(RealtimeMediaSource::Audio, audioConstraints.get()).at(0);
</ins><span class="cx"> ASSERT(audioSource);
</span><span class="cx">
</span><span class="cx"> audioSources.append(audioSource.release());
</span><span class="lines">@@ -113,8 +115,9 @@
</span><span class="cx"> client->failedToCreateStreamWithConstraintsError(invalidConstraint);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- RefPtr<RealtimeMediaSource> videoSource = AVCaptureDeviceManager::singleton().bestSourceForTypeAndConstraints(RealtimeMediaSource::Video, videoConstraints.get());
</del><ins>+ // FIXME: Consider the constraints when choosing among multiple devices. For now just select the first available
+ // device of the appropriate type.
+ RefPtr<RealtimeMediaSource> videoSource = AVCaptureDeviceManager::singleton().bestSourcesForTypeAndConstraints(RealtimeMediaSource::Video, videoConstraints.get()).at(0);
</ins><span class="cx"> ASSERT(videoSource);
</span><span class="cx">
</span><span class="cx"> videoSources.append(videoSource.release());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceCenterOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp (187167 => 187168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 2015-07-22 18:04:12 UTC (rev 187167)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 2015-07-22 18:09:08 UTC (rev 187168)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // TODO: Make sure contraints are actually validated by checking source types.
</span><del>- m_client->constraintsValidated();
</del><ins>+ m_client->constraintsValidated(Vector<RefPtr<RealtimeMediaSource>>(), Vector<RefPtr<RealtimeMediaSource>>());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<RealtimeMediaSource> RealtimeMediaSourceCenterOwr::firstSource(RealtimeMediaSource::Type type)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourceCentercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp (187167 => 187168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp 2015-07-22 18:04:12 UTC (rev 187167)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp 2015-07-22 18:09:08 UTC (rev 187168)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- client->constraintsValidated();
</del><ins>+ client->constraintsValidated(Vector<RefPtr<RealtimeMediaSource>>(), Vector<RefPtr<RealtimeMediaSource>>());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MockRealtimeMediaSourceCenter::createMediaStream(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
</span></span></pre>
</div>
</div>
</body>
</html>