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

Commit a61eab43 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:... 

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

Change-Id: I0be8d6e1e7dede36a3b777bbf351fdb33d2d22d6
parents 2b78e326 b334ac03

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

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


        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) {

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

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

            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 */