<!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>[172588] branches/safari-600.1-branch/Source/WebCore</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/172588">172588</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-14 09:27:08 -0700 (Thu, 14 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172506">r172506</a>. <rdar://problem/17810998></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreModulesmediasourceSourceBuffercpp">branches/safari-600.1-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172587 => 172588)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-14 16:21:06 UTC (rev 172587)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-14 16:27:08 UTC (rev 172588)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-08-14 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172506
+
+ 2014-08-12 Jer Noble <jer.noble@apple.com>
+
+ [MSE] YouTube will lose audio, video after seeking backwards to an unbuffered range.
+ https://bugs.webkit.org/show_bug.cgi?id=135855
+
+ Reviewed by Eric Carlson.
+
+ When seeking into an unbuffered or partially buffered range, we will unconditionally pass samples to the
+ decode queue even if there exist large gaps between those samples. Subsequently, the decoder will not
+ notify us that it has become ready for new samples until playback reaches those later samples and the samples
+ are discarded.
+
+ When sending samples to be decoded in provideMediaData(), stop if there exists a large gap in the sample timeline.
+ Do this by tracking the last enqueued decode end time, and look to see if the next sample's decode time indicates
+ a gap of greater than 1 second.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::TrackBuffer::TrackBuffer): Initialize lastEnqueuedDecodeEndTime.
+ (WebCore::SourceBuffer::seekToTime): Set needsReenqueueing, in case samples do not yet exist in the trackBuffer
+ sufficient to re-enqueue for the destination time, so that re-enqueueing will occur after the next append.
+ (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample): Check against lastEnqueuedDecodeEndTime, rather than
+ lastEnqueuedPresentationTime before adding samples to the decodeQueue.
+ (WebCore::SourceBuffer::provideMediaData): Stop when we reach a large gap between samples.
+ (WebCore::SourceBuffer::reenqueueMediaForTime): Set or clear lastEnqueuedDecodeEndTime based on whether we
+ have appended any non-displaying samples after flushing.
+
</ins><span class="cx"> 2014-08-13 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172538
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (172587 => 172588)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2014-08-14 16:21:06 UTC (rev 172587)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2014-08-14 16:27:08 UTC (rev 172588)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> MediaTime lastFrameDuration;
</span><span class="cx"> MediaTime highestPresentationTimestamp;
</span><span class="cx"> MediaTime lastEnqueuedPresentationTime;
</span><ins>+ MediaTime lastEnqueuedDecodeEndTime;
</ins><span class="cx"> bool needRandomAccessFlag;
</span><span class="cx"> bool enabled;
</span><span class="cx"> bool needsReenqueueing;
</span><span class="lines">@@ -83,6 +84,7 @@
</span><span class="cx"> , lastFrameDuration(MediaTime::invalidTime())
</span><span class="cx"> , highestPresentationTimestamp(MediaTime::invalidTime())
</span><span class="cx"> , lastEnqueuedPresentationTime(MediaTime::invalidTime())
</span><ins>+ , lastEnqueuedDecodeEndTime(MediaTime::invalidTime())
</ins><span class="cx"> , needRandomAccessFlag(true)
</span><span class="cx"> , enabled(false)
</span><span class="cx"> , needsReenqueueing(false)
</span><span class="lines">@@ -317,6 +319,7 @@
</span><span class="cx"> TrackBuffer& trackBuffer = trackBufferPair.value;
</span><span class="cx"> const AtomicString& trackID = trackBufferPair.key;
</span><span class="cx">
</span><ins>+ trackBuffer.needsReenqueueing = true;
</ins><span class="cx"> reenqueueMediaForTime(trackBuffer, trackID, time);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1215,7 +1218,7 @@
</span><span class="cx"> // Add the coded frame with the presentation timestamp, decode timestamp, and frame duration to the track buffer.
</span><span class="cx"> trackBuffer.samples.addSample(sample);
</span><span class="cx">
</span><del>- if (trackBuffer.lastEnqueuedPresentationTime.isInvalid() || presentationTimestamp > trackBuffer.lastEnqueuedPresentationTime) {
</del><ins>+ if (trackBuffer.lastEnqueuedDecodeEndTime.isInvalid() || decodeTimestamp >= trackBuffer.lastEnqueuedDecodeEndTime) {
</ins><span class="cx"> DecodeOrderSampleMap::KeyType decodeKey(decodeTimestamp, presentationTimestamp);
</span><span class="cx"> trackBuffer.decodeQueue.insert(DecodeOrderSampleMap::MapType::value_type(decodeKey, sample));
</span><span class="cx"> }
</span><span class="lines">@@ -1390,7 +1393,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaSample> sample = sampleIt->second;
</span><ins>+ // Do not enqueue samples spanning a significant unbuffered gap.
+ // NOTE: one second is somewhat arbitrary. MediaSource::monitorSourceBuffers() is run
+ // on the playbackTimer, which is effectively every 350ms. Allowing > 350ms gap between
+ // enqueued samples allows for situations where we overrun the end of a buffered range
+ // but don't notice for 350s of playback time, and the client can enqueue data for the
+ // new current time without triggering this early return.
+ // FIXME(135867): Make this gap detection logic less arbitrary.
+ MediaTime oneSecond(1, 1);
+ if (trackBuffer.lastEnqueuedDecodeEndTime.isValid() && sample->decodeTime() - trackBuffer.lastEnqueuedDecodeEndTime > oneSecond)
+ break;
+
</ins><span class="cx"> trackBuffer.lastEnqueuedPresentationTime = sample->presentationTime();
</span><ins>+ trackBuffer.lastEnqueuedDecodeEndTime = sample->decodeTime() + sample->duration();
</ins><span class="cx"> m_private->enqueueSample(sample.release(), trackID);
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> ++enqueuedSamples;
</span><span class="lines">@@ -1432,8 +1447,13 @@
</span><span class="cx">
</span><span class="cx"> m_private->flushAndEnqueueNonDisplayingSamples(nonDisplayingSamples, trackID);
</span><span class="cx">
</span><del>- if (!nonDisplayingSamples.isEmpty())
</del><ins>+ if (!nonDisplayingSamples.isEmpty()) {
</ins><span class="cx"> trackBuffer.lastEnqueuedPresentationTime = nonDisplayingSamples.last()->presentationTime();
</span><ins>+ trackBuffer.lastEnqueuedDecodeEndTime = nonDisplayingSamples.last()->decodeTime();
+ } else {
+ trackBuffer.lastEnqueuedPresentationTime = MediaTime::invalidTime();
+ trackBuffer.lastEnqueuedDecodeEndTime = MediaTime::invalidTime();
+ }
</ins><span class="cx">
</span><span class="cx"> // Fill the decode queue with the remaining samples.
</span><span class="cx"> trackBuffer.decodeQueue.clear();
</span></span></pre>
</div>
</div>
</body>
</html>