<!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>[177281] 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/177281">177281</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-15 09:29:14 -0800 (Mon, 15 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MSE] Prevent SourceBuffer monitoring algorithm from triggering a HAVE_NOTHING to HAVE_METADATA transition.
https://bugs.webkit.org/show_bug.cgi?id=139444
Patch by Bartlomiej Gajda <b.gajda@samsung.com> on 2014-12-15
Reviewed by Jer Noble.
Source/WebCore:
In case of 2 SourceBuffers, there can be transition to HaveMetadata from monitorSourceBuffers,
even though second SourceBuffer did not receive init segment - we can't query for it's metadata
such as width/height (if second one was video), so we shouldn't fire the event.
W3 Bug reference : https://www.w3.org/Bugs/Public/show_bug.cgi?id=27542
Test: media/media-source/media-source-loadedmetada-with-two-sourcebuffers.html
* Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::monitorSourceBuffers):
* Modules/mediasource/SourceBuffer.h:
* platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
(WebCore::mimeTypeCache):
LayoutTests:
Added test to check how many active SourceBuffers exist when loadedmetadata fires,
according to spec 3.5.7, this should be equal to number of sourcebuffers.
* media/media-source/media-source-loadedmetada-with-two-sourcebuffers-expected.txt: Added.
* media/media-source/media-source-loadedmetada-with-two-sourcebuffers.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="#trunkSourceWebCoreModulesmediasourceMediaSourcecpp">trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourcecpp">trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourceloadedmetadawithtwosourcebuffersexpectedtxt">trunk/LayoutTests/media/media-source/media-source-loadedmetada-with-two-sourcebuffers-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourceloadedmetadawithtwosourcebuffershtml">trunk/LayoutTests/media/media-source/media-source-loadedmetada-with-two-sourcebuffers.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177280 => 177281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-15 17:17:53 UTC (rev 177280)
+++ trunk/LayoutTests/ChangeLog 2014-12-15 17:29:14 UTC (rev 177281)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-12-15 Bartlomiej Gajda <b.gajda@samsung.com>
+
+ [MSE] Prevent SourceBuffer monitoring algorithm from triggering a HAVE_NOTHING to HAVE_METADATA transition.
+ https://bugs.webkit.org/show_bug.cgi?id=139444
+
+ Reviewed by Jer Noble.
+
+ Added test to check how many active SourceBuffers exist when loadedmetadata fires,
+ according to spec 3.5.7, this should be equal to number of sourcebuffers.
+
+ * media/media-source/media-source-loadedmetada-with-two-sourcebuffers-expected.txt: Added.
+ * media/media-source/media-source-loadedmetada-with-two-sourcebuffers.html: Added.
+
</ins><span class="cx"> 2014-12-14 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Add some more slow tests to TestExpectations.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourceloadedmetadawithtwosourcebuffersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-loadedmetada-with-two-sourcebuffers-expected.txt (0 => 177281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-loadedmetada-with-two-sourcebuffers-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-loadedmetada-with-two-sourcebuffers-expected.txt 2014-12-15 17:29:14 UTC (rev 177281)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+
+RUN(video.src = URL.createObjectURL(source))
+EVENT(sourceopen)
+RUN(sourceBuffer1 = source.addSourceBuffer("audio/mock; codecs=mock"))
+RUN(sourceBuffer2 = source.addSourceBuffer("video/mock; codecs=mock"))
+RUN(sourceBuffer1.appendBuffer(initSegment))
+EVENT(updateend)
+RUN(sourceBuffer2.appendBuffer(initSegment))
+EVENT(loadedmetadata)
+EVENT(updateend)
+EXPECTED (source.activeSourceBuffers.length == '2') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourceloadedmetadawithtwosourcebuffershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-loadedmetada-with-two-sourcebuffers.html (0 => 177281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-loadedmetada-with-two-sourcebuffers.html (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-loadedmetada-with-two-sourcebuffers.html 2014-12-15 17:29:14 UTC (rev 177281)
</span><span class="lines">@@ -0,0 +1,63 @@
</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 sourceBuffer1;
+ var sourceBuffer2;
+ var counter = 0;
+
+ if (window.internals)
+ internals.initializeMockMediaSource();
+
+ function runTest() {
+ findMediaElement();
+ source = new MediaSource();
+ waitForEvent('sourceopen', sourceOpen, false, false, source);
+ run('video.src = URL.createObjectURL(source)');
+ }
+
+ function sourceOpen() {
+ run('sourceBuffer1 = source.addSourceBuffer("audio/mock; codecs=mock")');
+ run('sourceBuffer2 = source.addSourceBuffer("video/mock; codecs=mock")');
+
+ waitForEventOn(sourceBuffer1, 'updateend', update1, false, true);
+ waitForEventOn(sourceBuffer2, 'updateend', update2, false, true);
+ waitForEventOnce('loadedmetadata', loadedMetadata);
+
+ initSegment = makeAInit(0, [makeATrack(1, 'mock', TRACK_KIND.AUDIO)]);
+ run('sourceBuffer1.appendBuffer(initSegment)');
+ }
+
+ function update1() {
+ counter++;
+ initSegment = makeAInit(0, [makeATrack(1, 'mock', TRACK_KIND.VIDEO)]);
+ setTimeout(function () {
+ run('sourceBuffer2.appendBuffer(initSegment)');
+ }, 200);
+ }
+
+ function update2() {
+ counter++;
+ setTimeout(function () {
+ if (counter==3) endTest();
+ }, 200);
+ }
+
+ function loadedMetadata() {
+ counter++;
+ setTimeout(function () {
+ testExpected('source.activeSourceBuffers.length', 2);
+ if (counter==3) endTest();
+ }, 200);
+ }
+
+ </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 (177280 => 177281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-15 17:17:53 UTC (rev 177280)
+++ trunk/Source/WebCore/ChangeLog 2014-12-15 17:29:14 UTC (rev 177281)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-12-15 Bartlomiej Gajda <b.gajda@samsung.com>
+
+ [MSE] Prevent SourceBuffer monitoring algorithm from triggering a HAVE_NOTHING to HAVE_METADATA transition.
+ https://bugs.webkit.org/show_bug.cgi?id=139444
+
+ Reviewed by Jer Noble.
+
+ In case of 2 SourceBuffers, there can be transition to HaveMetadata from monitorSourceBuffers,
+ even though second SourceBuffer did not receive init segment - we can't query for it's metadata
+ such as width/height (if second one was video), so we shouldn't fire the event.
+ W3 Bug reference : https://www.w3.org/Bugs/Public/show_bug.cgi?id=27542
+
+ Test: media/media-source/media-source-loadedmetada-with-two-sourcebuffers.html
+
+ * Modules/mediasource/MediaSource.cpp:
+ (WebCore::MediaSource::monitorSourceBuffers):
+ * Modules/mediasource/SourceBuffer.h:
+ * platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
+ (WebCore::mimeTypeCache):
+
</ins><span class="cx"> 2014-12-15 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Move WebCore/platform/text to std::unique_ptr
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (177280 => 177281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2014-12-15 17:17:53 UTC (rev 177280)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2014-12-15 17:29:14 UTC (rev 177281)
</span><span class="lines">@@ -246,6 +246,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // http://w3c.github.io/media-source/#buffer-monitoring, change from 11 December 2014
+ // ↳ If the the HTMLMediaElement.readyState attribute equals HAVE_NOTHING:
+ if (mediaElement()->readyState() == HTMLMediaElement::HAVE_NOTHING) {
+ // 1. Abort these steps.
+ return;
+ }
+
</ins><span class="cx"> // ↳ If buffered for all objects in activeSourceBuffers do not contain TimeRanges for the current
</span><span class="cx"> // playback position:
</span><span class="cx"> auto begin = m_activeSourceBuffers->begin();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp (177280 => 177281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 2014-12-15 17:17:53 UTC (rev 177280)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 2014-12-15 17:29:14 UTC (rev 177281)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> if (!isInitialized) {
</span><span class="cx"> isInitialized = true;
</span><span class="cx"> cache.add(ASCIILiteral("video/mock"));
</span><ins>+ cache.add(ASCIILiteral("audio/mock"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return cache;
</span></span></pre>
</div>
</div>
</body>
</html>