From dcd5810e5c7202c8df2e1ea76105c3ade62a3a04 Mon Sep 17 00:00:00 2001 From: Sejun Park Date: Fri, 24 Mar 2017 17:04:33 +0900 Subject: [PATCH] Sync with tizen3.0 Change-Id: I0f82e8662a0a161e6cf4253459054dc1e6b05a37 --- openmax/component/video/dec/h264/Exynos_OMX_H264dec.c | 2 +- openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c | 2 +- openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c | 2 +- openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c | 2 +- openmax/component/video/enc/h264/Exynos_OMX_H264enc.c | 2 +- openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c index 6a30ffa..156c812 100755 --- a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c +++ b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c @@ -2240,12 +2240,12 @@ OMX_ERRORTYPE Exynos_H264Dec_SrcOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX if (pExynosInputPort->bufferProcessType & BUFFER_COPY) { int i = 0; while (pSrcOutputData->buffer.singlePlaneBuffer.dataBuffer != pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[0]) { + i++; if (i >= MFC_INPUT_BUFFER_NUM_MAX) { Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "Can not find buffer"); ret = (OMX_ERRORTYPE)OMX_ErrorCodecDecode; goto EXIT; } - i++; } pVideoDec->pMFCDecInputBuffer[i]->dataSize = 0; pSrcOutputData->pPrivate = pVideoDec->pMFCDecInputBuffer[i]; diff --git a/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c b/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c index 74e15ac..6c6b0eb 100755 --- a/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c +++ b/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.c @@ -1583,12 +1583,12 @@ OMX_ERRORTYPE Exynos_Mpeg2Dec_SrcOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OM if ((pExynosInputPort->bufferProcessType & BUFFER_COPY) == BUFFER_COPY) { int i = 0; while (pSrcOutputData->buffer.singlePlaneBuffer.dataBuffer != pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[0]) { + i++; if (i >= MFC_INPUT_BUFFER_NUM_MAX) { Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "Can not find buffer"); ret = (OMX_ERRORTYPE)OMX_ErrorCodecDecode; goto EXIT; } - i++; } pVideoDec->pMFCDecInputBuffer[i]->dataSize = 0; pSrcOutputData->pPrivate = pVideoDec->pMFCDecInputBuffer[i]; diff --git a/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c b/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c index d7daa97..b9ebf0d 100755 --- a/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c +++ b/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.c @@ -2333,12 +2333,12 @@ OMX_ERRORTYPE Exynos_Mpeg4Dec_SrcOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OM if (pExynosInputPort->bufferProcessType & BUFFER_COPY) { int i = 0; while (pSrcOutputData->buffer.singlePlaneBuffer.dataBuffer != pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[0]) { + i++; if (i >= MFC_INPUT_BUFFER_NUM_MAX) { Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "Can not find buffer"); ret = (OMX_ERRORTYPE)OMX_ErrorCodecDecode; goto EXIT; } - i++; } pVideoDec->pMFCDecInputBuffer[i]->dataSize = 0; pSrcOutputData->pPrivate = pVideoDec->pMFCDecInputBuffer[i]; diff --git a/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c b/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c index 7897a37..9b6663f 100755 --- a/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c +++ b/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.c @@ -2216,12 +2216,12 @@ OMX_ERRORTYPE Exynos_WmvDec_SrcOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX_ if (pExynosInputPort->bufferProcessType & BUFFER_COPY) { int i = 0; while (pSrcOutputData->buffer.singlePlaneBuffer.dataBuffer != pVideoDec->pMFCDecInputBuffer[i]->pVirAddr[0]) { + i++; if (i >= MFC_INPUT_BUFFER_NUM_MAX) { Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "Can not find buffer"); ret = (OMX_ERRORTYPE)OMX_ErrorCodecDecode; goto EXIT; } - i++; } pVideoDec->pMFCDecInputBuffer[i]->dataSize = 0; pSrcOutputData->pPrivate = pVideoDec->pMFCDecInputBuffer[i]; diff --git a/openmax/component/video/enc/h264/Exynos_OMX_H264enc.c b/openmax/component/video/enc/h264/Exynos_OMX_H264enc.c index 9a223b5..2173513 100755 --- a/openmax/component/video/enc/h264/Exynos_OMX_H264enc.c +++ b/openmax/component/video/enc/h264/Exynos_OMX_H264enc.c @@ -2069,12 +2069,12 @@ OMX_ERRORTYPE Exynos_H264Enc_SrcOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OMX if (pExynosInputPort->bufferProcessType & BUFFER_COPY) { int i = 0; while (pSrcOutputData->buffer.multiPlaneBuffer.dataBuffer[0] != pVideoEnc->pMFCEncInputBuffer[i]->pVirAddr[0]) { + i++; if (i >= MFC_INPUT_BUFFER_NUM_MAX) { Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "%s: %d: Failed - Lost buffer", __FUNCTION__, __LINE__); ret = (OMX_ERRORTYPE)OMX_ErrorCodecEncode; goto EXIT; } - i++; } pVideoEnc->pMFCEncInputBuffer[i]->dataSize = 0; pSrcOutputData->pPrivate = pVideoEnc->pMFCEncInputBuffer[i]; diff --git a/openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c b/openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c index c3519a0..c582237 100755 --- a/openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c +++ b/openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c @@ -2186,12 +2186,12 @@ OMX_ERRORTYPE Exynos_Mpeg4Enc_SrcOut(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_OM if (pExynosInputPort->bufferProcessType & BUFFER_COPY) { int i = 0; while (pSrcOutputData->buffer.multiPlaneBuffer.dataBuffer[0] != pVideoEnc->pMFCEncInputBuffer[i]->pVirAddr[0]) { + i++; if (i >= MFC_INPUT_BUFFER_NUM_MAX) { Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "%s: %d: Failed - Lost buffer", __FUNCTION__, __LINE__); ret = (OMX_ERRORTYPE)OMX_ErrorCodecEncode; goto EXIT; } - i++; } pVideoEnc->pMFCEncInputBuffer[i]->dataSize = 0; pSrcOutputData->pPrivate = pVideoEnc->pMFCEncInputBuffer[i]; -- 2.7.4