Changeset 172007 in webkit

Timestamp:

Aug 4, 2014 2:58:13 PM (10 years ago)

Author:

jer.noble@apple.com

Message:

Unreviewed, rolling out r171992, r171995, & r172000.

The cumulative effect of those revisions was to cause decoding errors when switching resolutions on YouTube.

Reverted changesets:

​https://bugs.webkit.org/show_bug.cgi?id=135422 / ​http://trac.webkit.org/changeset/171992
​https://bugs.webkit.org/show_bug.cgi?id=135424 / ​http://trac.webkit.org/changeset/171995
​https://bugs.webkit.org/show_bug.cgi?id=135572 / ​http://trac.webkit.org/changeset/172000

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasource/SourceBuffer.cpp (modified) (7 diffs)
• Modules/mediasource/SourceBuffer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-08-04  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed, rolling out r171992, r171995, & r172000.
+
+        The cumulative effect of those revisions was to cause decoding errors when switching resolutions on YouTube.
+
+        Reverted changesets:
+
+        https://bugs.webkit.org/show_bug.cgi?id=135422 / http://trac.webkit.org/changeset/171992
+        https://bugs.webkit.org/show_bug.cgi?id=135424 / http://trac.webkit.org/changeset/171995
+        https://bugs.webkit.org/show_bug.cgi?id=135572 / http://trac.webkit.org/changeset/172000
+
 2014-08-04  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp

@@ -318 +318 @@
         const AtomicString& trackID = trackBufferPair.key;
 
-        trackBuffer.decodeQueue.clear();
         reenqueueMediaForTime(trackBuffer, trackID, time);
     }
@@ -500 +499 @@
         m_source->monitorSourceBuffers();
 
+    MediaTime currentMediaTime = MediaTime::createWithDouble(m_source->currentTime());
     for (auto& trackBufferPair : m_trackBufferMap) {
         TrackBuffer& trackBuffer = trackBufferPair.value;
@@ -505 +505 @@
 
         if (trackBuffer.needsReenqueueing) {
-            LOG(MediaSource, "SourceBuffer::sourceBufferPrivateAppendComplete(%p) - reenqueuing", this);
-            reenqueueMediaForCurrentTime(trackBuffer, trackID);
+            LOG(MediaSource, "SourceBuffer::sourceBufferPrivateAppendComplete(%p) - reenqueuing at time (%s)", this, toString(currentMediaTime).utf8().data());
+            reenqueueMediaForTime(trackBuffer, trackID, currentMediaTime);
         } else
             provideMediaData(trackBuffer, trackID);
@@ -1209 +1209 @@
         trackBuffer.samples.addSample(sample);
 
-        if (frameEndTimestamp > MediaTime::createWithDouble(m_source->currentTime())) {
-            DecodeOrderSampleMap::KeyType decodeKey(decodeTimestamp, presentationTimestamp);
-            trackBuffer.decodeQueue.insert(DecodeOrderSampleMap::MapType::value_type(decodeKey, sample));
-        }
+        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.
@@ -1365 +1363 @@
         return;
 
-    TrackBuffer& trackBuffer = it->value;
-    if (!trackBuffer.needsReenqueueing)
-        provideMediaData(trackBuffer, trackID);
+    provideMediaData(it->value, trackID);
 }
 
@@ -1396 +1392 @@
 }
 
-void SourceBuffer::reenqueueMediaForCurrentTime(TrackBuffer& trackBuffer, AtomicString trackID)
-{
-    if (!trackBuffer.decodeQueue.empty()) {
-        // If the decodeQueue is not empty, attempt to find the next sync sample after the last enqueued presentation time.
-        auto nextSyncSampleIter = trackBuffer.samples.decodeOrder().findSyncSampleAfterPresentationTime(trackBuffer.lastEnqueuedPresentationTime);
-
-        auto decodeEnd = trackBuffer.samples.decodeOrder().end();
-        if (nextSyncSampleIter != decodeEnd) {
-            // If a sync sample is found, remove all existing samples from the decode queue whose decodeTimestamps are
-            // greater-than-or-equal-to the sync sample's decodeTimestamp.
-            auto firstEnqueuedSampleToRemoveIter = trackBuffer.decodeQueue.lower_bound(nextSyncSampleIter->first);
-            trackBuffer.decodeQueue.erase(firstEnqueuedSampleToRemoveIter, trackBuffer.decodeQueue.end());
-
-            // Add the replacement samples, starting from the sync sample, to the decode queue.
-            for (auto iter = nextSyncSampleIter; iter != decodeEnd; ++iter)
-                trackBuffer.decodeQueue.insert(*iter);
-            trackBuffer.needsReenqueueing = false;
-
-            // And provide those replacement samples to the decoder.
-            provideMediaData(trackBuffer, trackID);
-            return;
-        }
-    }
-
-    reenqueueMediaForTime(trackBuffer, trackID, MediaTime::createWithDouble(m_source->currentTime()));
-}
-
 void SourceBuffer::reenqueueMediaForTime(TrackBuffer& trackBuffer, AtomicString trackID, const MediaTime& time)
 {
@@ -1452 +1421 @@
 
     m_private->flushAndEnqueueNonDisplayingSamples(nonDisplayingSamples, trackID);
-    if (!nonDisplayingSamples.isEmpty())
-        trackBuffer.lastEnqueuedPresentationTime = nonDisplayingSamples.last()->presentationTime();
 
     // Fill the decode queue with the remaining samples.

trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h

@@ -151 +151 @@
 
     struct TrackBuffer;
-    void reenqueueMediaForCurrentTime(TrackBuffer&, AtomicString trackID);
     void reenqueueMediaForTime(TrackBuffer&, AtomicString trackID, const MediaTime&);
     void provideMediaData(TrackBuffer&, AtomicString trackID);