<!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>[160739] 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/160739">160739</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2013-12-17 16:57:44 -0800 (Tue, 17 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MSE] Update duration after appending samples, per spec.
https://bugs.webkit.org/show_bug.cgi?id=125703
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/media-source/media-source-duration-after-append.html
After appending a sample, update the MediaSource duration if the sample's
presentation end time is greater than the existing duration.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm:
(WebCore::MediaSourcePrivateAVFObjC::setDuration): Notify the MediaPlayer.
LayoutTests:
* media/media-source/media-source-duration-after-append-expected.txt: Added.
* media/media-source/media-source-duration-after-append.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="#trunkSourceWebCoreModulesmediasourceSourceBuffercpp">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaSourcePrivateAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourcedurationafterappendexpectedtxt">trunk/LayoutTests/media/media-source/media-source-duration-after-append-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourcedurationafterappendhtml">trunk/LayoutTests/media/media-source/media-source-duration-after-append.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160738 => 160739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-18 00:56:39 UTC (rev 160738)
+++ trunk/LayoutTests/ChangeLog 2013-12-18 00:57:44 UTC (rev 160739)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-17 Jer Noble <jer.noble@apple.com>
+
+ [MSE] Update duration after appending samples, per spec.
+ https://bugs.webkit.org/show_bug.cgi?id=125703
+
+ Reviewed by Eric Carlson.
+
+ * media/media-source/media-source-duration-after-append-expected.txt: Added.
+ * media/media-source/media-source-duration-after-append.html: Added.
+
</ins><span class="cx"> 2013-12-17 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Video element's width and height content attributes should not influence intrinsic width and height
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourcedurationafterappendexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-duration-after-append-expected.txt (0 => 160739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-duration-after-append-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-duration-after-append-expected.txt 2013-12-18 00:57:44 UTC (rev 160739)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+
+EVENT(sourceopen)
+RUN(sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock"))
+RUN(sourceBuffer.appendBuffer(initSegment))
+EVENT(updateend)
+EXPECTED (video.duration == '0') OK
+RUN(sourceBuffer.appendBuffer(sample))
+EVENT(updateend)
+EXPECTED (video.duration == '10') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourcedurationafterappendhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-duration-after-append.html (0 => 160739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-duration-after-append.html (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-duration-after-append.html 2013-12-18 00:57:44 UTC (rev 160739)
</span><span class="lines">@@ -0,0 +1,48 @@
</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();
+ 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(0, [makeATrack(1, 'mock', TRACK_KIND.VIDEO)]);
+ run('sourceBuffer.appendBuffer(initSegment)');
+ }
+
+ function loadSamples() {
+ testExpected('video.duration', 0);
+ sample = makeASample(0, 0, 10, 1, SAMPLE_FLAG.SYNC);
+ waitForEventOn(sourceBuffer, 'updateend', checkDuration, false, true);
+ run('sourceBuffer.appendBuffer(sample)');
+ }
+
+ function checkDuration() {
+ testExpected('video.duration', 10);
+ endTest();
+ }
+
+ </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 (160738 => 160739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-18 00:56:39 UTC (rev 160738)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 00:57:44 UTC (rev 160739)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2013-12-17 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><ins>+ [MSE] Update duration after appending samples, per spec.
+ https://bugs.webkit.org/show_bug.cgi?id=125703
+
+ Reviewed by Eric Carlson.
+
+ Test: media/media-source/media-source-duration-after-append.html
+
+ After appending a sample, update the MediaSource duration if the sample's
+ presentation end time is greater than the existing duration.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm:
+ (WebCore::MediaSourcePrivateAVFObjC::setDuration): Notify the MediaPlayer.
+
+2013-12-17 Jer Noble <jer.noble@apple.com>
+
</ins><span class="cx"> [MSE][Mac] Null-deref in CMSampleBufferIsRandomAccess().
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125698
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (160738 => 160739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2013-12-18 00:56:39 UTC (rev 160738)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2013-12-18 00:57:44 UTC (rev 160739)
</span><span class="lines">@@ -1001,6 +1001,13 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> } while (1);
</span><ins>+
+ // Steps 2-4 will be handled by MediaSource::monitorSourceBuffers()
+
+ // 5. If the media segment contains data beyond the current duration, then run the duration change algorithm with new
+ // duration set to the maximum of the current duration and the highest end timestamp reported by HTMLMediaElement.buffered.
+ if (highestPresentationEndTimestamp().toDouble() > m_source->duration())
+ m_source->setDuration(highestPresentationEndTimestamp().toDouble(), IgnorableExceptionCode());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SourceBuffer::sourceBufferPrivateHasAudio(const SourceBufferPrivate*) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (160738 => 160739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2013-12-18 00:56:39 UTC (rev 160738)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2013-12-18 00:57:44 UTC (rev 160739)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> void seekInternal(double, double, double);
</span><span class="cx"> void setLoadingProgresssed(bool flag) { m_loadingProgressed = flag; }
</span><span class="cx"> void setHasAvailableVideoFrame(bool flag) { m_hasAvailableVideoFrame = flag; }
</span><ins>+ void durationChanged();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // MediaPlayerPrivateInterface
</span><span class="lines">@@ -136,7 +137,6 @@
</span><span class="cx">
</span><span class="cx"> void ensureLayer();
</span><span class="cx"> void destroyLayer();
</span><del>- void durationChanged();
</del><span class="cx">
</span><span class="cx"> // MediaPlayer Factory Methods
</span><span class="cx"> static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaSourcePrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm (160738 => 160739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm 2013-12-18 00:56:39 UTC (rev 160738)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm 2013-12-18 00:57:44 UTC (rev 160739)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_duration = duration;
</span><ins>+ m_player->durationChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSourcePrivateAVFObjC::markEndOfStream(EndOfStreamStatus status)
</span></span></pre>
</div>
</div>
</body>
</html>