<!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>[202641] 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/202641">202641</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-06-29 12:22:59 -0700 (Wed, 29 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cannot clear a MediaSource SourceBuffer in Safari 9 and WebKit nightly
https://bugs.webkit.org/show_bug.cgi?id=159230
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/media-source/media-source-remove.html (modified)
Move to using a MediaTime directly (rather than as a double) to add
and removed buffered ranges. Also, drop the use of the "microsecond"
fudge factor when adding buffered ranges.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::removeSamplesFromTrackBuffer):
(WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample):
LayoutTests:
* media/media-source/media-source-remove.html:
* media/media-source/media-source-remove-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourceremoveexpectedtxt">trunk/LayoutTests/media/media-source/media-source-remove-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourceremovehtml">trunk/LayoutTests/media/media-source/media-source-remove.html</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202640 => 202641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-29 19:19:24 UTC (rev 202640)
+++ trunk/LayoutTests/ChangeLog 2016-06-29 19:22:59 UTC (rev 202641)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-29 Jer Noble <jer.noble@apple.com>
+
+ Cannot clear a MediaSource SourceBuffer in Safari 9 and WebKit nightly
+ https://bugs.webkit.org/show_bug.cgi?id=159230
+
+ Reviewed by Eric Carlson.
+
+ * media/media-source/media-source-remove.html:
+ * media/media-source/media-source-remove-expected.txt:
+
</ins><span class="cx"> 2016-06-29 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Show Shadow Root type in DOM Tree
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourceremoveexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/media-source/media-source-remove-expected.txt (202640 => 202641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-remove-expected.txt 2016-06-29 19:19:24 UTC (rev 202640)
+++ trunk/LayoutTests/media/media-source/media-source-remove-expected.txt 2016-06-29 19:22:59 UTC (rev 202641)
</span><span class="lines">@@ -9,6 +9,6 @@
</span><span class="cx"> EVENT(updateend)
</span><span class="cx"> RUN(sourceBuffer.remove(0, 2))
</span><span class="cx"> EVENT(updateend)
</span><del>-EXPECTED (sourceBuffer.buffered.start(0).toFixed(1) == '4') OK
</del><ins>+EXPECTED (sourceBuffer.buffered.start(0) == '4') OK
</ins><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourceremovehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/media-source/media-source-remove.html (202640 => 202641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-remove.html 2016-06-29 19:19:24 UTC (rev 202640)
+++ trunk/LayoutTests/media/media-source/media-source-remove.html 2016-06-29 19:22:59 UTC (rev 202641)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function checkRemoved() {
</span><del>- testExpected('sourceBuffer.buffered.start(0).toFixed(1)', 4);
</del><ins>+ testExpected('sourceBuffer.buffered.start(0)', 4);
</ins><span class="cx"> endTest();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202640 => 202641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-29 19:19:24 UTC (rev 202640)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 19:22:59 UTC (rev 202641)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-29 Jer Noble <jer.noble@apple.com>
+
+ Cannot clear a MediaSource SourceBuffer in Safari 9 and WebKit nightly
+ https://bugs.webkit.org/show_bug.cgi?id=159230
+
+ Reviewed by Eric Carlson.
+
+ Test: media/media-source/media-source-remove.html (modified)
+
+ Move to using a MediaTime directly (rather than as a double) to add
+ and removed buffered ranges. Also, drop the use of the "microsecond"
+ fudge factor when adding buffered ranges.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::removeSamplesFromTrackBuffer):
+ (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample):
+
</ins><span class="cx"> 2016-06-29 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, second attempt to fix ASAN build for r202599
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (202640 => 202641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2016-06-29 19:19:24 UTC (rev 202640)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2016-06-29 19:22:59 UTC (rev 202641)
</span><span class="lines">@@ -655,8 +655,8 @@
</span><span class="cx"> static PassRefPtr<TimeRanges> removeSamplesFromTrackBuffer(const DecodeOrderSampleMap::MapType& samples, SourceBuffer::TrackBuffer& trackBuffer, const SourceBuffer* buffer, const char* logPrefix)
</span><span class="cx"> {
</span><span class="cx"> #if !LOG_DISABLED
</span><del>- double earliestSample = std::numeric_limits<double>::infinity();
- double latestSample = 0;
</del><ins>+ MediaTime earliestSample = MediaTime::positiveInfiniteTime();
+ MediaTime latestSample = MediaTime::zeroTime();
</ins><span class="cx"> size_t bytesRemoved = 0;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(logPrefix);
</span><span class="lines">@@ -664,7 +664,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> auto erasedRanges = TimeRanges::create();
</span><del>- MediaTime microsecond(1, 1000000);
</del><span class="cx"> for (auto sampleIt : samples) {
</span><span class="cx"> const DecodeOrderSampleMap::KeyType& decodeKey = sampleIt.first;
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="lines">@@ -680,9 +679,9 @@
</span><span class="cx"> // Also remove the erased samples from the TrackBuffer decodeQueue.
</span><span class="cx"> trackBuffer.decodeQueue.erase(decodeKey);
</span><span class="cx">
</span><del>- double startTime = sample->presentationTime().toDouble();
- double endTime = startTime + (sample->duration() + microsecond).toDouble();
- erasedRanges->add(startTime, endTime);
</del><ins>+ auto startTime = sample->presentationTime();
+ auto endTime = startTime + sample->duration();
+ erasedRanges->ranges().add(startTime, endTime);
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> bytesRemoved += startBufferSize - trackBuffer.samples.sizeInBytes();
</span><span class="lines">@@ -695,7 +694,7 @@
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> if (bytesRemoved)
</span><del>- LOG(MediaSource, "SourceBuffer::%s(%p) removed %zu bytes, start(%lf), end(%lf)", logPrefix, buffer, bytesRemoved, earliestSample, latestSample);
</del><ins>+ LOG(MediaSource, "SourceBuffer::%s(%p) removed %zu bytes, start(%lf), end(%lf)", logPrefix, buffer, bytesRemoved, earliestSample.toDouble(), latestSample.toDouble());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return WTFMove(erasedRanges);
</span><span class="lines">@@ -1586,7 +1585,7 @@
</span><span class="cx"> if (m_shouldGenerateTimestamps)
</span><span class="cx"> m_timestampOffset = frameEndTimestamp;
</span><span class="cx">
</span><del>- m_buffered->add(presentationTimestamp.toDouble(), (presentationTimestamp + frameDuration + microsecond).toDouble());
</del><ins>+ m_buffered->ranges().add(presentationTimestamp, presentationTimestamp + frameDuration);
</ins><span class="cx"> m_bufferedSinceLastMonitor += frameDuration.toDouble();
</span><span class="cx"> setBufferedDirty(true);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>