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

Commit f3a6234b authored by Vineeta Srivastava's avatar Vineeta Srivastava Committed by Android (Google) Code Review
Browse files

Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev

parents 95c03858 b65473f4

media/libstagefright/AudioSource.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -236,10 +236,10 @@ status_t AudioSource::read( 
        memset((uint8_t *) buffer->data(), 0, buffer->range_length());

        memset((uint8_t *) buffer->data(), 0, buffer->range_length());

    } else if (elapsedTimeUs < kAutoRampStartUs + kAutoRampDurationUs) {

    } else if (elapsedTimeUs < kAutoRampStartUs + kAutoRampDurationUs) {

        int32_t autoRampDurationFrames =

        int32_t autoRampDurationFrames =

                    (kAutoRampDurationUs * mSampleRate + 500000LL) / 1000000LL;

                    ((int64_t)kAutoRampDurationUs * mSampleRate + 500000LL) / 1000000LL; //Need type casting





        int32_t autoRampStartFrames =

        int32_t autoRampStartFrames =

                    (kAutoRampStartUs * mSampleRate + 500000LL) / 1000000LL;

                    ((int64_t)kAutoRampStartUs * mSampleRate + 500000LL) / 1000000LL; //Need type casting





        int32_t nFrames = mNumFramesReceived - autoRampStartFrames;

        int32_t nFrames = mNumFramesReceived - autoRampStartFrames;

        rampVolume(nFrames, autoRampDurationFrames,

        rampVolume(nFrames, autoRampDurationFrames,