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

Commit 6e55f31c authored by Wonsik Kim's avatar Wonsik Kim Committed by Android (Google) Code Review
Browse files

Merge "codecs: fix wrong bug reference" into nyc-dev

parents 414639b4 ff64ea33

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ bool SoftAVC::setDecodeArgs( 
    uint8_t *pBuf;

    if (outHeader) {

        if (outHeader->nAllocLen < sizeY + (sizeUV * 2)) {

            android_errorWriteLog(0x534e4554, "27569635");

            android_errorWriteLog(0x534e4554, "27833616");

            return false;

        }

        pBuf = outHeader->pBuffer;

media/libstagefright/codecs/hevcdec/SoftHEVC.cpp

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ bool SoftHEVC::setDecodeArgs(ivd_video_decode_ip_t *ps_dec_ip, 
    uint8_t *pBuf;

    if (outHeader) {

        if (outHeader->nAllocLen < sizeY + (sizeUV * 2)) {

            android_errorWriteLog(0x534e4554, "27569635");

            android_errorWriteLog(0x534e4554, "27833616");

            return false;

        }

        pBuf = outHeader->pBuffer;

media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ bool SoftMPEG2::setDecodeArgs( 
    uint8_t *pBuf;

    if (outHeader) {

        if (outHeader->nAllocLen < sizeY + (sizeUV * 2)) {

            android_errorWriteLog(0x534e4554, "27569635");

            android_errorWriteLog(0x534e4554, "27833616");

            return false;

        }

        pBuf = outHeader->pBuffer;

media/libstagefright/codecs/opus/dec/SoftOpus.cpp

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ void SoftOpus::onQueueFilled(OMX_U32 portIndex) { 
        size_t frameSize = kMaxOpusOutputPacketSizeSamples;

        if (frameSize > outHeader->nAllocLen / sizeof(int16_t) / mHeader->channels) {

            frameSize = outHeader->nAllocLen / sizeof(int16_t) / mHeader->channels;

            android_errorWriteLog(0x534e4554, "27887390");

            android_errorWriteLog(0x534e4554, "27833616");

        }



        int numFrames = opus_multistream_decode(mDecoder,

media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ void SoftVorbis::onQueueFilled(OMX_U32 portIndex) { 
        size_t size = header->nFilledLen;

        if (size < 7) {

            ALOGE("Too small input buffer: %zu bytes", size);

            android_errorWriteLog(0x534e4554, "27887390");

            android_errorWriteLog(0x534e4554, "27833616");

            notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

            mSignalledError = true;

            return;
@@ -405,7 +405,7 @@ void SoftVorbis::onQueueFilled(OMX_U32 portIndex) { 
            size_t numSamplesPerBuffer = kMaxNumSamplesPerBuffer;

            if (numSamplesPerBuffer > outHeader->nAllocLen / sizeof(int16_t)) {

                numSamplesPerBuffer = outHeader->nAllocLen / sizeof(int16_t);

                android_errorWriteLog(0x534e4554, "27887390");

                android_errorWriteLog(0x534e4554, "27833616");

            }

            numFrames = vorbis_dsp_pcmout(

                    mState, (int16_t *)outHeader->pBuffer,