<!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>[212846] 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/212846">212846</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2017-02-22 12:46:32 -0800 (Wed, 22 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
MediaStreamSourceNode never receives audio from MockRealtimeAudioSourceMac.
https://bugs.webkit.org/show_bug.cgi?id=168731
Reviewed by Eric Carlson.
Test: fast/mediastream/mock-media-source-webaudio.html
Because the audioSourceProvider can be created before the mock source is configured, explicitly configure the
source if necessary after creating the audioSourceProvider.
* platform/mediastream/mac/MockRealtimeAudioSourceMac.mm:
(WebCore::MockRealtimeAudioSourceMac::audioSourceProvider):
LayoutTests:
MediaStreamSourceNode never receives audio from a getUserMedia() created stream
https://bugs.webkit.org/show_bug.cgi?id=168731
Reviewed by Eric Carlson.
* fast/mediastream/mock-media-source-webaudio-expected.txt: Added.
* fast/mediastream/mock-media-source-webaudio.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacMockRealtimeAudioSourceMacmm">trunk/Source/WebCore/platform/mediastream/mac/MockRealtimeAudioSourceMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreammockmediasourcewebaudioexpectedtxt">trunk/LayoutTests/fast/mediastream/mock-media-source-webaudio-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreammockmediasourcewebaudiohtml">trunk/LayoutTests/fast/mediastream/mock-media-source-webaudio.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212845 => 212846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-22 20:44:30 UTC (rev 212845)
+++ trunk/LayoutTests/ChangeLog 2017-02-22 20:46:32 UTC (rev 212846)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-02-22 Jer Noble <jer.noble@apple.com>
+
+ MediaStreamSourceNode never receives audio from a getUserMedia() created stream
+ https://bugs.webkit.org/show_bug.cgi?id=168731
+
+ Reviewed by Eric Carlson.
+
+ * fast/mediastream/mock-media-source-webaudio-expected.txt: Added.
+ * fast/mediastream/mock-media-source-webaudio.html: Added.
+
</ins><span class="cx"> 2017-02-22 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not aggressively throttle DOM timers until they've reached their max nesting level
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreammockmediasourcewebaudioexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/mock-media-source-webaudio-expected.txt (0 => 212846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/mock-media-source-webaudio-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/mock-media-source-webaudio-expected.txt 2017-02-22 20:46:32 UTC (rev 212846)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS Basic getUserMedia to Web Audio test
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreammockmediasourcewebaudiohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/mock-media-source-webaudio.html (0 => 212846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/mock-media-source-webaudio.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/mock-media-source-webaudio.html 2017-02-22 20:46:32 UTC (rev 212846)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Testing local audio capture playback causes "playing" event to fire</title>
+ <script src="../../resources/testharness.js"></script>
+ <script src="../../resources/testharnessreport.js"></script>
+</head>
+<body>
+ <script>
+ if (window.testRunner)
+ testRunner.setUserMediaPermission(true);
+
+ var heardHum = false;
+ var heardBop = false;
+ var heardBip = false;
+
+ var test = async_test(() => {
+ navigator.mediaDevices.getUserMedia({audio: true}).then((stream) => {
+ var context = new webkitAudioContext();
+ var sourceNode = context.createMediaStreamSource(stream);
+ var analyser = context.createAnalyser();
+ var gain = context.createGain();
+
+ analyser.fftSize = 2048;
+ analyser.smoothingTimeConstant = 0;
+ analyser.minDecibels = -100;
+ analyser.maxDecibels = 0;
+ gain.gain.value = 0;
+
+ sourceNode.connect(analyser);
+ analyser.connect(gain);
+ gain.connect(context.destination);
+
+ function analyse() {
+ var freqDomain = new Uint8Array(analyser.frequencyBinCount);
+ analyser.getByteFrequencyData(freqDomain);
+
+ var hasFrequency = expectedFrequency => {
+ var bin = Math.floor(expectedFrequency * analyser.fftSize / context.sampleRate);
+ return bin < freqDomain.length && freqDomain[bin] >= 150;
+ };
+
+ if (!heardHum)
+ heardHum = hasFrequency(150);
+
+ if (!heardBip)
+ heardBip = hasFrequency(1500);
+
+ if (!heardBop)
+ heardBop = hasFrequency(500);
+
+ if (heardHum && heardBip && heardBop)
+ done();
+ };
+
+ var done = () => {
+ clearTimeout(timeout);
+ clearInterval(interval);
+
+ assert_true(heardHum);
+ assert_true(heardBip);
+ assert_true(heardBop);
+ test.done();
+ };
+
+ var timeout = setTimeout(done, 3000);
+ var interval = setInterval(analyse, 1000 / 30);
+ analyse();
+ });
+ }, "Basic getUserMedia to Web Audio test");
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212845 => 212846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-22 20:44:30 UTC (rev 212845)
+++ trunk/Source/WebCore/ChangeLog 2017-02-22 20:46:32 UTC (rev 212846)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-22 Jer Noble <jer.noble@apple.com>
+
+ MediaStreamSourceNode never receives audio from MockRealtimeAudioSourceMac.
+ https://bugs.webkit.org/show_bug.cgi?id=168731
+
+ Reviewed by Eric Carlson.
+
+ Test: fast/mediastream/mock-media-source-webaudio.html
+
+ Because the audioSourceProvider can be created before the mock source is configured, explicitly configure the
+ source if necessary after creating the audioSourceProvider.
+
+ * platform/mediastream/mac/MockRealtimeAudioSourceMac.mm:
+ (WebCore::MockRealtimeAudioSourceMac::audioSourceProvider):
+
</ins><span class="cx"> 2017-02-22 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not aggressively throttle DOM timers until they've reached their max nesting level
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacMockRealtimeAudioSourceMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/MockRealtimeAudioSourceMac.mm (212845 => 212846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/MockRealtimeAudioSourceMac.mm 2017-02-22 20:44:30 UTC (rev 212845)
+++ trunk/Source/WebCore/platform/mediastream/mac/MockRealtimeAudioSourceMac.mm 2017-02-22 20:46:32 UTC (rev 212846)
</span><span class="lines">@@ -203,6 +203,9 @@
</span><span class="cx"> AudioSourceProvider* MockRealtimeAudioSourceMac::audioSourceProvider()
</span><span class="cx"> {
</span><span class="cx"> if (!m_audioSourceProvider) {
</span><ins>+ if (!m_audioBufferList)
+ reconfigure();
+
</ins><span class="cx"> m_audioSourceProvider = WebAudioSourceProviderAVFObjC::create(*this);
</span><span class="cx"> m_audioSourceProvider->prepare(&m_streamFormat);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>