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

Commit 73b9b683 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "allow/ignore overflow in ogg position calculations"

parents 48161d36 2d018126

media/extractors/ogg/OggExtractor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -635,7 +635,8 @@ media_status_t MyOpusExtractor::readNextPacket(MediaBufferHelper **out) { 
            currentPageSamples -= mStartGranulePosition;

            AMediaFormat_setInt32(meta, AMEDIAFORMAT_KEY_VALID_SAMPLES, currentPageSamples);

        }

        mCurGranulePosition = mCurrentPage.mGranulePosition - currentPageSamples;

        (void) __builtin_sub_overflow(mCurrentPage.mGranulePosition, currentPageSamples,

                                      &mCurGranulePosition);

    }



    int64_t timeUs = getTimeUsOfGranule(mCurGranulePosition);