<!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>[212696] 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/212696">212696</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2017-02-20 18:35:35 -0800 (Mon, 20 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Local audio-only stream will not trigger playback to begin
https://bugs.webkit.org/show_bug.cgi?id=168412
Reviewed by Youenn Fablet.
Source/WebCore:
Test: fast/mediastream/local-audio-playing-event.html
With video-bearing streams, the first video sample emitted from the stream causes the
readyState to move from HAVE_NOTHING to HAVE_ENOUGH_DATA. Wire up this same behavior for
audio-bearing streams. Add a MediaStreamTrackPrivate::Observer callback method
audioSamplesAvailable(), which gets passed up to MediaPlayerPrivateMediaStreamAVFObjC.
Because this callback may be (and probably will be) called on a background thread, run the
updateReadyState() task in a scheduledDeferredTask().
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::audioSamplesAvailable):
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks):
* platform/mediastream/MediaStreamTrackPrivate.cpp:
(WebCore::MediaStreamTrackPrivate::audioSamplesAvailable):
* platform/mediastream/MediaStreamTrackPrivate.h:
(WebCore::MediaStreamTrackPrivate::Observer::audioSamplesAvailable):
LayoutTests:
* fast/mediastream/local-audio-playing-event-expected.txt: Added.
* fast/mediastream/local-audio-playing-event.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="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreamlocalaudioplayingeventexpectedtxt">trunk/LayoutTests/fast/mediastream/local-audio-playing-event-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamlocalaudioplayingeventhtml">trunk/LayoutTests/fast/mediastream/local-audio-playing-event.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212695 => 212696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/LayoutTests/ChangeLog 2017-02-21 02:35:35 UTC (rev 212696)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-02-20 Jer Noble <jer.noble@apple.com>
+
+ Local audio-only stream will not trigger playback to begin
+ https://bugs.webkit.org/show_bug.cgi?id=168412
+
+ Reviewed by Youenn Fablet.
+
+ * fast/mediastream/local-audio-playing-event-expected.txt: Added.
+ * fast/mediastream/local-audio-playing-event.html: Added.
+
</ins><span class="cx"> 2017-02-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Implement absoluteQuadsForRange.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamlocalaudioplayingeventexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/local-audio-playing-event-expected.txt (0 => 212696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/local-audio-playing-event-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/local-audio-playing-event-expected.txt 2017-02-21 02:35:35 UTC (rev 212696)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS Local audio playback fires playing event
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamlocalaudioplayingeventhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/local-audio-playing-event.html (0 => 212696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/local-audio-playing-event.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/local-audio-playing-event.html 2017-02-21 02:35:35 UTC (rev 212696)
</span><span class="lines">@@ -0,0 +1,26 @@
</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>
+ <audio id="audio" autoplay></audio>
+ <script>
+ if (window.testRunner)
+ testRunner.setUserMediaPermission(true);
+
+ var audio = document.getElementById('audio');
+
+ promise_test((test) => {
+ return navigator.mediaDevices.getUserMedia({audio: true}).then((stream) => {
+ audio.srcObject = stream;
+ var eventWatcher = new EventWatcher(test, audio, 'playing');
+ return eventWatcher.wait_for('playing');
+ });
+ }, 'Local audio playback fires playing event');
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212695 => 212696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/Source/WebCore/ChangeLog 2017-02-21 02:35:35 UTC (rev 212696)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-02-20 Jer Noble <jer.noble@apple.com>
+
+ Local audio-only stream will not trigger playback to begin
+ https://bugs.webkit.org/show_bug.cgi?id=168412
+
+ Reviewed by Youenn Fablet.
+
+ Test: fast/mediastream/local-audio-playing-event.html
+
+ With video-bearing streams, the first video sample emitted from the stream causes the
+ readyState to move from HAVE_NOTHING to HAVE_ENOUGH_DATA. Wire up this same behavior for
+ audio-bearing streams. Add a MediaStreamTrackPrivate::Observer callback method
+ audioSamplesAvailable(), which gets passed up to MediaPlayerPrivateMediaStreamAVFObjC.
+ Because this callback may be (and probably will be) called on a background thread, run the
+ updateReadyState() task in a scheduledDeferredTask().
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::audioSamplesAvailable):
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks):
+ * platform/mediastream/MediaStreamTrackPrivate.cpp:
+ (WebCore::MediaStreamTrackPrivate::audioSamplesAvailable):
+ * platform/mediastream/MediaStreamTrackPrivate.h:
+ (WebCore::MediaStreamTrackPrivate::Observer::audioSamplesAvailable):
+
</ins><span class="cx"> 2017-02-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Implement absoluteQuadsForRange.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (212695 => 212696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2017-02-21 02:35:35 UTC (rev 212696)
</span><span class="lines">@@ -190,6 +190,7 @@
</span><span class="cx"> void trackSettingsChanged(MediaStreamTrackPrivate&) override { };
</span><span class="cx"> void trackEnabledChanged(MediaStreamTrackPrivate&) override { };
</span><span class="cx"> void sampleBufferUpdated(MediaStreamTrackPrivate&, MediaSample&) override;
</span><ins>+ void audioSamplesAvailable(MediaStreamTrackPrivate&) override;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="cx"> void setVideoFullscreenLayer(PlatformLayer*, std::function<void()> completionHandler) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (212695 => 212696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-02-21 02:35:35 UTC (rev 212696)
</span><span class="lines">@@ -753,6 +753,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::audioSamplesAvailable(MediaStreamTrackPrivate&)
+{
+ if (m_hasReceivedMedia)
+ return;
+ m_hasReceivedMedia = true;
+
+ scheduleDeferredTask([this] {
+ updateReadyState();
+ });
+}
+
</ins><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer(PlatformLayer *videoFullscreenLayer, std::function<void()> completionHandler)
</span><span class="cx"> {
</span><span class="lines">@@ -851,6 +862,7 @@
</span><span class="cx"> m_player->removeAudioTrack(*track);
</span><span class="cx"> break;
</span><span class="cx"> case TrackState::Add:
</span><ins>+ track->streamTrack().addObserver(*this);
</ins><span class="cx"> m_player->addAudioTrack(*track);
</span><span class="cx"> break;
</span><span class="cx"> case TrackState::Configure:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (212695 => 212696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2017-02-21 02:35:35 UTC (rev 212696)
</span><span class="lines">@@ -213,6 +213,12 @@
</span><span class="cx"> observer->sampleBufferUpdated(*this, mediaSample);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaStreamTrackPrivate::audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t)
+{
+ for (auto& observer : m_observers)
+ observer->audioSamplesAvailable(*this);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MEDIA_STREAM)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (212695 => 212696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2017-02-21 02:35:35 UTC (rev 212696)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> virtual void trackSettingsChanged(MediaStreamTrackPrivate&) = 0;
</span><span class="cx"> virtual void trackEnabledChanged(MediaStreamTrackPrivate&) = 0;
</span><span class="cx"> virtual void sampleBufferUpdated(MediaStreamTrackPrivate&, MediaSample&) { };
</span><ins>+ virtual void audioSamplesAvailable(MediaStreamTrackPrivate&) { };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<MediaStreamTrackPrivate> create(Ref<RealtimeMediaSource>&&);
</span><span class="lines">@@ -102,6 +103,7 @@
</span><span class="cx"> void sourceSettingsChanged() final;
</span><span class="cx"> bool preventSourceFromStopping() final;
</span><span class="cx"> void videoSampleAvailable(MediaSample&) final;
</span><ins>+ void audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t) final;
</ins><span class="cx">
</span><span class="cx"> Vector<Observer*> m_observers;
</span><span class="cx"> Ref<RealtimeMediaSource> m_source;
</span></span></pre>
</div>
</div>
</body>
</html>