Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6da1c549 authored by Linus Nilsson's avatar Linus Nilsson
Browse files

Transcoder: MediaSampleReader sometimes drops last sample. 

A bug caused MSR to drop the last sample in the file if that
was the only sample left to read and another track advanced past
it to make the extractor reach EOS. When the extractor reached EOS
MSR did not update it's position so when the first track came to read
the last sample it looked like the extractor was already positioned
on top of it.

Fixes: 180051221
Test: MediaSampleReaderNDKTests.TestLastSampleBeforeEOS + all unit tests
Change-Id: I7298dc8dcdafb93830cec2a446f68f7a8c878e19
parent 82aff675

media/libmediatranscoding/transcoder/MediaSampleReaderNDK.cpp

+3 −1
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ bool MediaSampleReaderNDK::advanceExtractor_l() { 
        mTrackCursors[mExtractorTrackIndex].next.reset();

    }



    // Update the extractor's sample index even if this track reaches EOS, so that the other tracks

    // are not given an incorrect extractor position.

    mExtractorSampleIndex++;

    if (!AMediaExtractor_advance(mExtractor)) {

        LOG(DEBUG) << "  EOS in advanceExtractor_l";

        mEosReached = true;
@@ -108,7 +111,6 @@ bool MediaSampleReaderNDK::advanceExtractor_l() { 
    }



    mExtractorTrackIndex = AMediaExtractor_getSampleTrackIndex(mExtractor);

    mExtractorSampleIndex++;



    SampleCursor& cursor = mTrackCursors[mExtractorTrackIndex];

    if (mExtractorSampleIndex > cursor.previous.index) {

media/libmediatranscoding/transcoder/tests/MediaSampleReaderNDKTests.cpp

+32 −0
Original line number Diff line number Diff line
@@ -272,6 +272,38 @@ TEST_F(MediaSampleReaderNDKTests, TestParallelSampleAccess) { 
    compareSamples(tester.getSamples());

}



/** Reads all samples except the last in each track, before finishing. */

TEST_F(MediaSampleReaderNDKTests, TestLastSampleBeforeEOS) {

    LOG(DEBUG) << "TestLastSampleBeforeEOS Starts";

    initExtractorSamples();



    {  // Natural track order

        SampleAccessTester tester{mSourceFd, mFileSize};

        for (int trackIndex = 0; trackIndex < mTrackCount; ++trackIndex) {

            tester.readSamplesAsync(trackIndex, mExtractorSamples[trackIndex].size() - 1);

        }

        tester.waitForTracks();

        for (int trackIndex = 0; trackIndex < mTrackCount; ++trackIndex) {

            tester.readSamplesAsync(trackIndex, SAMPLE_COUNT_ALL);

            tester.waitForTrack(trackIndex);

        }

        compareSamples(tester.getSamples());

    }



    {  // Reverse track order

        SampleAccessTester tester{mSourceFd, mFileSize};

        for (int trackIndex = mTrackCount - 1; trackIndex >= 0; --trackIndex) {

            tester.readSamplesAsync(trackIndex, mExtractorSamples[trackIndex].size() - 1);

        }

        tester.waitForTracks();

        for (int trackIndex = mTrackCount - 1; trackIndex >= 0; --trackIndex) {

            tester.readSamplesAsync(trackIndex, SAMPLE_COUNT_ALL);

            tester.waitForTrack(trackIndex);

        }

        compareSamples(tester.getSamples());

    }

}



/** Reads all samples from all tracks sequentially. */

TEST_F(MediaSampleReaderNDKTests, TestSequentialSampleAccess) {

    LOG(DEBUG) << "TestSequentialSampleAccess Starts";