Changeset 179738 in webkit

Timestamp:

Feb 5, 2015 7:55:10 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r179725.
​https://bugs.webkit.org/show_bug.cgi?id=141320

caused 2 layout tests to fail (Requested by zalan on #webkit).

Reverted changeset:

"[MSE] Implement Append Error algorithm."
​https://bugs.webkit.org/show_bug.cgi?id=139439
​http://trac.webkit.org/changeset/179725

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-source/media-source-append-media-segment-without-init-expected.txt (deleted)
• LayoutTests/media/media-source/media-source-append-media-segment-without-init.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediasource/SourceBuffer.cpp (modified) (11 diffs)
• Source/WebCore/Modules/mediasource/SourceBuffer.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-02-05  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r179725.
+        https://bugs.webkit.org/show_bug.cgi?id=141320
+
+        caused 2 layout tests to fail (Requested by zalan on #webkit).
+
+        Reverted changeset:
+
+        "[MSE] Implement Append Error algorithm."
+        https://bugs.webkit.org/show_bug.cgi?id=139439
+        http://trac.webkit.org/changeset/179725
+
 2015-02-05  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-05  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r179725.
+        https://bugs.webkit.org/show_bug.cgi?id=141320
+
+        caused 2 layout tests to fail (Requested by zalan on #webkit).
+
+        Reverted changeset:
+
+        "[MSE] Implement Append Error algorithm."
+        https://bugs.webkit.org/show_bug.cgi?id=139439
+        http://trac.webkit.org/changeset/179725
+
 2015-02-05  Andreas Kling  <akling@apple.com>
 

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

@@ -617 +617 @@
 
     // 2. If the input buffer contains bytes that violate the SourceBuffer byte stream format specification,
-    // then run the append error algorithm with the decode error parameter set to true and abort this algorithm.
+    // then run the end of stream algorithm with the error parameter set to "decode" and abort this algorithm.
     if (result == ParsingFailed) {
         LOG(MediaSource, "SourceBuffer::sourceBufferPrivateAppendComplete(%p) - result = ParsingFailed", this);
-        appendError(true);
+        m_source->streamEndedWithError(decodeError(), IgnorableExceptionCode());
         return;
     }
@@ -998 +998 @@
     LOG(MediaSource, "SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment(%p)", this);
 
-    // 3.5.8 Initialization Segment Received (ctd)
-    // https://rawgit.com/w3c/media-source/c3ad59c7a370d04430969ba73d18dc9bcde57a33/index.html#sourcebuffer-init-segment-received [Editor's Draft 09 January 2015]
-
+    // 3.5.7 Initialization Segment Received
+    // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#sourcebuffer-init-segment-received
     // 1. Update the duration attribute if it currently equals NaN:
     if (m_source->duration().isInvalid()) {
@@ -1011 +1010 @@
     }
 
-    // 2. If the initialization segment has no audio, video, or text tracks, then run the append error algorithm
-    // with the decode error parameter set to true and abort these steps.
+    // 2. If the initialization segment has no audio, video, or text tracks, then run the end of stream
+    // algorithm with the error parameter set to "decode" and abort these steps.
     if (!segment.audioTracks.size() && !segment.videoTracks.size() && !segment.textTracks.size())
-        appendError(true);
+        m_source->streamEndedWithError(decodeError(), IgnorableExceptionCode());
+
 
     // 3. If the first initialization segment flag is true, then run the following steps:
     if (m_receivedFirstInitializationSegment) {
-
-        // 3.1. Verify the following properties. If any of the checks fail then run the append error algorithm
-        // with the decode error parameter set to true and abort these steps.
         if (!validateInitializationSegment(segment)) {
-            appendError(true);
+            m_source->streamEndedWithError(decodeError(), IgnorableExceptionCode());
             return;
         }
@@ -1062 +1059 @@
         }
 
-        // 3.3 Set the need random access point flag on all track buffers to true.
         for (auto& trackBuffer : m_trackBufferMap.values())
             trackBuffer.needRandomAccessFlag = true;
@@ -1073 +1069 @@
     if (!m_receivedFirstInitializationSegment) {
         // 5.1 If the initialization segment contains tracks with codecs the user agent does not support,
-        // then run the append error algorithm with the decode error parameter set to true and abort these steps.
+        // then run the end of stream algorithm with the error parameter set to "decode" and abort these steps.
         // NOTE: This check is the responsibility of the SourceBufferPrivate.
 
@@ -1080 +1076 @@
             AudioTrackPrivate* audioTrackPrivate = audioTrackInfo.track.get();
 
-            // FIXME: Implement steps 5.2.1-5.2.8.1 as per Editor's Draft 09 January 2015, and reorder this
             // 5.2.1 Let new audio track be a new AudioTrack object.
             // 5.2.2 Generate a unique ID and assign it to the id property on new video track.
@@ -1121 +1116 @@
             VideoTrackPrivate* videoTrackPrivate = videoTrackInfo.track.get();
 
-            // FIXME: Implement steps 5.3.1-5.3.8.1 as per Editor's Draft 09 January 2015, and reorder this
             // 5.3.1 Let new video track be a new VideoTrack object.
             // 5.3.2 Generate a unique ID and assign it to the id property on new video track.
@@ -1162 +1156 @@
             InbandTextTrackPrivate* textTrackPrivate = textTrackInfo.track.get();
 
-            // FIXME: Implement steps 5.4.1-5.4.8.1 as per Editor's Draft 09 January 2015, and reorder this
             // 5.4.1 Let new text track be a new TextTrack object with its properties populated with the
             // appropriate information from the initialization segment.
@@ -1197 +1190 @@
         if (activeTrackFlag) {
             // 5.5.1 Add this SourceBuffer to activeSourceBuffers.
-            // 5.5.2 Queue a task to fire a simple event named addsourcebuffer at activeSourceBuffers
             setActive(true);
         }
@@ -1227 +1219 @@
 bool SourceBuffer::validateInitializationSegment(const InitializationSegment& segment)
 {
-    // FIXME: ordering of all 3.5.X (X>=7) functions needs to be updated to post-[24 July 2014 Editor's Draft] version
-    // 3.5.8 Initialization Segment Received (ctd)
-    // https://rawgit.com/w3c/media-source/c3ad59c7a370d04430969ba73d18dc9bcde57a33/index.html#sourcebuffer-init-segment-received [Editor's Draft 09 January 2015]
-
-    // Note: those are checks from step 3.1
+    // 3.5.7 Initialization Segment Received (ctd)
+    // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#sourcebuffer-init-segment-received
+
+    // 3.1. Verify the following properties. If any of the checks fail then run the end of stream
+    // algorithm with the error parameter set to "decode" and abort these steps.
     //   * The number of audio, video, and text tracks match what was in the first initialization segment.
     if (segment.audioTracks.size() != audioTracks()->length()
@@ -1298 +1290 @@
 };
 
-void SourceBuffer::appendError(bool decodeErrorParam)
-{
-    // 3.5.3 Append Error Algorithm
-    // https://rawgit.com/w3c/media-source/c3ad59c7a370d04430969ba73d18dc9bcde57a33/index.html#sourcebuffer-append-error [Editor's Draft 09 January 2015]
-
-    ASSERT(m_updating);
-    // 1. Run the reset parser state algorithm.
-    resetParserState();
-
-    // 2. Set the updating attribute to false.
-    m_updating = false;
-
-    // 3. Queue a task to fire a simple event named error at this SourceBuffer object.
-    scheduleEvent(eventNames().errorEvent);
-
-    // 4. Queue a task to fire a simple event named updateend at this SourceBuffer object.
-    scheduleEvent(eventNames().updateendEvent);
-
-    // 5. If decode error is true, then run the end of stream algorithm with the error parameter set to "decode".
-    if (decodeErrorParam)
-        m_source->streamEndedWithError(decodeError(), IgnorableExceptionCode());
-}
-
 void SourceBuffer::sourceBufferPrivateDidReceiveSample(SourceBufferPrivate*, PassRefPtr<MediaSample> prpSample)
 {
     if (isRemoved())
         return;
-
-    // 3.5.1 Segment Parser Loop
-    // 6.1 If the first initialization segment received flag is false, then run the append error algorithm
-    //     with the decode error parameter set to true and abort this algorithm.
-    // Note: current design makes SourceBuffer somehow ignorant of append state - it's more a thing
-    //  of SourceBufferPrivate. That's why this check can't really be done in appendInternal.
-    //  unless we force some kind of design with state machine switching.
-    if (!m_receivedFirstInitializationSegment) {
-        appendError(true);
-        return;
-    }
 
     RefPtr<MediaSample> sample = prpSample;

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

@@ -93 +93 @@
     void remove(const MediaTime&, const MediaTime&, ExceptionCode&);
 
-    void appendError(bool);
     void abortIfUpdating();
     void removedFromMediaSource();