LayoutTests/ChangeLog

2014-12-15  Bartlomiej Gajda  <b.gajda@samsung.com>

        [MSE] Implement Append Error algorithm.

        https://bugs.webkit.org/show_bug.cgi?id=139439

        Reviewed by NOBODY (OOPS!).

        If Source Buffer has not received first init segment, then it shall call endOfStream after receiving

        Media Segment, as per Media Source spec. (from 17 July 2014) in paragraph 3.5.1 point 6.1.

        Added test which after creating SourceBuffer sends media sample, without any init segments.

        * media/media-source/media-source-append-media-segment-without-init-expected.txt: Added.

        * media/media-source/media-source-append-media-segment-without-init.html: Added.

2014-12-12  Alexey Proskuryakov  <ap@apple.com>

        [WebGL] Texture size tests failures

LayoutTests/media/media-source/media-source-append-media-segment-without-init-expected.txt

RUN(video.src = URL.createObjectURL(source))

EVENT(sourceopen)

RUN(sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock"))

RUN(sourceBuffer.appendBuffer(samples))

EVENT(error)

END OF TEST

LayoutTests/media/media-source/media-source-append-media-segment-without-init.html

<!DOCTYPE html>

<html>

<head>

    <title>mock-media-source</title>

    <script src="mock-media-source.js"></script>

    <script src="../video-test.js"></script>

    <script>

    var source;

    var sourceBuffer;

    var initSegment;

    var wasError = false;

    if (window.internals)

        internals.initializeMockMediaSource();

    function runTest() {

        findMediaElement();

        source = new MediaSource();

        waitForEventOn(source, 'sourceopen', sourceOpen, false, true);

        run('video.src = URL.createObjectURL(source)');

    }

    function sourceOpen() {

        run('sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock")');

        // Note: In normal usage we should send this line, but this tests what happens without.

        // initSegment = makeAInit(0, [makeATrack(1, 'mock', TRACK_KIND.VIDEO)]);

        samples = concatenateSamples([

            makeASample(0, 0, 1, 1, SAMPLE_FLAG.SYNC),

            makeASample(1, 1, 1, 1, SAMPLE_FLAG.NONE),

        ]);

        // Note: if code correctly handles sample without init, it will go through Segment Parser Loop

        // if not, we will receive update event as part of Coded Frame Processing

        waitForEventOn(sourceBuffer, 'error', null, true, true);

        failTestIn(2000);

        run('sourceBuffer.appendBuffer(samples)');

    }

    </script>

</head>

<body onload="runTest()">

    <video></video>

</body>

</html>

Source/WebCore/ChangeLog

2014-12-15  Bartlomiej Gajda  <b.gajda@samsung.com>

        [MSE] Implement Append Error algorithm.

        https://bugs.webkit.org/show_bug.cgi?id=139439

        Reviewed by NOBODY (OOPS!).

        If Source Buffer has not received first init segment, then it shall call endOfStream after receiving

        Media Segment, as per Media Source spec. (from 17 July 2014) in paragraph 3.5.1 point 6.1.

        Based this on Editor's Draft 12 December 2014, as it clarifies order of events.

        Test: media/media-source/media-source-append-media-segment-without-init.html

        * Modules/mediasource/MediaSource.cpp:

        (WebCore::MediaSource::streamEndedWithError):

        * Modules/mediasource/MediaSource.h:

        * Modules/mediasource/SourceBuffer.cpp:

        (WebCore::SourceBuffer::sourceBufferPrivateAppendComplete):

        (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment):

        (WebCore::SourceBuffer::validateInitializationSegment):

        (WebCore::SourceBuffer::appendError):

        * Modules/mediasource/SourceBuffer.h:

2014-12-12  Mark Rowe  <mrowe@apple.com>

        [Mac] Work around a bug in dsymutil on older OS versions

Source/WebCore/Modules/mediasource/SourceBuffer.cpp

@@void SourceBuffer::sourceBufferPrivateAppendComplete(SourceBufferPrivate*, Appen

    // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#sourcebuffer-buffer-append

    // 2. If the input buffer contains bytes that violate the SourceBuffer byte stream format specification,

539 // then run the end ~~of stream~~ algorithm with the error parameter set to "d~~ecode"~~ and abort this algorithm.

539 // then run the append error algorithm with the decode error parameter set to true and abort this algorithm.

540540 if (result == ParsingFailed) {

541541 LOG(MediaSource, "SourceBuffer::sourceBufferPrivateAppendComplete(%p) - result = ParsingFailed", this);

542 ~~m_source->streamEndedWith~~Error(d~~ecodeError(), IgnorableExceptionCode()~~);

542 appendError(true);

        return;

    }

@@void SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment(SourceBuff

        m_source->setDurationInternal(newDuration);

    }

932 // 2. If the initialization segment has no audio, video, or text tracks, then run the end of s~~trea~~m

933 // ~~algorithm~~ with the error parameter set to "d~~ecode"~~ and abort these steps.

932 // 2. If the initialization segment has no audio, video, or text tracks, then run the append error algorithm

933 // with the decode error parameter set to true and abort these steps.

934934 if (!segment.audioTracks.size() && !segment.videoTracks.size() && !segment.textTracks.size())

935 ~~m_source->streamEndedWith~~Error(d~~ecodeError(), IgnorableExceptionCode()~~);

935 appendError(true);

    // 3. If the first initialization segment flag is true, then run the following steps:

    if (m_receivedFirstInitializationSegment) {

        if (!validateInitializationSegment(segment)) {

941 ~~m_source->streamEndedWith~~Error(d~~ecodeError(), IgnorableExceptionCode()~~);

941 appendError(true);

            return;

        }

        // 3.2 Add the appropriate track descriptions from this initialization segment to each of the track buffers.

@@bool SourceBuffer::validateInitializationSegment(const InitializationSegment& se

    // 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

1144 // 3.1. Verify the following properties. If any of the checks fail then run the end of s~~trea~~m

1145 // ~~algorithm~~ with the error parameter set to "d~~ecode"~~ and abort these steps.

1144 // 3.1. Verify the following properties. If any of the checks fail then run the append error algorithm

1145 // with the decode error parameter set to true 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()

        || segment.videoTracks.size() != videoTracks()->length()

@@public:

    }

};

void SourceBuffer::appendError(bool decodeErrorParam)

{

    // 3.5.3 Append Error Algorithm

    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;

    // 3.5.8 Coded Frame Processing

Source/WebCore/Modules/mediasource/SourceBuffer.h

@@public:

    void remove(double start, double end, ExceptionCode&);

    void remove(const MediaTime&, const MediaTime&, ExceptionCode&);

83 void appendError(bool);

    void abortIfUpdating();

    void removedFromMediaSource();

    void seekToTime(const MediaTime&);