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

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

Merge "DO NOT MERGE codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec" into mnc-dev

parents d31f7dbe f5a92a76

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

+19 −9
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ OMX_ERRORTYPE SoftAVC::internalSetParameter(OMX_INDEXTYPE index, const OMX_PTR p 
    return ret;

}



void SoftAVC::setDecodeArgs(

bool SoftAVC::setDecodeArgs(

        ivd_video_decode_ip_t *ps_dec_ip,

        ivd_video_decode_op_t *ps_dec_op,

        OMX_BUFFERHEADERTYPE *inHeader,
@@ -545,7 +545,6 @@ void SoftAVC::setDecodeArgs( 
        size_t timeStampIx) {

    size_t sizeY = outputBufferWidth() * outputBufferHeight();

    size_t sizeUV;

    uint8_t *pBuf;



    ps_dec_ip->u4_size = sizeof(ivd_video_decode_ip_t);

    ps_dec_op->u4_size = sizeof(ivd_video_decode_op_t);
@@ -565,22 +564,28 @@ void SoftAVC::setDecodeArgs( 
        ps_dec_ip->u4_num_Bytes = 0;

    }



    sizeUV = sizeY / 4;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[0] = sizeY;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[1] = sizeUV;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[2] = sizeUV;



    uint8_t *pBuf;

    if (outHeader) {

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

            android_errorWriteLog(0x534e4554, "27833616");

            return false;

        }

        pBuf = outHeader->pBuffer;

    } else {

        // mFlushOutBuffer always has the right size.

        pBuf = mFlushOutBuffer;

    }



    sizeUV = sizeY / 4;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[0] = sizeY;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[1] = sizeUV;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[2] = sizeUV;



    ps_dec_ip->s_out_buffer.pu1_bufs[0] = pBuf;

    ps_dec_ip->s_out_buffer.pu1_bufs[1] = pBuf + sizeY;

    ps_dec_ip->s_out_buffer.pu1_bufs[2] = pBuf + sizeY + sizeUV;

    ps_dec_ip->s_out_buffer.u4_num_bufs = 3;

    return;

    return true;

}

void SoftAVC::onPortFlushCompleted(OMX_U32 portIndex) {

    /* Once the output buffers are flushed, ignore any buffers that are held in decoder */
@@ -714,7 +719,12 @@ void SoftAVC::onQueueFilled(OMX_U32 portIndex) { 
            WORD32 timeDelay, timeTaken;

            size_t sizeY, sizeUV;



            setDecodeArgs(&s_dec_ip, &s_dec_op, inHeader, outHeader, timeStampIx);

            if (!setDecodeArgs(&s_dec_ip, &s_dec_op, inHeader, outHeader, timeStampIx)) {

                ALOGE("Decoder arg setup failed");

                notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

                mSignalledError = true;

                return;

            }

            // If input dump is enabled, then write to file

            DUMP_TO_FILE(mInFile, s_dec_ip.pv_stream_buffer, s_dec_ip.u4_num_Bytes);

media/libstagefright/codecs/avcdec/SoftAVCDec.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ private: 
    status_t resetPlugin();

    status_t reInitDecoder(uint32_t width, uint32_t height);



    void setDecodeArgs(

    bool setDecodeArgs(

            ivd_video_decode_ip_t *ps_dec_ip,

            ivd_video_decode_op_t *ps_dec_op,

            OMX_BUFFERHEADERTYPE *inHeader,

media/libstagefright/codecs/hevcdec/SoftHEVC.cpp

+18 −9
Original line number Diff line number Diff line
@@ -480,14 +480,13 @@ OMX_ERRORTYPE SoftHEVC::internalSetParameter(OMX_INDEXTYPE index, const OMX_PTR 
    return ret;

}



void SoftHEVC::setDecodeArgs(ivd_video_decode_ip_t *ps_dec_ip,

bool SoftHEVC::setDecodeArgs(ivd_video_decode_ip_t *ps_dec_ip,

        ivd_video_decode_op_t *ps_dec_op,

        OMX_BUFFERHEADERTYPE *inHeader,

        OMX_BUFFERHEADERTYPE *outHeader,

        size_t timeStampIx) {

    size_t sizeY = outputBufferWidth() * outputBufferHeight();

    size_t sizeUV;

    uint8_t *pBuf;



    ps_dec_ip->u4_size = sizeof(ivd_video_decode_ip_t);

    ps_dec_op->u4_size = sizeof(ivd_video_decode_op_t);
@@ -507,22 +506,28 @@ void SoftHEVC::setDecodeArgs(ivd_video_decode_ip_t *ps_dec_ip, 
        ps_dec_ip->u4_num_Bytes = 0;

    }



    sizeUV = sizeY / 4;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[0] = sizeY;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[1] = sizeUV;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[2] = sizeUV;



    uint8_t *pBuf;

    if (outHeader) {

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

            android_errorWriteLog(0x534e4554, "27833616");

            return false;

        }

        pBuf = outHeader->pBuffer;

    } else {

        // mFlushOutBuffer always has the right size.

        pBuf = mFlushOutBuffer;

    }



    sizeUV = sizeY / 4;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[0] = sizeY;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[1] = sizeUV;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[2] = sizeUV;



    ps_dec_ip->s_out_buffer.pu1_bufs[0] = pBuf;

    ps_dec_ip->s_out_buffer.pu1_bufs[1] = pBuf + sizeY;

    ps_dec_ip->s_out_buffer.pu1_bufs[2] = pBuf + sizeY + sizeUV;

    ps_dec_ip->s_out_buffer.u4_num_bufs = 3;

    return;

    return true;

}

void SoftHEVC::onPortFlushCompleted(OMX_U32 portIndex) {

    /* Once the output buffers are flushed, ignore any buffers that are held in decoder */
@@ -637,7 +642,11 @@ void SoftHEVC::onQueueFilled(OMX_U32 portIndex) { 
            WORD32 timeDelay, timeTaken;

            size_t sizeY, sizeUV;



            setDecodeArgs(&s_dec_ip, &s_dec_op, inHeader, outHeader, timeStampIx);

            if (!setDecodeArgs(&s_dec_ip, &s_dec_op, inHeader, outHeader, timeStampIx)) {

                ALOGE("Decoder arg setup failed");

                notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

                return;

            }



            GETTIME(&mTimeStart, NULL);

            /* Compute time elapsed between end of previous decode()

media/libstagefright/codecs/hevcdec/SoftHEVC.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ private: 
    status_t resetPlugin();

    status_t reInitDecoder();



    void setDecodeArgs(ivd_video_decode_ip_t *ps_dec_ip,

    bool setDecodeArgs(ivd_video_decode_ip_t *ps_dec_ip,

        ivd_video_decode_op_t *ps_dec_op,

        OMX_BUFFERHEADERTYPE *inHeader,

        OMX_BUFFERHEADERTYPE *outHeader,

media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp

+21 −12
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ OMX_ERRORTYPE SoftMPEG2::internalSetParameter(OMX_INDEXTYPE index, const OMX_PTR 
    return ret;

}



void SoftMPEG2::setDecodeArgs(

bool SoftMPEG2::setDecodeArgs(

        ivd_video_decode_ip_t *ps_dec_ip,

        ivd_video_decode_op_t *ps_dec_op,

        OMX_BUFFERHEADERTYPE *inHeader,
@@ -473,7 +473,6 @@ void SoftMPEG2::setDecodeArgs( 
        size_t timeStampIx) {

    size_t sizeY = outputBufferWidth() * outputBufferHeight();

    size_t sizeUV;

    uint8_t *pBuf;



    ps_dec_ip->u4_size = sizeof(ivd_video_decode_ip_t);

    ps_dec_op->u4_size = sizeof(ivd_video_decode_op_t);
@@ -493,22 +492,28 @@ void SoftMPEG2::setDecodeArgs( 
        ps_dec_ip->u4_num_Bytes = 0;

    }



    sizeUV = sizeY / 4;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[0] = sizeY;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[1] = sizeUV;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[2] = sizeUV;



    uint8_t *pBuf;

    if (outHeader) {

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

            android_errorWriteLog(0x534e4554, "27833616");

            return false;

        }

        pBuf = outHeader->pBuffer;

    } else {

        // mFlushOutBuffer always has the right size.

        pBuf = mFlushOutBuffer;

    }



    sizeUV = sizeY / 4;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[0] = sizeY;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[1] = sizeUV;

    ps_dec_ip->s_out_buffer.u4_min_out_buf_size[2] = sizeUV;



    ps_dec_ip->s_out_buffer.pu1_bufs[0] = pBuf;

    ps_dec_ip->s_out_buffer.pu1_bufs[1] = pBuf + sizeY;

    ps_dec_ip->s_out_buffer.pu1_bufs[2] = pBuf + sizeY + sizeUV;

    ps_dec_ip->s_out_buffer.u4_num_bufs = 3;

    return;

    return true;

}

void SoftMPEG2::onPortFlushCompleted(OMX_U32 portIndex) {

    /* Once the output buffers are flushed, ignore any buffers that are held in decoder */
@@ -621,7 +626,11 @@ void SoftMPEG2::onQueueFilled(OMX_U32 portIndex) { 
            WORD32 timeDelay, timeTaken;

            size_t sizeY, sizeUV;



            setDecodeArgs(&s_dec_ip, &s_dec_op, inHeader, outHeader, timeStampIx);

            if (!setDecodeArgs(&s_dec_ip, &s_dec_op, inHeader, outHeader, timeStampIx)) {

                ALOGE("Decoder arg setup failed");

                notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

                return;

            }

            // If input dump is enabled, then write to file

            DUMP_TO_FILE(mInFile, s_dec_ip.pv_stream_buffer, s_dec_ip.u4_num_Bytes);
@@ -664,9 +673,9 @@ void SoftMPEG2::onQueueFilled(OMX_U32 portIndex) { 


                CHECK_EQ(reInitDecoder(), (status_t)OK);



                setDecodeArgs(&s_dec_ip, &s_dec_op, inHeader, outHeader, timeStampIx);



                if (setDecodeArgs(&s_dec_ip, &s_dec_op, inHeader, outHeader, timeStampIx)) {

                    ivdec_api_function(mCodecCtx, (void *)&s_dec_ip, (void *)&s_dec_op);

                }

                return;

            }