<!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>[214178] trunk</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/214178">214178</a></dd>

<dt>Author</dt> <dd>eric.carlson@apple.com</dd>

<dt>Date</dt> <dd>2017-03-20 10:55:20 -0700 (Mon, 20 Mar 2017)</dd>

</dl>

<h3>Log Message</h3>

<pre>[MediaStream] Respect constraints passed to getUserMedia

https://bugs.webkit.org/show_bug.cgi?id=169870

&lt;rdar://problem/31138936&gt;

Reviewed by Youenn Fablet and Jer Noble.

Source/WebCore:

Remember the fitness score calculated when evaluating constraints passed to getUserMedia, so

the best device is chosen when more than one device supports the constraints. Register two

mock video and two mock audio devices with different capabilities so these changes can

be tested.

No new tests, existing tests updated.

* platform/mediastream/RealtimeMediaSource.cpp:

(WebCore::RealtimeMediaSource::selectSettings): Store fitness score in m_fitnessScore.

* platform/mediastream/RealtimeMediaSource.h:

* platform/mediastream/mac/MockRealtimeAudioSourceMac.h:

* platform/mediastream/mac/MockRealtimeAudioSourceMac.mm:

(WebCore::MockRealtimeAudioSource::create): Don't assume sampleRate is 44.1K

(WebCore::MockRealtimeAudioSourceMac::emitSampleBuffers): Use sampleRate() instead of m_sampleRate.

(WebCore::MockRealtimeAudioSourceMac::reconfigure): Ditto.

(WebCore::MockRealtimeAudioSourceMac::render): Ditto.

(WebCore::MockRealtimeAudioSourceMac::applySampleRate): Ditto.

* platform/mock/MockRealtimeAudioSource.cpp:

(WebCore::MockRealtimeAudioSource::updateSettings): Don't assume sampleRate is 44.1K

(WebCore::MockRealtimeAudioSource::initializeCapabilities): Support a range of sample rates.

(WebCore::MockRealtimeAudioSource::startProducingData): Initialize sampleRate if it hasn't

already been set.

* platform/mock/MockRealtimeMediaSource.cpp:

(WebCore::MockRealtimeMediaSource::audioDevices): Return an array of devices.

(WebCore::MockRealtimeMediaSource::videoDevices): Ditto.

(WebCore::MockRealtimeMediaSource::MockRealtimeMediaSource):

(WebCore::MockRealtimeMediaSource::mockAudioSourcePersistentID): Deleted.

(WebCore::MockRealtimeMediaSource::mockVideoSourcePersistentID): Deleted.

(WebCore::MockRealtimeMediaSource::mockAudioSourceName): Deleted.

(WebCore::MockRealtimeMediaSource::mockVideoSourceName): Deleted.

(WebCore::MockRealtimeMediaSource::audioDeviceInfo): Deleted.

(WebCore::MockRealtimeMediaSource::videoDeviceInfo): Deleted.

* platform/mock/MockRealtimeMediaSource.h:

* platform/mock/MockRealtimeMediaSourceCenter.cpp:

(WebCore::MockRealtimeMediaSourceCenter::validateRequestConstraints):

(WebCore::MockRealtimeMediaSourceCenter::createMediaStream):

(WebCore::MockRealtimeMediaSourceCenter::getMediaStreamDevices):

* platform/mock/MockRealtimeVideoSource.cpp:

(WebCore::MockRealtimeVideoSource::MockRealtimeVideoSource):

LayoutTests:

* fast/mediastream/MediaDevices-enumerateDevices-expected.txt:

* fast/mediastream/MediaDevices-getUserMedia-expected.txt:

* fast/mediastream/MediaDevices-getUserMedia.html:

* fast/mediastream/MediaStream-video-element-expected.txt:

* fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsfastmediastreamMediaDevicesenumerateDevicesexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaDevices-enumerateDevices-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastmediastreamMediaDevicesenumerateDeviceshtml">trunk/LayoutTests/fast/mediastream/MediaDevices-enumerateDevices.html</a></li>

<li><a href="#trunkLayoutTestsfastmediastreamMediaDevicesgetUserMediaexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastmediastreamMediaDevicesgetUserMediahtml">trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia.html</a></li>

<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamTrackgetCapabilitiesexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>

<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>

<li><a href="#trunkSourceWebCoreplatformmediastreammacMockRealtimeAudioSourceMach">trunk/Source/WebCore/platform/mediastream/mac/MockRealtimeAudioSourceMac.h</a></li>

<li><a href="#trunkSourceWebCoreplatformmediastreammacMockRealtimeAudioSourceMacmm">trunk/Source/WebCore/platform/mediastream/mac/MockRealtimeAudioSourceMac.mm</a></li>

<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeAudioSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp</a></li>

<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp</a></li>

<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourceh">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h</a></li>

<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourceCentercpp">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp</a></li>

<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214177 => 214178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2017-03-20 17:51:45 UTC (rev 214177)

+++ trunk/LayoutTests/ChangeLog        2017-03-20 17:55:20 UTC (rev 214178)

</span><span class="lines">@@ -1,3 +1,17 @@

</span><ins>+2017-03-20  Eric Carlson  &lt;eric.carlson@apple.com&gt;

+

+        [MediaStream] Respect constraints passed to getUserMedia

+        https://bugs.webkit.org/show_bug.cgi?id=169870

+        &lt;rdar://problem/31138936&gt;

+

+        Reviewed by Youenn Fablet and Jer Noble.

+

+        * fast/mediastream/MediaDevices-enumerateDevices-expected.txt:

+        * fast/mediastream/MediaDevices-getUserMedia-expected.txt:

+        * fast/mediastream/MediaDevices-getUserMedia.html:

+        * fast/mediastream/MediaStream-video-element-expected.txt:

+        * fast/mediastream/MediaStreamTrack-getCapabilities-expected.txt:

+

</ins><span class="cx"> 2017-03-20  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Mark imported/w3c/web-platform-tests/XMLHttpRequest/timeout-multiple-fetches.html as flaky.

</span></span></pre></div>

<a id="trunkLayoutTestsfastmediastreamMediaDevicesenumerateDevicesexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaDevices-enumerateDevices-expected.txt (214177 => 214178)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaDevices-enumerateDevices-expected.txt        2017-03-20 17:51:45 UTC (rev 214177)

+++ trunk/LayoutTests/fast/mediastream/MediaDevices-enumerateDevices-expected.txt        2017-03-20 17:55:20 UTC (rev 214178)

</span><span class="lines">@@ -23,7 +23,19 @@

</span><span class="cx"> PASS captureDevice.label is &quot;&quot;

<span class="cx"> PASS captureDevice.groupId is non-null.

</span><span class="cx"> 