diff options
| -rwxr-xr-x | openmax/component/video/dec/Exynos_OMX_VdecControl.c | 2 | ||||
| -rwxr-xr-x | openmax/component/video/dec/h264/Exynos_OMX_H264dec.c | 11 | ||||
| -rwxr-xr-x | openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c | 11 | ||||
| -rwxr-xr-x | packaging/libomxil-e3250-v4l2.spec | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/openmax/component/video/dec/Exynos_OMX_VdecControl.c b/openmax/component/video/dec/Exynos_OMX_VdecControl.c index e236148..2cbb0bc 100755 --- a/openmax/component/video/dec/Exynos_OMX_VdecControl.c +++ b/openmax/component/video/dec/Exynos_OMX_VdecControl.c @@ -1197,7 +1197,7 @@ OMX_ERRORTYPE Exynos_OMX_VideoDecodeGetParameter( break; case supportFormat_2: portFormat->eCompressionFormat = OMX_VIDEO_CodingUnused; - portFormat->eColorFormat = OMX_SEC_COLOR_FormatNV12Tiled; + portFormat->eColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd; portFormat->xFramerate = portDefinition->format.video.xFramerate; break; #ifdef SLP_PLATFORM diff --git a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c index 45f49cf..e3992bb 100755 --- a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c +++ b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c @@ -1028,7 +1028,7 @@ OMX_ERRORTYPE H264CodecSrcSetup(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DAT /* set output geometry */ Exynos_OSAL_Memset(&bufferConf, 0, sizeof(bufferConf)); - pH264Dec->hMFCH264Handle.MFCOutputColorType = bufferConf.eColorFormat = VIDEO_COLORFORMAT_NV12_TILED; + pH264Dec->hMFCH264Handle.MFCOutputColorType = bufferConf.eColorFormat = VIDEO_COLORFORMAT_NV12; if (pOutbufOps->Set_Geometry(hMFCHandle, &bufferConf) != VIDEO_ERROR_NONE) { Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "Failed to set geometry for output buffer"); ret = OMX_ErrorInsufficientResources; @@ -1617,7 +1617,8 @@ OMX_ERRORTYPE Exynos_H264Dec_SetParameter( case OMX_COLOR_FormatYUV420SemiPlanar: pExynosOutputPort->portDefinition.nBufferSize = (width * height * 3) / 2; break; -#ifdef SLP_PLATFORM /* NV12T fd */ +#ifdef SLP_PLATFORM /* NV12 fd */ + case OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd: case OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd: pExynosOutputPort->portDefinition.nBufferSize = sizeof(MMVideoBuffer); break; @@ -2400,8 +2401,8 @@ OMX_ERRORTYPE Exynos_H264Dec_DstOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX pBufferInfo->imageHeight = bufferGeometry->nFrameHeight; switch (bufferGeometry->eColorFormat) { case VIDEO_COLORFORMAT_NV12: -#ifdef SLP_PLATFORM /* NV12T fd */ - pBufferInfo->ColorFormat = OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd; +#ifdef SLP_PLATFORM /* NV12 fd */ + pBufferInfo->ColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd; #else pBufferInfo->ColorFormat = OMX_COLOR_FormatYUV420SemiPlanar; #endif @@ -2740,7 +2741,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(OMX_HANDLETYPE hComponent pExynosPort->portDefinition.format.video.pNativeRender = 0; pExynosPort->portDefinition.format.video.bFlagErrorConcealment = OMX_FALSE; #ifdef SLP_PLATFORM - pExynosPort->portDefinition.format.video.eColorFormat = OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd; + pExynosPort->portDefinition.format.video.eColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd; #else pExynosPort->portDefinition.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar; #endif diff --git a/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c b/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c index a6bda69..2afae9c 100755 --- a/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c +++ b/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c @@ -1127,7 +1127,7 @@ OMX_ERRORTYPE Mpeg4CodecSrcSetup(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_DA /* set output geometry */ Exynos_OSAL_Memset(&bufferConf, 0, sizeof(bufferConf)); - pMpeg4Dec->hMFCMpeg4Handle.MFCOutputColorType = bufferConf.eColorFormat = VIDEO_COLORFORMAT_NV12_TILED; + pMpeg4Dec->hMFCMpeg4Handle.MFCOutputColorType = bufferConf.eColorFormat = VIDEO_COLORFORMAT_NV12; if (pOutbufOps->Set_Geometry(hMFCHandle, &bufferConf) != VIDEO_ERROR_NONE) { Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "Failed to set geometry for output buffer"); ret = OMX_ErrorInsufficientResources; @@ -1752,8 +1752,9 @@ OMX_ERRORTYPE Exynos_Mpeg4Dec_SetParameter( case OMX_COLOR_FormatYUV420SemiPlanar: pExynosOutputPort->portDefinition.nBufferSize = (width * height * 3) / 2; break; -#ifdef SLP_PLATFORM /* NV12T fd */ +#ifdef SLP_PLATFORM /* NV12 fd */ case OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd: + case OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd: pExynosOutputPort->portDefinition.nBufferSize = sizeof(MMVideoBuffer); break; #endif @@ -2497,8 +2498,8 @@ OMX_ERRORTYPE Exynos_Mpeg4Dec_DstOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OM pBufferInfo->imageHeight = bufferGeometry->nFrameHeight; switch (bufferGeometry->eColorFormat) { case VIDEO_COLORFORMAT_NV12: -#ifdef SLP_PLATFORM /* NV12T fd */ - pBufferInfo->ColorFormat = OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd; +#ifdef SLP_PLATFORM /* NV12 fd */ + pBufferInfo->ColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd; #else pBufferInfo->ColorFormat = OMX_COLOR_FormatYUV420SemiPlanar; #endif @@ -2831,7 +2832,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(OMX_HANDLETYPE hComponent pExynosPort->portDefinition.format.video.pNativeRender = 0; pExynosPort->portDefinition.format.video.bFlagErrorConcealment = OMX_FALSE; #ifdef SLP_PLATFORM - pExynosPort->portDefinition.format.video.eColorFormat = OMX_SEC_COLOR_FormatNV12T_DmaBuf_Fd; + pExynosPort->portDefinition.format.video.eColorFormat = OMX_SEC_COLOR_FormatNV12L_DmaBuf_Fd; pExynosPort->bufferProcessType = BUFFER_SHARE; #else pExynosPort->portDefinition.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar; diff --git a/packaging/libomxil-e3250-v4l2.spec b/packaging/libomxil-e3250-v4l2.spec index f801c16..1928b77 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.1 +Version: 0.1.2 License: Apache-2.0 Group: Development/Libraries Release: 0 |