From: Jan Altensen Date: Sun, 5 Apr 2020 00:08:39 +0000 (+0200) Subject: libvideocodec: resolve compilation errors X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d68fc696e1f7f1f641e6b39636a24866397a192a;p=GitHub%2FLineageOS%2Fandroid_hardware_samsung_slsi_exynos.git libvideocodec: resolve compilation errors Change-Id: I806c9097d9a678bf5354d1f38331aadecd53c5e4 --- diff --git a/libvideocodec/dec/ExynosVideoDecoder.c b/libvideocodec/dec/ExynosVideoDecoder.c index 0bfc3be..6d7bff7 100644 --- a/libvideocodec/dec/ExynosVideoDecoder.c +++ b/libvideocodec/dec/ExynosVideoDecoder.c @@ -224,8 +224,9 @@ static void __Set_SupportFormat(ExynosVideoInstInfo *pVideoInstInfo) default: break; } - +#ifdef USE_HEVC_HWIP EXIT: +#endif return ; } @@ -756,7 +757,7 @@ static ExynosVideoErrorType MFC_Decoder_Get_FramePackingInfo( struct v4l2_ext_control ext_ctrl[FRAME_PACK_SEI_INFO_NUM]; struct v4l2_ext_controls ext_ctrls; - int seiAvailable, seiInfo, seiGridPos, i; + int seiAvailable, seiInfo, seiGridPos; unsigned int seiArgmtId; @@ -1020,7 +1021,7 @@ EXIT: /* * [Decoder Buffer OPS] Get Buffer (Input) */ -static ExynosVideoErrorType MFC_Decoder_Get_Buffer_Inbuf( +static __unused ExynosVideoErrorType MFC_Decoder_Get_Buffer_Inbuf( void *pHandle, int nIndex, ExynosVideoBuffer **pBuffer) @@ -1617,7 +1618,7 @@ EXIT: /* * [Decoder Buffer OPS] Wait (Input) */ -static ExynosVideoErrorType MFC_Decoder_Wait_Inbuf(void *pHandle) +static __unused ExynosVideoErrorType MFC_Decoder_Wait_Inbuf(void *pHandle) { ExynosVideoDecContext *pCtx = (ExynosVideoDecContext *)pHandle; ExynosVideoErrorType ret = VIDEO_ERROR_NONE; @@ -2805,7 +2806,6 @@ static ExynosVideoErrorType MFC_Decoder_ExtensionDequeue_Outbuf( struct v4l2_plane planes[VIDEO_BUFFER_MAX_PLANES]; struct v4l2_buffer buf; int value = 0, state = 0; - int i, j; if (pCtx == NULL) { ALOGE("%s: Video context info must be supplied", __func__); diff --git a/libvideocodec/enc/ExynosVideoEncoder.c b/libvideocodec/enc/ExynosVideoEncoder.c index 7623029..a575db1 100644 --- a/libvideocodec/enc/ExynosVideoEncoder.c +++ b/libvideocodec/enc/ExynosVideoEncoder.c @@ -282,7 +282,6 @@ static void __Set_SupportFormat(ExynosVideoInstInfo *pVideoInstInfo) break; } -EXIT: return ; } @@ -1926,7 +1925,6 @@ static ExynosVideoErrorType MFC_Encoder_Set_LayerChange( ExynosVideoErrorType ret = VIDEO_ERROR_NONE; TemporalLayerShareBuffer *pTLSB = NULL; unsigned int CID = 0; - int i = 0; if (pCtx == NULL) { ALOGE("%s: Video context info must be supplied", __func__); @@ -2202,7 +2200,7 @@ EXIT: /* * [Encoder Buffer OPS] Get Buffer (Input) */ -static ExynosVideoErrorType MFC_Encoder_Get_Buffer_Inbuf( +static __unused ExynosVideoErrorType MFC_Encoder_Get_Buffer_Inbuf( void *pHandle, int nIndex, ExynosVideoBuffer **pBuffer) @@ -2794,7 +2792,7 @@ EXIT: /* * [Encoder Buffer OPS] Wait (Src) */ -static ExynosVideoErrorType MFC_Encoder_Wait_Inbuf(void *pHandle) +static __unused ExynosVideoErrorType MFC_Encoder_Wait_Inbuf(void *pHandle) { ExynosVideoEncContext *pCtx = (ExynosVideoEncContext *)pHandle; ExynosVideoErrorType ret = VIDEO_ERROR_NONE; @@ -2836,7 +2834,7 @@ EXIT: /* * [Encoder Buffer OPS] Wait (Dst) */ -static ExynosVideoErrorType MFC_Encoder_Wait_Outbuf(void *pHandle) +static __unused ExynosVideoErrorType MFC_Encoder_Wait_Outbuf(void *pHandle) { ExynosVideoEncContext *pCtx = (ExynosVideoEncContext *)pHandle; ExynosVideoErrorType ret = VIDEO_ERROR_NONE; @@ -3275,7 +3273,7 @@ EXIT: /* * [Encoder Buffer OPS] Enqueue All (Output) */ -static ExynosVideoErrorType MFC_Encoder_Enqueue_All_Outbuf(void *pHandle) +static __unused ExynosVideoErrorType MFC_Encoder_Enqueue_All_Outbuf(void *pHandle) { ExynosVideoEncContext *pCtx = (ExynosVideoEncContext *)pHandle; ExynosVideoErrorType ret = VIDEO_ERROR_NONE; @@ -3367,7 +3365,7 @@ static ExynosVideoBuffer *MFC_Encoder_Dequeue_Outbuf(void *pHandle) struct v4l2_buffer buf; struct v4l2_plane planes[VIDEO_BUFFER_MAX_PLANES]; - int value, plane; + int plane; int ret = 0; if (pCtx == NULL) { @@ -3812,7 +3810,7 @@ static ExynosVideoErrorType MFC_Encoder_ExtensionDequeue_Outbuf( pthread_mutex_t *pMutex = NULL; struct v4l2_buffer buf; struct v4l2_plane planes[VIDEO_BUFFER_MAX_PLANES]; - int value, plane; + int plane; if (pCtx == NULL) { ALOGE("%s: Video context info must be supplied", __func__);