Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce (b334ac03) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

+4 −4

Original line number	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);

		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);
		@@ -328,6 +324,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 */