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

Commit 6fd437ed authored by Naveen Kumar P's avatar Naveen Kumar P Committed by android-build-merger
Browse files

Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a 

am: ba9840c1

Change-Id: I61bd1ac8efd4b2ef1d64d71187faee7077d65699
parents a115c222 ba9840c1

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -317,10 +317,6 @@ status_t SoftAVC::initDecoder() { 




        status = ivdec_api_function(mCodecCtx, (void *)&s_create_ip, (void *)&s_create_op);

        status = ivdec_api_function(mCodecCtx, (void *)&s_create_ip, (void *)&s_create_op);





        mCodecCtx = (iv_obj_t*)s_create_op.s_ivd_create_op_t.pv_handle;

        mCodecCtx->pv_fxns = dec_fxns;

        mCodecCtx->u4_size = sizeof(iv_obj_t);



        if (status != IV_SUCCESS) {

        if (status != IV_SUCCESS) {

            ALOGE("Error in create: 0x%x",

            ALOGE("Error in create: 0x%x",

                    s_create_op.s_ivd_create_op_t.u4_error_code);

                    s_create_op.s_ivd_create_op_t.u4_error_code);
@@ -328,6 +324,10 @@ status_t SoftAVC::initDecoder() { 
            mCodecCtx = NULL;

            mCodecCtx = NULL;

            return UNKNOWN_ERROR;

            return UNKNOWN_ERROR;

        }

        }



        mCodecCtx = (iv_obj_t*)s_create_op.s_ivd_create_op_t.pv_handle;

        mCodecCtx->pv_fxns = dec_fxns;

        mCodecCtx->u4_size = sizeof(iv_obj_t);

    }

    }





    /* Reset the plugin state */

    /* Reset the plugin state */