Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172587 => 172588)
--- 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)
@@ -1,3 +1,33 @@
+2014-08-14 Lucas Forschler <[email protected]>
+
+ Merge r172506
+
+ 2014-08-12 Jer Noble <[email protected]>
+
+ [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.
+
2014-08-13 Lucas Forschler <[email protected]>
Merge r172538
Modified: branches/safari-600.1-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (172587 => 172588)
--- 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)
@@ -71,6 +71,7 @@
MediaTime lastFrameDuration;
MediaTime highestPresentationTimestamp;
MediaTime lastEnqueuedPresentationTime;
+ MediaTime lastEnqueuedDecodeEndTime;
bool needRandomAccessFlag;
bool enabled;
bool needsReenqueueing;
@@ -83,6 +84,7 @@
, lastFrameDuration(MediaTime::invalidTime())
, highestPresentationTimestamp(MediaTime::invalidTime())
, lastEnqueuedPresentationTime(MediaTime::invalidTime())
+ , lastEnqueuedDecodeEndTime(MediaTime::invalidTime())
, needRandomAccessFlag(true)
, enabled(false)
, needsReenqueueing(false)
@@ -317,6 +319,7 @@
TrackBuffer& trackBuffer = trackBufferPair.value;
const AtomicString& trackID = trackBufferPair.key;
+ trackBuffer.needsReenqueueing = true;
reenqueueMediaForTime(trackBuffer, trackID, time);
}
}
@@ -1215,7 +1218,7 @@
// Add the coded frame with the presentation timestamp, decode timestamp, and frame duration to the track buffer.
trackBuffer.samples.addSample(sample);
- if (trackBuffer.lastEnqueuedPresentationTime.isInvalid() || presentationTimestamp > trackBuffer.lastEnqueuedPresentationTime) {
+ if (trackBuffer.lastEnqueuedDecodeEndTime.isInvalid() || decodeTimestamp >= trackBuffer.lastEnqueuedDecodeEndTime) {
DecodeOrderSampleMap::KeyType decodeKey(decodeTimestamp, presentationTimestamp);
trackBuffer.decodeQueue.insert(DecodeOrderSampleMap::MapType::value_type(decodeKey, sample));
}
@@ -1390,7 +1393,19 @@
}
RefPtr<MediaSample> sample = sampleIt->second;
+ // 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;
+
trackBuffer.lastEnqueuedPresentationTime = sample->presentationTime();
+ trackBuffer.lastEnqueuedDecodeEndTime = sample->decodeTime() + sample->duration();
m_private->enqueueSample(sample.release(), trackID);
#if !LOG_DISABLED
++enqueuedSamples;
@@ -1432,8 +1447,13 @@
m_private->flushAndEnqueueNonDisplayingSamples(nonDisplayingSamples, trackID);
- if (!nonDisplayingSamples.isEmpty())
+ if (!nonDisplayingSamples.isEmpty()) {
trackBuffer.lastEnqueuedPresentationTime = nonDisplayingSamples.last()->presentationTime();
+ trackBuffer.lastEnqueuedDecodeEndTime = nonDisplayingSamples.last()->decodeTime();
+ } else {
+ trackBuffer.lastEnqueuedPresentationTime = MediaTime::invalidTime();
+ trackBuffer.lastEnqueuedDecodeEndTime = MediaTime::invalidTime();
+ }
// Fill the decode queue with the remaining samples.
trackBuffer.decodeQueue.clear();
