Title: [171244] tags/Safari-538.46.41/Source/WebCore
- Revision
- 171244
- Author
- [email protected]
- Date
- 2014-07-18 14:30:50 -0700 (Fri, 18 Jul 2014)
Log Message
Rollout r171236. <rdar://problem/17721209>
Modified Paths
Diff
Modified: tags/Safari-538.46.41/Source/WebCore/ChangeLog (171243 => 171244)
--- tags/Safari-538.46.41/Source/WebCore/ChangeLog 2014-07-18 21:26:11 UTC (rev 171243)
+++ tags/Safari-538.46.41/Source/WebCore/ChangeLog 2014-07-18 21:30:50 UTC (rev 171244)
@@ -1,5 +1,9 @@
2014-07-18 Lucas Forschler <[email protected]>
+ Rollout r171215
+
+2014-07-18 Lucas Forschler <[email protected]>
+
Merge r171215
2014-07-17 Jer Noble <[email protected]>
Modified: tags/Safari-538.46.41/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (171243 => 171244)
--- tags/Safari-538.46.41/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2014-07-18 21:26:11 UTC (rev 171243)
+++ tags/Safari-538.46.41/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2014-07-18 21:30:50 UTC (rev 171244)
@@ -575,13 +575,6 @@
erasedRanges->add(startTime, endTime);
}
- // Only force the TrackBuffer to re-enqueue if the removed ranges overlap with enqueued and possibly
- // not yet displayed samples.
- PlatformTimeRanges possiblyEnqueuedRanges(currentMediaTime, trackBuffer.lastEnqueuedPresentationTime);
- possiblyEnqueuedRanges.intersectWith(erasedRanges->ranges());
- if (possiblyEnqueuedRanges.length())
- trackBuffer.needsReenqueueing = true;
-
erasedRanges->invert();
m_buffered->intersectWith(*erasedRanges);
@@ -590,6 +583,8 @@
// the HTMLMediaElement.readyState attribute to HAVE_METADATA and stall playback.
if (m_active && currentMediaTime >= start && currentMediaTime < end && m_private->readyState() > MediaPlayer::HaveMetadata)
m_private->setReadyState(MediaPlayer::HaveMetadata);
+
+ trackBuffer.needsReenqueueing = true;
}
// 4. If buffer full flag equals true and this object is ready to accept more bytes, then set the buffer full flag to false.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
