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

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

Merge "Access HEVC context after create fail check" into mnc-dr-dev am:... 

Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d9 am: 549c01e1 am: a115c222 am: 1b708c32
am: 2b78e326

Change-Id: I5e0893a8f3c5f9c41885b549464a4631df9cedf5
parents c153373b 2b78e326

media/libstagefright/codecs/hevcdec/SoftHEVC.cpp

+4 −4
Original line number Diff line number Diff line
@@ -320,10 +320,6 @@ status_t SoftHEVC::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);
@@ -331,6 +327,10 @@ status_t SoftHEVC::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 */