Title: [220338] branches/safari-604-branch/Source/WebCore
- Revision
- 220338
- Author
- matthew_han...@apple.com
- Date
- 2017-08-07 09:42:30 -0700 (Mon, 07 Aug 2017)
Log Message
Cherry-pick r220153. rdar://problem/33711047
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (220337 => 220338)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-08-07 16:32:24 UTC (rev 220337)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-08-07 16:42:30 UTC (rev 220338)
@@ -1,3 +1,19 @@
+2017-08-07 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r220153. rdar://problem/33711047
+
+ 2017-08-02 Jer Noble <jer.no...@apple.com>
+
+ [MSE] Removing samples when presentation order does not match decode order can cause bad behavior.
+ https://bugs.webkit.org/show_bug.cgi?id=175091
+
+ Reviewed by Eric Carlson.
+
+ Address follow-up comments to r219519.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::removeCodedFrames):
+
2017-08-02 Jason Marcell <jmarc...@apple.com>
Cherry-pick r220112. rdar://problem/33692164
Modified: branches/safari-604-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (220337 => 220338)
--- branches/safari-604-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2017-08-07 16:32:24 UTC (rev 220337)
+++ branches/safari-604-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2017-08-07 16:42:30 UTC (rev 220338)
@@ -770,7 +770,7 @@
auto removePresentationStart = trackBuffer.samples.presentationOrder().findSampleContainingOrAfterPresentationTime(start);
auto removePresentationEnd = trackBuffer.samples.presentationOrder().findSampleStartingAfterPresentationTime(end);
- if (start == end)
+ if (removePresentationStart == removePresentationEnd)
continue;
// 3.3 Remove all media data, from this track buffer, that contain starting timestamps greater than or equal to
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
