Title: [178440] branches/safari-600.5-branch/Source/WebCore
- Revision
- 178440
- Author
- [email protected]
- Date
- 2015-01-14 12:57:52 -0800 (Wed, 14 Jan 2015)
Log Message
Merged r171316. <rdar://problem/19424112>
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178439 => 178440)
--- 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)
@@ -1,5 +1,60 @@
2015-01-14 Dana Burkart <[email protected]>
+ Merged r171316. <rdar://problem/19424112>
+
+ 2014-07-21 Jer Noble <[email protected]>
+
+ [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 > 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 <[email protected]>
+
+ [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 <[email protected]>
+
Merged r171215. <rdar://problem/19424110>
2014-07-17 Jer Noble <[email protected]>
Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (178439 => 178440)
--- 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)
@@ -1380,12 +1380,9 @@
// Otherwise:
// Add the coded frame with the presentation timestamp, decode timestamp, and frame duration to the track buffer.
trackBuffer.samples.addSample(sample);
+ DecodeOrderSampleMap::KeyType decodeKey(decodeTimestamp, presentationTimestamp);
+ trackBuffer.decodeQueue.insert(DecodeOrderSampleMap::MapType::value_type(decodeKey, sample));
- if (trackBuffer.lastEnqueuedDecodeEndTime.isInvalid() || decodeTimestamp >= trackBuffer.lastEnqueuedDecodeEndTime) {
- DecodeOrderSampleMap::KeyType decodeKey(decodeTimestamp, presentationTimestamp);
- trackBuffer.decodeQueue.insert(DecodeOrderSampleMap::MapType::value_type(decodeKey, sample));
- }
-
// 1.18 Set last decode timestamp for track buffer to decode timestamp.
trackBuffer.lastDecodeTimestamp = decodeTimestamp;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
