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

Commit 95eb4e76 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

SampleIterator: clear members on seekTo error am: 03237ce0 am: 8468b898... 

SampleIterator: clear members on seekTo error am: 03237ce0 am: 8468b898 am: e0d588b8 am: d4ddd555 am: f72b9e00 am: 21beb40c am: dcaab8ed
am: a38b5af1

Change-Id: Iffeef9b918d210902e3374359829a5485a3be590
parents fbe7df6d a38b5af1

media/libstagefright/SampleIterator.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -94,8 +94,6 @@ status_t SampleIterator::seekTo(uint32_t sampleIndex) { 
        + mFirstChunk;

        + mFirstChunk;





    if (!mInitialized || chunk != mCurrentChunkIndex) {

    if (!mInitialized || chunk != mCurrentChunkIndex) {

        mCurrentChunkIndex = chunk;



        status_t err;

        status_t err;

        if ((err = getChunkOffset(chunk, &mCurrentChunkOffset)) != OK) {

        if ((err = getChunkOffset(chunk, &mCurrentChunkOffset)) != OK) {

            ALOGE("getChunkOffset return error");

            ALOGE("getChunkOffset return error");
@@ -106,18 +104,21 @@ status_t SampleIterator::seekTo(uint32_t sampleIndex) { 




        uint32_t firstChunkSampleIndex =

        uint32_t firstChunkSampleIndex =

            mFirstChunkSampleIndex

            mFirstChunkSampleIndex

                + mSamplesPerChunk * (mCurrentChunkIndex - mFirstChunk);

                + mSamplesPerChunk * (chunk - mFirstChunk);





        for (uint32_t i = 0; i < mSamplesPerChunk; ++i) {

        for (uint32_t i = 0; i < mSamplesPerChunk; ++i) {

            size_t sampleSize;

            size_t sampleSize;

            if ((err = getSampleSizeDirect(

            if ((err = getSampleSizeDirect(

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

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

                ALOGE("getSampleSizeDirect return error");

                ALOGE("getSampleSizeDirect return error");

                mCurrentChunkSampleSizes.clear();

                return err;

                return err;

            }

            }





            mCurrentChunkSampleSizes.push(sampleSize);

            mCurrentChunkSampleSizes.push(sampleSize);

        }

        }



        mCurrentChunkIndex = chunk;

    }

    }





    uint32_t chunkRelativeSampleIndex =

    uint32_t chunkRelativeSampleIndex =