From eaf509d901b3695895d7f462e543f4b846395a78 Mon Sep 17 00:00:00 2001 From: Sejun Park Date: Wed, 10 May 2017 14:51:39 +0900 Subject: [PATCH] fixed symbol lookup error when building in unified profile Change-Id: Ic63dcec03a834113b6152ec7cc9b340ae03f265a --- openmax/component/video/dec/Exynos_OMX_Vdec.c | 4 ++-- openmax/component/video/dec/Exynos_OMX_Vdec.h | 2 +- openmax/component/video/enc/Exynos_OMX_Venc.c | 2 +- openmax/component/video/enc/Exynos_OMX_Venc.h | 2 +- openmax/osal/Exynos_OSAL_Platform_Specific.c | 2 +- packaging/libomxil-e3250-v4l2.spec | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openmax/component/video/dec/Exynos_OMX_Vdec.c b/openmax/component/video/dec/Exynos_OMX_Vdec.c index 877c0e6..d426153 100644 --- a/openmax/component/video/dec/Exynos_OMX_Vdec.c +++ b/openmax/component/video/dec/Exynos_OMX_Vdec.c @@ -83,7 +83,7 @@ int calc_uvplane(int width, int height) return ALIGN(mbX * mbY, S5P_FIMV_DEC_BUF_ALIGN); } -inline void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent) +void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent) { EXYNOS_OMX_BASECOMPONENT *pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate; EXYNOS_OMX_BASEPORT *exynosInputPort = &pExynosComponent->pExynosPort[INPUT_PORT_INDEX]; @@ -336,7 +336,7 @@ OMX_BOOL Exynos_CSC_OutputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DATA #ifdef USE_PB if (exynosOutputPort->bIsPBEnabled == OMX_TRUE) { ExynosVideoPlane planes[MAX_BUFFER_PLANE]; - OMX_U32 stride; + OMX_U32 stride = 0; Exynos_OSAL_LockPB(pOutputBuf, width, height, exynosOutputPort->portDefinition.format.video.eColorFormat, &stride, planes); width = stride; outputUseBuffer->dataLen = sizeof(void *); diff --git a/openmax/component/video/dec/Exynos_OMX_Vdec.h b/openmax/component/video/dec/Exynos_OMX_Vdec.h index 78843ea..89fe484 100644 --- a/openmax/component/video/dec/Exynos_OMX_Vdec.h +++ b/openmax/component/video/dec/Exynos_OMX_Vdec.h @@ -156,7 +156,7 @@ extern "C" { int calc_plane(int width, int height); int calc_yplane(int width, int height); int calc_uvplane(int width, int height); -inline void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent); +void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent); OMX_BOOL Exynos_Check_BufferProcess_State(EXYNOS_OMX_BASECOMPONENT *pExynosComponent, OMX_U32 nPortIndex); OMX_ERRORTYPE Exynos_Input_CodecBufferToData(EXYNOS_OMX_BASECOMPONENT *pExynosComponent, OMX_PTR codecBuffer, EXYNOS_OMX_DATA *pData); OMX_ERRORTYPE Exynos_Output_CodecBufferToData(EXYNOS_OMX_BASECOMPONENT *pExynosComponent, OMX_PTR codecBuffer, EXYNOS_OMX_DATA *pData); diff --git a/openmax/component/video/enc/Exynos_OMX_Venc.c b/openmax/component/video/enc/Exynos_OMX_Venc.c index 5ce89c6..c66643c 100755 --- a/openmax/component/video/enc/Exynos_OMX_Venc.c +++ b/openmax/component/video/enc/Exynos_OMX_Venc.c @@ -48,7 +48,7 @@ #include "Exynos_OSAL_Log.h" -inline void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent) +void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent) { EXYNOS_OMX_BASECOMPONENT *pExynosComponent = (EXYNOS_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate; EXYNOS_OMX_BASEPORT *exynosInputPort = &pExynosComponent->pExynosPort[INPUT_PORT_INDEX]; diff --git a/openmax/component/video/enc/Exynos_OMX_Venc.h b/openmax/component/video/enc/Exynos_OMX_Venc.h index 426123c..bdd3b08 100755 --- a/openmax/component/video/enc/Exynos_OMX_Venc.h +++ b/openmax/component/video/enc/Exynos_OMX_Venc.h @@ -133,7 +133,7 @@ typedef struct _EXYNOS_OMX_VIDEOENC_COMPONENT extern "C" { #endif -inline void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent); +void Exynos_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent); OMX_BOOL Exynos_Check_BufferProcess_State(EXYNOS_OMX_BASECOMPONENT *pExynosComponent, OMX_U32 nPortIndex); OMX_ERRORTYPE Exynos_Input_CodecBufferToData(EXYNOS_OMX_BASECOMPONENT *pExynosComponent, OMX_PTR codecBuffer, EXYNOS_OMX_DATA *pData); OMX_ERRORTYPE Exynos_Output_CodecBufferToData(EXYNOS_OMX_BASECOMPONENT *pExynosComponent, OMX_PTR codecBuffer, EXYNOS_OMX_DATA *pData); diff --git a/openmax/osal/Exynos_OSAL_Platform_Specific.c b/openmax/osal/Exynos_OSAL_Platform_Specific.c index a0be86a..e82d3d9 100755 --- a/openmax/osal/Exynos_OSAL_Platform_Specific.c +++ b/openmax/osal/Exynos_OSAL_Platform_Specific.c @@ -265,7 +265,7 @@ OMX_ERRORTYPE Exynos_OSAL_UnlockPB(OMX_IN OMX_PTR pBuffer, EXYNOS_OMX_DATA *pDat } - //pSlpOutBuf->type = 1; /* use fd mode */ + pSlpOutBuf->type = MM_VIDEO_BUFFER_TYPE_TBM_BO; /* use bo mode */ Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "fd (%d, %d, %d) received from MFC", pSlpOutBuf->handle.dmabuf_fd[0], pSlpOutBuf->handle.dmabuf_fd[1], pSlpOutBuf->handle.dmabuf_fd[2]); #else diff --git a/packaging/libomxil-e3250-v4l2.spec b/packaging/libomxil-e3250-v4l2.spec index a95793f..94612a9 100755 --- a/packaging/libomxil-e3250-v4l2.spec +++ b/packaging/libomxil-e3250-v4l2.spec @@ -1,6 +1,6 @@ Name: libomxil-e3250-v4l2 Summary: OpenMAX IL for e3250-v4l2 -Version: 0.1.3 +Version: 0.1.4 License: Apache-2.0 Group: Development/Libraries Release: 0 -- 2.7.4