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

Commit 2d951098 authored by Iris Chang's avatar Iris Chang Committed by Marco Nelissen
Browse files

Sample index in stsc is bigger than samplecount in stsz 

When sample index in stsc is bigger than samplecount in stsz,
it returns error and video playing stops. Solution is to
align samplecount in stsz.

Bug: 122746529
Test: Play the file whose sample index in stsc box is bigger
than samplecount in stsz box and check if it can play normally

Change-Id: I2f09d6d17ff6bd04df076d744a25094c12524f19
parent e7d8a710

media/extractors/mp4/SampleIterator.cpp

+9 −2
Original line number Diff line number Diff line
@@ -111,9 +111,16 @@ status_t SampleIterator::seekTo(uint32_t sampleIndex) { 
            if ((err = getSampleSizeDirect(

                            firstChunkSampleIndex + i, &sampleSize)) != OK) {

                ALOGE("getSampleSizeDirect return error");

                // stsc sample count is not sync with stsz sample count

                if (err == ERROR_OUT_OF_RANGE) {

                    ALOGW("stsc samples(%d) not sync with stsz samples(%d)", mSamplesPerChunk, i);

                    mSamplesPerChunk = i;

                    break;

                } else{

                    mCurrentChunkSampleSizes.clear();

                    return err;

                }

            }



            mCurrentChunkSampleSizes.push(sampleSize);

        }