From e4b160c9e5ae09328f812f59ef1682ee0bdc38d7 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Sat, 1 Apr 2023 04:08:12 +0530 Subject: decoder: cleanup MULTICORE macro --- Android.bp | 1 - decoder/ihevcd_api.c | 16 ++++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Android.bp b/Android.bp index a7ca755..7e8a6e7 100644 --- a/Android.bp +++ b/Android.bp @@ -40,7 +40,6 @@ cc_library_static { cflags: [ "-D_LIB", - "-DMULTICORE", "-fPIC", "-O3", diff --git a/decoder/ihevcd_api.c b/decoder/ihevcd_api.c index 031808d..66d3b85 100644 --- a/decoder/ihevcd_api.c +++ b/decoder/ihevcd_api.c @@ -822,15 +822,11 @@ static IV_API_CALL_STATUS_T api_check_struct_sanity(iv_obj_t *ps_handle, return IV_FAIL; } -#ifdef MULTICORE if((ps_ip->u4_num_cores < 1) || (ps_ip->u4_num_cores > MAX_NUM_CORES)) -#else - if(ps_ip->u4_num_cores != 1) -#endif - { - ps_op->u4_error_code |= 1 << IVD_UNSUPPORTEDPARAM; - return IV_FAIL; - } + { + ps_op->u4_error_code |= 1 << IVD_UNSUPPORTEDPARAM; + return IV_FAIL; + } break; } case IHEVCD_CXA_CMD_CTL_SET_PROCESSOR: @@ -3504,11 +3500,7 @@ WORD32 ihevcd_set_num_cores(iv_obj_t *ps_codec_obj, ps_ip = (ihevcd_cxa_ctl_set_num_cores_ip_t *)pv_api_ip; ps_op = (ihevcd_cxa_ctl_set_num_cores_op_t *)pv_api_op; -#ifdef MULTICORE ps_codec->i4_num_cores = ps_ip->u4_num_cores; -#else - ps_codec->i4_num_cores = 1; -#endif ps_op->u4_error_code = 0; return IV_SUCCESS; } -- cgit v1.2.3