From 82249be3b68d82a5da30229c129f1f2733295c67 Mon Sep 17 00:00:00 2001 From: Sejun Park Date: Fri, 7 Apr 2017 13:45:36 +0900 Subject: [PATCH] fixed svace issues Change-Id: Iede5e427ef9a70ad4418902cf266379987399c20 --- openmax/component/video/dec/h264/Exynos_OMX_H264dec.c | 4 +++- openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c | 4 +++- openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c | 8 +++----- openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c | 4 +++- openmax/core/Exynos_OMX_Core.c | 2 +- openmax/osal/Exynos_OSAL_ETC.c | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c index 156c812..62f2380 100755 --- a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c +++ b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c @@ -146,6 +146,7 @@ EXIT: return ret; } +#ifndef TIZEN_FEATURE_E3250 int Check_H264_Frame( OMX_U8 *pInputStream, OMX_U32 buffSize, @@ -224,6 +225,7 @@ EXIT: return accessUnitSize; } +#endif static OMX_BOOL Check_H264_StartCode( OMX_U8 *pInputStream, @@ -2786,7 +2788,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(OMX_HANDLETYPE hComponent pVideoDec->exynos_codec_enqueueAllBuffer = &H264CodecEnQueueAllBuffer; pVideoDec->exynos_codec_resetupAllElement = &H264CodecResetupAllElement; - pVideoDec->exynos_checkInputFrame = &Check_H264_Frame; + pVideoDec->exynos_checkInputFrame = NULL; pVideoDec->exynos_codec_getCodecInputPrivateData = &GetCodecInputPrivateData; pVideoDec->exynos_codec_getCodecOutputPrivateData = &GetCodecOutputPrivateData; diff --git a/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c b/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c index 6c6b0eb..cb77ee1 100755 --- a/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c +++ b/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c @@ -96,6 +96,7 @@ EXIT: return ret; } +#ifndef TIZEN_FEATURE_E3250 int Check_Mpeg2_Frame( OMX_U8 *pInputStream, int buffSize, @@ -116,6 +117,7 @@ int Check_Mpeg2_Frame( FunctionOut(); return buffSize; } +#endif static OMX_BOOL Check_Mpeg2_StartCode( OMX_U8 *pInputStream, @@ -2063,7 +2065,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit( pVideoDec->exynos_codec_bufferProcessRun = &Mpeg2CodecOutputBufferProcessRun; pVideoDec->exynos_codec_enqueueAllBuffer = &Mpeg2CodecEnQueueAllBuffer; - pVideoDec->exynos_checkInputFrame = &Check_Mpeg2_Frame; + pVideoDec->exynos_checkInputFrame = NULL; pVideoDec->exynos_codec_getCodecInputPrivateData = &GetCodecInputPrivateData; pVideoDec->exynos_codec_getCodecOutputPrivateData = &GetCodecOutputPrivateData; diff --git a/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c b/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c index b9ebf0d..7d99bcf 100755 --- a/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c +++ b/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c @@ -158,6 +158,7 @@ EXIT: static OMX_BOOL gbFIMV1 = OMX_FALSE; +#ifndef TIZEN_FEATURE_E3250 static int Check_Mpeg4_Frame( OMX_U8 *pInputStream, OMX_U32 buffSize, @@ -296,6 +297,7 @@ EXIT : return --len; } +#endif static OMX_BOOL Check_Stream_StartCode( OMX_U8 *pInputStream, @@ -2879,11 +2881,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(OMX_HANDLETYPE hComponent pVideoDec->exynos_codec_enqueueAllBuffer = &Mpeg4CodecEnQueueAllBuffer; pVideoDec->exynos_codec_resetupAllElement = &Mpeg4CodecResetupAllElement; - if (codecType == CODEC_TYPE_MPEG4) - pVideoDec->exynos_checkInputFrame = &Check_Mpeg4_Frame; - else - pVideoDec->exynos_checkInputFrame = &Check_H263_Frame; - + pVideoDec->exynos_checkInputFrame = NULL; pVideoDec->exynos_codec_getCodecInputPrivateData = &GetCodecInputPrivateData; pVideoDec->exynos_codec_getCodecOutputPrivateData = &GetCodecOutputPrivateData; diff --git a/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c b/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c index 9b6663f..cbd65e9 100755 --- a/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c +++ b/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c @@ -109,6 +109,7 @@ EXIT: return ret; } +#ifndef TIZEN_FEATURE_E3250 int Check_Wmv_Frame( OMX_U8 *pInputStream, OMX_U32 buffSize, @@ -204,6 +205,7 @@ EXIT : return --len; } +#endif static OMX_BOOL Check_Stream_PrefixCode( OMX_U8 *pInputStream, @@ -2745,7 +2747,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit( pVideoDec->exynos_codec_enqueueAllBuffer = &WmvCodecEnQueueAllBuffer; pVideoDec->exynos_codec_resetupAllElement = &WmvCodecResetupAllElement; - pVideoDec->exynos_checkInputFrame = &Check_Wmv_Frame; + pVideoDec->exynos_checkInputFrame = NULL; pVideoDec->exynos_codec_getCodecInputPrivateData = &GetCodecInputPrivateData; pVideoDec->exynos_codec_getCodecOutputPrivateData = &GetCodecOutputPrivateData; diff --git a/openmax/core/Exynos_OMX_Core.c b/openmax/core/Exynos_OMX_Core.c index 4e12c13..0cabd0a 100644 --- a/openmax/core/Exynos_OMX_Core.c +++ b/openmax/core/Exynos_OMX_Core.c @@ -211,7 +211,7 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY Exynos_OMX_FreeHandle(OMX_IN OMX_HANDLETYPE h { OMX_ERRORTYPE ret = OMX_ErrorNone; EXYNOS_OMX_COMPONENT *currentComponent; - EXYNOS_OMX_COMPONENT *deleteComponent; + EXYNOS_OMX_COMPONENT *deleteComponent = NULL; FunctionIn(); diff --git a/openmax/osal/Exynos_OSAL_ETC.c b/openmax/osal/Exynos_OSAL_ETC.c index e6d73ed..b4a9920 100644 --- a/openmax/osal/Exynos_OSAL_ETC.c +++ b/openmax/osal/Exynos_OSAL_ETC.c @@ -37,7 +37,7 @@ static struct timeval perfStart[PERF_ID_MAX+1], perfStop[PERF_ID_MAX+1]; static unsigned long perfTime[PERF_ID_MAX+1], totalPerfTime[PERF_ID_MAX+1]; static unsigned int perfFrameCount[PERF_ID_MAX+1], perfOver30ms[PERF_ID_MAX+1]; -#ifndef HAVE_GETLINE +#ifdef HAVE_GETLINE ssize_t getline(char **ppLine, size_t *pLen, FILE *pStream) { char *pCurrentPointer = NULL; -- 2.7.4