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

Commit 610a9222 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "SampleIterator: clear members on seekTo error" into klp-dev

parents 9af51c59 03237ce0

media/libstagefright/SampleIterator.cpp

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



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

        mCurrentChunkIndex = chunk;



        status_t err;

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

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


        uint32_t firstChunkSampleIndex =

            mFirstChunkSampleIndex

                + mSamplesPerChunk * (mCurrentChunkIndex - mFirstChunk);

                + mSamplesPerChunk * (chunk - mFirstChunk);



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

            size_t sampleSize;

            if ((err = getSampleSizeDirect(

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

                ALOGE("getSampleSizeDirect return error");

                mCurrentChunkSampleSizes.clear();

                return err;

            }



            mCurrentChunkSampleSizes.push(sampleSize);

        }



        mCurrentChunkIndex = chunk;

    }



    uint32_t chunkRelativeSampleIndex =