<!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>[178440] branches/safari-600.5-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/178440">178440</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-01-14 12:57:52 -0800 (Wed, 14 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171316">r171316</a>. &lt;rdar://problem/19424112&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediasourceSourceBuffercpp">branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178439 => 178440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog        2015-01-14 20:57:51 UTC (rev 178439)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog        2015-01-14 20:57:52 UTC (rev 178440)
</span><span class="lines">@@ -1,5 +1,60 @@
</span><span class="cx"> 2015-01-14  Dana Burkart  &lt;dburkart@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merged r171316. &lt;rdar://problem/19424112&gt;
+
+    2014-07-21  Jer Noble  &lt;jer.noble@apple.com&gt;
+
+            [MSE] YouTube video decode error when variant-switching
+            https://bugs.webkit.org/show_bug.cgi?id=135128
+
+            Reviewed by Brent Fulgham.
+
+            Test: media/media-source/media-source-overlapping-decodetime.html
+
+            When variant-switching, the situation can arise where an existing sample with a presentation
+            timestamp of N and a decode timestamp of M, and a new sample with a presentation timestamp &gt; N
+            and the same decode timestamp of M, will keep the new sample from being added to the SampleMap.
+            This can result in a decode error when samples depending on that new, missing sample are enqueued.
+
+            The MSE spec is silent on the issue of overlapping decode timestamps. However, it guarantees that
+            presentation timestamps are non-overlapping. So instead of using just the decode timestamp as a key
+            for storing the samples in decode order, use both the decode timestamp and the presentation timestamp.
+            That ensures that samples with different presentation times but equal decode times are both inserted
+            into the decode queue, and in the correct order.
+
+            * Modules/mediasource/SampleMap.cpp:
+            (WebCore::SampleIsRandomAccess::operator()): Update the parameter type to match the new KeyType.
+            (WebCore::SampleMap::addSample): Pass both decodeTime and presentationTime as the key to decodeOrder.
+            (WebCore::SampleMap::removeSample): Ditto.
+            (WebCore::DecodeOrderSampleMap::findSampleWithDecodeKey): Renamed from findSampleWithDecodeTime.
+            (WebCore::DecodeOrderSampleMap::reverseFindSampleWithDecodeKey): renamed from reverseFindSampleWithDecodeTime.
+            (WebCore::DecodeOrderSampleMap::findSyncSamplePriorToPresentationTime): Use renamed version of above.
+            (WebCore::DecodeOrderSampleMap::findSyncSampleAfterPresentationTime): Ditto.
+            (WebCore::DecodeOrderSampleMap::findDependentSamples): Ditto.
+            (WebCore::DecodeOrderSampleMap::findSampleWithDecodeTime): Deleted.
+            (WebCore::DecodeOrderSampleMap::reverseFindSampleWithDecodeTime): Deleted.
+            * Modules/mediasource/SampleMap.h:
+            * Modules/mediasource/SourceBuffer.cpp:
+            (WebCore::SourceBuffer::removeCodedFrames): Ditto.
+            (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample): Ditto.
+            (WebCore::SourceBuffer::reenqueueMediaForTime): Ditto.
+
+    2014-07-21  Andy Estes  &lt;aestes@apple.com&gt;
+
+            [iOS] Handle QuickLook ResourceLoaders in the web process
+            https://bugs.webkit.org/show_bug.cgi?id=135113
+
+            Reviewed by David Kilzer.
+
+            No new tests. QuickLook is not testable from WebKit.
+
+            * WebCore.exp.in:
+            * loader/ResourceLoadScheduler.cpp:
+            (WebCore::ResourceLoadScheduler::maybeLoadQuickLookResource): Start loading the ResourceLoader if it is for a QuickLook resource.
+            * loader/ResourceLoadScheduler.h:
+
+2015-01-14  Dana Burkart  &lt;dburkart@apple.com&gt;
+
</ins><span class="cx">         Merged r171215. &lt;rdar://problem/19424110&gt;
</span><span class="cx"> 
</span><span class="cx">     2014-07-17  Jer Noble  &lt;jer.noble@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (178439 => 178440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp        2015-01-14 20:57:51 UTC (rev 178439)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp        2015-01-14 20:57:52 UTC (rev 178440)
</span><span class="lines">@@ -1380,12 +1380,9 @@
</span><span class="cx">         // Otherwise:
</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><ins>+        DecodeOrderSampleMap::KeyType decodeKey(decodeTimestamp, presentationTimestamp);
+        trackBuffer.decodeQueue.insert(DecodeOrderSampleMap::MapType::value_type(decodeKey, sample));
</ins><span class="cx"> 
</span><del>-        if (trackBuffer.lastEnqueuedDecodeEndTime.isInvalid() || decodeTimestamp &gt;= trackBuffer.lastEnqueuedDecodeEndTime) {
-            DecodeOrderSampleMap::KeyType decodeKey(decodeTimestamp, presentationTimestamp);
-            trackBuffer.decodeQueue.insert(DecodeOrderSampleMap::MapType::value_type(decodeKey, sample));
-        }
-
</del><span class="cx">         // 1.18 Set last decode timestamp for track buffer to decode timestamp.
</span><span class="cx">         trackBuffer.lastDecodeTimestamp = decodeTimestamp;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>