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

Commit b17c90c4 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 am: a61eab43 am: 193030cc am: 407b1977 am: 7fc9b225 am: af7531a4 am: 92fefbd9 am: f6c6cc0d
am: 4e17cadf

Change-Id: Ic832d3f318d8ddb36da3e1462f85c506b6aa58f5
parents 867d1d71 4e17cadf

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

+4 −4
Original line number Diff line number Diff line
@@ -274,10 +274,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);
@@ -285,6 +281,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 */