Changeset 202641 in webkit

Timestamp:

Jun 29, 2016 12:22:59 PM (8 years ago)

Author:

jer.noble@apple.com

Message:

Cannot clear a MediaSource SourceBuffer in Safari 9 and WebKit nightly
​https://bugs.webkit.org/show_bug.cgi?id=159230

Reviewed by Eric Carlson.

Source/WebCore:

Test: media/media-source/media-source-remove.html (modified)

Move to using a MediaTime directly (rather than as a double) to add
and removed buffered ranges. Also, drop the use of the "microsecond"
fudge factor when adding buffered ranges.

• Modules/mediasource/SourceBuffer.cpp:

(WebCore::removeSamplesFromTrackBuffer):
(WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample):

LayoutTests:

• media/media-source/media-source-remove.html:
• media/media-source/media-source-remove-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-source/media-source-remove-expected.txt (modified) (1 diff)
• LayoutTests/media/media-source/media-source-remove.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediasource/SourceBuffer.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-29  Jer Noble  <jer.noble@apple.com>
+
+        Cannot clear a MediaSource SourceBuffer in Safari 9 and WebKit nightly
+        https://bugs.webkit.org/show_bug.cgi?id=159230
+
+        Reviewed by Eric Carlson.
+
+        * media/media-source/media-source-remove.html:
+        * media/media-source/media-source-remove-expected.txt:
+
 2016-06-29  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/LayoutTests/media/media-source/media-source-remove-expected.txt

@@ -10 +10 @@
 RUN(sourceBuffer.remove(0, 2))
 EVENT(updateend)
-EXPECTED (sourceBuffer.buffered.start(0).toFixed(1) == '4') OK
+EXPECTED (sourceBuffer.buffered.start(0) == '4') OK
 END OF TEST
 

trunk/LayoutTests/media/media-source/media-source-remove.html

@@ -49 +49 @@
 
     function checkRemoved() {
-        testExpected('sourceBuffer.buffered.start(0).toFixed(1)', 4);
+        testExpected('sourceBuffer.buffered.start(0)', 4);
         endTest();
     }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-29  Jer Noble  <jer.noble@apple.com>
+
+        Cannot clear a MediaSource SourceBuffer in Safari 9 and WebKit nightly
+        https://bugs.webkit.org/show_bug.cgi?id=159230
+
+        Reviewed by Eric Carlson.
+
+        Test: media/media-source/media-source-remove.html (modified)
+
+        Move to using a MediaTime directly (rather than as a double) to add
+        and removed buffered ranges. Also, drop the use of the "microsecond"
+        fudge factor when adding buffered ranges.
+
+        * Modules/mediasource/SourceBuffer.cpp:
+        (WebCore::removeSamplesFromTrackBuffer):
+        (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample):
+
 2016-06-29  Jiewen Tan  <jiewen_tan@apple.com>
 

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

@@ -656 +656 @@
 {
 #if !LOG_DISABLED
-    double earliestSample = std::numeric_limits<double>::infinity();
-    double latestSample = 0;
+    MediaTime earliestSample = MediaTime::positiveInfiniteTime();
+    MediaTime latestSample = MediaTime::zeroTime();
     size_t bytesRemoved = 0;
 #else
@@ -665 +665 @@
 
     auto erasedRanges = TimeRanges::create();
-    MediaTime microsecond(1, 1000000);
     for (auto sampleIt : samples) {
         const DecodeOrderSampleMap::KeyType& decodeKey = sampleIt.first;
@@ -681 +680 @@
         trackBuffer.decodeQueue.erase(decodeKey);
 
-        double startTime = sample->presentationTime().toDouble();
-        double endTime = startTime + (sample->duration() + microsecond).toDouble();
-        erasedRanges->add(startTime, endTime);
+        auto startTime = sample->presentationTime();
+        auto endTime = startTime + sample->duration();
+        erasedRanges->ranges().add(startTime, endTime);
 
 #if !LOG_DISABLED
@@ -696 +695 @@
 #if !LOG_DISABLED
     if (bytesRemoved)
-        LOG(MediaSource, "SourceBuffer::%s(%p) removed %zu bytes, start(%lf), end(%lf)", logPrefix, buffer, bytesRemoved, earliestSample, latestSample);
+        LOG(MediaSource, "SourceBuffer::%s(%p) removed %zu bytes, start(%lf), end(%lf)", logPrefix, buffer, bytesRemoved, earliestSample.toDouble(), latestSample.toDouble());
 #endif
 
@@ -1587 +1586 @@
             m_timestampOffset = frameEndTimestamp;
 
-        m_buffered->add(presentationTimestamp.toDouble(), (presentationTimestamp + frameDuration + microsecond).toDouble());
+        m_buffered->ranges().add(presentationTimestamp, presentationTimestamp + frameDuration);
         m_bufferedSinceLastMonitor += frameDuration.toDouble();
         setBufferedDirty(true);