<!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>[160755] 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/160755">160755</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2013-12-17 23:37:08 -0800 (Tue, 17 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MSE] Periodically monitor source buffers.
https://bugs.webkit.org/show_bug.cgi?id=125898
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/media-source/media-source-monitor-source-buffers.html
The MSE spec requires that the SourceBuffer Monitoring step is run
periodically during playback. No specific update interval is specified
so we will re-use the existing HTMLMediaElement playback progress
timer to signal the media source monitoring.
* html/HTMLMediaElement.cpp:
(HTMLMediaElement::playbackProgressTimerFired):
LayoutTests:
* media/media-source/media-source-monitor-source-buffers-expected.txt: Added.
* media/media-source/media-source-monitor-source-buffers.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="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourcemonitorsourcebuffersexpectedtxt">trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourcemonitorsourcebuffershtml">trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160754 => 160755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-18 06:49:50 UTC (rev 160754)
+++ trunk/LayoutTests/ChangeLog 2013-12-18 07:37:08 UTC (rev 160755)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-17 Jer Noble <jer.noble@apple.com>
+
+ [MSE] Periodically monitor source buffers.
+ https://bugs.webkit.org/show_bug.cgi?id=125898
+
+ Reviewed by Eric Carlson.
+
+ * media/media-source/media-source-monitor-source-buffers-expected.txt: Added.
+ * media/media-source/media-source-monitor-source-buffers.html: Added.
+
</ins><span class="cx"> 2013-12-17 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove InspectorFrontendHost.setInjectedScriptForOrigin
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourcemonitorsourcebuffersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers-expected.txt (0 => 160755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers-expected.txt 2013-12-18 07:37:08 UTC (rev 160755)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+
+EXPECTED (source.readyState == 'closed') OK
+EVENT(sourceopen)
+RUN(sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock"))
+RUN(sourceBuffer.appendBuffer(initSegment))
+EVENT(updateend)
+RUN(sourceBuffer.appendBuffer(sample))
+EVENT(updateend)
+RUN(video.play())
+EVENT(waiting) TEST(video.readyState == HTMLMediaElement.HAVE_CURRENT_DATA) OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourcemonitorsourcebuffershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers.html (0 => 160755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers.html (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-monitor-source-buffers.html 2013-12-18 07:37:08 UTC (rev 160755)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>mock-media-source</title>
+ <script src="mock-media-source.js"></script>
+ <script src="../video-test.js"></script>
+ <script>
+ var source;
+ var sourceBuffer;
+ var initSegment;
+ var sample;
+
+ if (window.internals)
+ internals.initializeMockMediaSource();
+
+ function runTest()
+ {
+ findMediaElement();
+
+ source = new MediaSource();
+ testExpected('source.readyState', 'closed');
+
+ waitForEventOn(source, 'sourceopen', sourceOpen);
+ video.src = URL.createObjectURL(source);
+ }
+
+ function sourceOpen()
+ {
+ run('sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock")');
+ waitForEventOn(sourceBuffer, 'updateend', loadSamples, false, true);
+ initSegment = makeAInit(100, [makeATrack(1, 'mock', TRACK_KIND.VIDEO)]);
+ run('sourceBuffer.appendBuffer(initSegment)');
+ }
+
+ function loadSamples()
+ {
+ sample = makeASample(0, 0, 10, 1, SAMPLE_FLAG.SYNC);
+ waitForEventOn(sourceBuffer, 'updateend', play, false, true);
+ run('sourceBuffer.appendBuffer(sample)');
+ }
+
+ function play()
+ {
+ waitForEventTestAndEnd('waiting', 'video.readyState == HTMLMediaElement.HAVE_CURRENT_DATA');
+ run('video.play()');
+ }
+
+ </script>
+</head>
+<body onload="runTest()">
+ <video></video>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160754 => 160755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-18 06:49:50 UTC (rev 160754)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 07:37:08 UTC (rev 160755)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2013-12-17 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><ins>+ [MSE] Periodically monitor source buffers.
+ https://bugs.webkit.org/show_bug.cgi?id=125898
+
+ Reviewed by Eric Carlson.
+
+ Test: media/media-source/media-source-monitor-source-buffers.html
+
+ The MSE spec requires that the SourceBuffer Monitoring step is run
+ periodically during playback. No specific update interval is specified
+ so we will re-use the existing HTMLMediaElement playback progress
+ timer to signal the media source monitoring.
+
+ * html/HTMLMediaElement.cpp:
+ (HTMLMediaElement::playbackProgressTimerFired):
+
+2013-12-17 Jer Noble <jer.noble@apple.com>
+
</ins><span class="cx"> [MSE] Add per-track signalling between SourceBuffer and SourceBufferPrivate.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125899
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (160754 => 160755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-12-18 06:49:50 UTC (rev 160754)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-12-18 07:37:08 UTC (rev 160755)
</span><span class="lines">@@ -3008,6 +3008,11 @@
</span><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().webkitVideoTrackEnabled())
</span><span class="cx"> updateActiveTextTrackCues(currentTime());
</span><span class="cx"> #endif
</span><ins>+
+#if ENABLE(MEDIA_SOURCE)
+ if (m_mediaSource)
+ m_mediaSource->monitorSourceBuffers();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::scheduleTimeupdateEvent(bool periodicEvent)
</span></span></pre>
</div>
</div>
</body>
</html>