fixed symbol lookup error when building in unified profile

Change-Id: Ia0d35dc7e0ac1a5b15912ab7ac2e3436bb0c34b8

diff --git a/openmax/component/video/dec/Exynos_OMX_Vdec.c b/openmax/component/video/dec/Exynos_OMX_Vdec.c
index 65eb2fdc096777381ee283b22e8cfd98d89acceb..decd159c921315dae3c3f0fabedd8b5d18aa3933 100755 (executable)
--- a/openmax/component/video/dec/Exynos_OMX_Vdec.c
+++ b/openmax/component/video/dec/Exynos_OMX_Vdec.c
@@ -109,7 +109,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];
@@ -277,9 +277,6 @@ OMX_BOOL Exynos_CSC_OutputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DATA
     EXYNOS_OMX_DATABUFFER         *outputUseBuffer  = &exynosOutputPort->way.port2WayDataBuffer.outputDataBuffer;
     OMX_U32                        copySize         = 0;
     DECODE_CODEC_EXTRA_BUFFERINFO *pBufferInfo      = NULL;
-#ifdef TIZEN_FEATURE_E54XX
-    MMVideoBuffer *pSlpOutBuf = NULL;
-#endif
 
     FunctionIn();
 
@@ -302,46 +299,6 @@ OMX_BOOL Exynos_CSC_OutputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DATA
     imageSize = width * height;
     colorFormat = pBufferInfo->ColorFormat;
 
-#ifdef TIZEN_FEATURE_E54XX
-    pSlpOutBuf = (MMVideoBuffer *)pOutputBuf;
-    pSlpOutBuf->width[0] = width;
-    pSlpOutBuf->width[1] = width;
-    pSlpOutBuf->height[0] = height;
-    pSlpOutBuf->height[1] = height/2;
-    pSlpOutBuf->stride_width[0] = ALIGN(width, S5P_FIMV_NV12M_HALIGN);
-    pSlpOutBuf->stride_width[1] = ALIGN(width, S5P_FIMV_NV12M_HALIGN);
-    pSlpOutBuf->stride_height[0] = ALIGN(height, S5P_FIMV_NV12M_HALIGN);
-    pSlpOutBuf->stride_height[1] = ALIGN(height/2, S5P_FIMV_NV12M_HALIGN);
-
-    if (pVideoDec->bDRMPlayerMode == OMX_TRUE) {
-        pSlpOutBuf->data[0] = 0;
-        pSlpOutBuf->data[1] = 0;
-    } else {
-        pSlpOutBuf->data[0] = dstOutputData->buffer.multiPlaneBuffer.dataBuffer[0];
-        pSlpOutBuf->data[1] = dstOutputData->buffer.multiPlaneBuffer.dataBuffer[1];
-    }
-    pSlpOutBuf->data[2] = 0; /* omx do not use this plane */
-
-
-    pSlpOutBuf->handle.dmabuf_fd[0] = dstOutputData->buffer.multiPlaneBuffer.fd[0];
-    pSlpOutBuf->handle.dmabuf_fd[1] = dstOutputData->buffer.multiPlaneBuffer.fd[1];
-    pSlpOutBuf->handle.dmabuf_fd[2] = 0; /* omx do not use this plane */
-
-    pSlpOutBuf->handle.bo[0] = dstOutputData->buffer.multiPlaneBuffer.tbm_bo[0];
-    pSlpOutBuf->handle.bo[1] = dstOutputData->buffer.multiPlaneBuffer.tbm_bo[1];
-    pSlpOutBuf->handle.bo[2] = NULL;
-
-    //pSlpOutBuf->type = MM_VIDEO_BUFFER_TYPE_DMABUF_FD;
-    dstOutputData->dataLen = sizeof(MMVideoBuffer);
-
-    Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "%s: using fd instead of csc", __FUNCTION__);
-    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]);
-
-    ret = OMX_TRUE;
-    goto EXIT;
-#endif
-
     pSrcBuf[0] = dstOutputData->buffer.multiPlaneBuffer.dataBuffer[0];
     pSrcBuf[1] = dstOutputData->buffer.multiPlaneBuffer.dataBuffer[1];
     pSrcBuf[2] = dstOutputData->buffer.multiPlaneBuffer.dataBuffer[2];
@@ -362,7 +319,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 7f849d59862e6236605da5ad57adba5c272fda2a..891ed9a57a116620fda08f0ecc502aa8619ee2cf 100755 (executable)
--- a/openmax/component/video/dec/Exynos_OMX_Vdec.h
+++ b/openmax/component/video/dec/Exynos_OMX_Vdec.h
@@ -174,7 +174,7 @@ int new_calc_uvplane(int width, int height);
 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 2bbb7988bc1e4c8d8f9c11c7d9bc5e9a4d91248b..d6b2ae1cc0a2dcb988ec7a832c37565dd1136ed6 100755 (executable)
--- 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 635c7e6ac8570313f13f6a91080b7115862b8313..05eb9979fb168b54a314f942fab13c82e539529a 100755 (executable)
--- a/openmax/component/video/enc/Exynos_OMX_Venc.h
+++ b/openmax/component/video/enc/Exynos_OMX_Venc.h
@@ -134,7 +134,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 cc59a0d0a5736c36899365a304eb9d5aa3112b8d..7887615949224b52fe06708b926974b387dc4658 100755 (executable)
--- a/openmax/osal/Exynos_OSAL_Platform_Specific.c
+++ b/openmax/osal/Exynos_OSAL_Platform_Specific.c
@@ -258,7 +258,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 fd 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-e54xx.spec b/packaging/libomxil-e54xx.spec
index d9842545a8e3e4089b6751fcb80f3593f0364c58..350ff5f48e18f8e562719bd1ae2e194ad51f624f 100755 (executable)
--- a/packaging/libomxil-e54xx.spec
+++ b/packaging/libomxil-e54xx.spec
@@ -1,6 +1,6 @@
 Name: libomxil-e54xx
 Summary: OpenMAX IL for e54xx
-Version: 1.0.2
+Version: 1.0.3
 License: Apache-2.0
 Group: Development/Libraries
 Release: 0