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

Commit 0852646a authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Fix SoftMP3 divide by 0" into mnc-dev

parents b483c6aa c015b84e

media/libstagefright/codecs/mp3dec/SoftMP3.cpp

+6 −2
Original line number Diff line number Diff line
@@ -283,6 +283,11 @@ void SoftMP3::onQueueFilled(OMX_U32 /* portIndex */) { 
            } else {

                // This is recoverable, just ignore the current frame and

                // play silence instead.



                // TODO: should we skip silence (and consume input data)

                // if mIsFirst is true as we may not have a valid

                // mConfig->samplingRate and mConfig->num_channels?

                ALOGV_IF(mIsFirst, "insufficient data for first frame, sending silence");

                memset(outHeader->pBuffer,

                       0,

                       mConfig->outputFrameSize * sizeof(int16_t));
@@ -317,8 +322,7 @@ void SoftMP3::onQueueFilled(OMX_U32 /* portIndex */) { 
        }



        outHeader->nTimeStamp =

            mAnchorTimeUs

                + (mNumFramesOutput * 1000000ll) / mConfig->samplingRate;

            mAnchorTimeUs + (mNumFramesOutput * 1000000ll) / mSamplingRate;



        if (inHeader) {

            CHECK_GE(inHeader->nFilledLen, mConfig->inputBufferUsedLength);