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

Commit b3399c1c authored by Ray Essick's avatar Ray Essick Committed by android-build-merger
Browse files

Merge "avoid 32-bit integer overflow" into oc-dev am: 88b32e4b 

am: f6b45069

Change-Id: Iff1a6f84a173ec61780e7e7ceee1e35b28ca3935
parents c35f9096 f6b45069

media/libstagefright/ACodec.cpp

+3 −2
Original line number Diff line number Diff line
@@ -5298,8 +5298,9 @@ void ACodec::sendFormatChange() { 
        CHECK(mOutputFormat->findInt32("channel-count", &channelCount));

        CHECK(mOutputFormat->findInt32("sample-rate", &sampleRate));

        if (mSampleRate != 0 && sampleRate != 0) {

            mEncoderDelay = mEncoderDelay * sampleRate / mSampleRate;

            mEncoderPadding = mEncoderPadding * sampleRate / mSampleRate;

            // avoiding 32-bit overflows in intermediate values

            mEncoderDelay = (int32_t)((((int64_t)mEncoderDelay) * sampleRate) / mSampleRate);

            mEncoderPadding = (int32_t)((((int64_t)mEncoderPadding) * sampleRate) / mSampleRate);

            mSampleRate = sampleRate;

        }

        if (mSkipCutBuffer != NULL) {