Changeset 176594 in webkit

Timestamp:

Dec 1, 2014, 11:01:50 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[MSE] Unset timestamps of trackbuffers during Reset Parser State algorithm.
​https://bugs.webkit.org/show_bug.cgi?id=139075.

Patch by Bartlomiej Gajda <​b.gajda@samsung.com> on 2014-12-01
Reviewed by Jer Noble.

Source/WebCore:

Specification requires from us to unset timestamps for trackBuffers
during abort() method.

Test: media/media-source/media-source-append-nonsync-sample-after-abort.html

• Modules/mediasource/SourceBuffer.cpp:

(WebCore::SourceBuffer::resetParserState):
(WebCore::SourceBuffer::abort):

• Modules/mediasource/SourceBuffer.h:

LayoutTests:

Specification requires from us to unset timestamps for trackBuffers during abort() method.
Tests appendBuffer() with first sync sample, then aborts after a few more samples, and emits
a few more non-sync samples, so they should be dropped, as trackBuffer will have
needRandomAccessFlag set.

• media/media-source/media-source-append-nonsync-sample-after-abort-expected.txt: Added.
• media/media-source/media-source-append-nonsync-sample-after-abort.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-source/media-source-append-nonsync-sample-after-abort-expected.txt (added)
• LayoutTests/media/media-source/media-source-append-nonsync-sample-after-abort.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediasource/SourceBuffer.cpp (modified) (2 diffs)
• Source/WebCore/Modules/mediasource/SourceBuffer.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-12-01  Bartlomiej Gajda  <b.gajda@samsung.com>
+
+        [MSE] Unset timestamps of trackbuffers during Reset Parser State algorithm.
+        https://bugs.webkit.org/show_bug.cgi?id=139075.
+
+        Reviewed by Jer Noble.
+
+        Specification requires from us to unset timestamps for trackBuffers during abort() method.
+        Tests appendBuffer() with first sync sample, then aborts after a few more samples, and emits
+        a few more non-sync samples, so they should be dropped, as trackBuffer will have
+        needRandomAccessFlag set.
+
+        * media/media-source/media-source-append-nonsync-sample-after-abort-expected.txt: Added.
+        * media/media-source/media-source-append-nonsync-sample-after-abort.html: Added.
+
 2014-11-28  Andrzej Badowski  <a.badowski@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-12-01  Bartlomiej Gajda  <b.gajda@samsung.com>
+
+        [MSE] Unset timestamps of trackbuffers during Reset Parser State algorithm.
+        https://bugs.webkit.org/show_bug.cgi?id=139075.
+
+        Reviewed by Jer Noble.
+
+        Specification requires from us to unset timestamps for trackBuffers
+        during abort() method.
+
+        Test: media/media-source/media-source-append-nonsync-sample-after-abort.html
+
+        * Modules/mediasource/SourceBuffer.cpp:
+        (WebCore::SourceBuffer::resetParserState):
+        (WebCore::SourceBuffer::abort):
+        * Modules/mediasource/SourceBuffer.h:
+
 2014-12-01  Chris Dumez  <cdumez@apple.com>
 

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

@@ -218 +218 @@
 }
 
+void SourceBuffer::resetParserState()
+{
+    // Section 3.5.2 Reset Parser State algorithm steps.
+    // http://www.w3.org/TR/2014/CR-media-source-20140717/#sourcebuffer-reset-parser-state
+    // 1. If the append state equals PARSING_MEDIA_SEGMENT and the input buffer contains some complete coded frames,
+    //    then run the coded frame processing algorithm until all of these complete coded frames have been processed.
+    // FIXME: If any implementation will work in pulling mode (instead of async push to SourceBufferPrivate, and forget)
+    //     this should be handled somehow either here, or in m_private->abort();
+
+    // 2. Unset the last decode timestamp on all track buffers.
+    // 3. Unset the last frame duration on all track buffers.
+    // 4. Unset the highest presentation timestamp on all track buffers.
+    // 5. Set the need random access point flag on all track buffers to true.
+    for (auto& trackBufferPair : m_trackBufferMap.values()) {
+        trackBufferPair.lastDecodeTimestamp = MediaTime::invalidTime();
+        trackBufferPair.lastFrameDuration = MediaTime::invalidTime();
+        trackBufferPair.highestPresentationTimestamp = MediaTime::invalidTime();
+        trackBufferPair.needRandomAccessFlag = true;
+    }
+    // 6. Remove all bytes from the input buffer.
+    // Note: this is handled by abortIfUpdating()
+    // 7. Set append state to WAITING_FOR_SEGMENT.
+    m_appendState = WaitingForSegment;
+
+    m_private->abort();
+}
+
 void SourceBuffer::abort(ExceptionCode& ec)
 {
@@ -235 +262 @@
 
     // 4. Run the reset parser state algorithm.
-    m_private->abort();
+    resetParserState();
 
     // FIXME(229408) Add steps 5-6 update appendWindowStart & appendWindowEnd.

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

@@ -154 +154 @@
     void appendBufferInternal(unsigned char*, unsigned, ExceptionCode&);
     void appendBufferTimerFired();
+    void resetParserState();
 
     void setActive(bool);