From 05c2fc0aa67befd20045c4a5250a1e1c43bfebee Mon Sep 17 00:00:00 2001 From: Sejun Park Date: Mon, 24 Apr 2017 14:54:57 +0900 Subject: fixed svace issues Change-Id: I5065204573cd3cc623ef5e680a807792f21f93c0 --- exynos/libvideocodec/enc/ExynosVideoEncoder.c | 2 -- .../component/video/dec/h264/.Exynos_OMX_H264dec.c.swp | Bin 16384 -> 0 bytes openmax/component/video/enc/h264/Exynos_OMX_H264enc.c | 6 +----- openmax/component/video/enc/hevc/Exynos_OMX_HEVCenc.c | 6 +----- openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c | 6 +----- openmax/component/video/enc/vp8/Exynos_OMX_Vp8enc.c | 6 +----- openmax/component/video/enc/vp9/Exynos_OMX_Vp9enc.c | 6 +----- 7 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 openmax/component/video/dec/h264/.Exynos_OMX_H264dec.c.swp diff --git a/exynos/libvideocodec/enc/ExynosVideoEncoder.c b/exynos/libvideocodec/enc/ExynosVideoEncoder.c index 19c9d0d..63d1a89 100755 --- a/exynos/libvideocodec/enc/ExynosVideoEncoder.c +++ b/exynos/libvideocodec/enc/ExynosVideoEncoder.c @@ -98,14 +98,12 @@ static void __Set_SupportFormat(ExynosVideoInstInfo *pVideoInstInfo) case MFC_723: /* NV12, NV21, BGRA, RGBA, I420, YV12, ARGB, NV12T */ pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_BGRA8888; pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_RGBA8888; - break; case MFC_72: /* NV12, NV21, I420, YV12, ARGB, NV12T */ case MFC_77: pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_I420; pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_I420M; pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_YV12M; pVideoInstInfo->supportFormat[nLastIndex++] = VIDEO_COLORFORMAT_ARGB8888; - break; case MFC_78: /* NV12, NV21, NV12T */ case MFC_65: case MFC_61: diff --git a/openmax/component/video/dec/h264/.Exynos_OMX_H264dec.c.swp b/openmax/component/video/dec/h264/.Exynos_OMX_H264dec.c.swp deleted file mode 100644 index 598771f..0000000 Binary files a/openmax/component/video/dec/h264/.Exynos_OMX_H264dec.c.swp and /dev/null differ diff --git a/openmax/component/video/enc/h264/Exynos_OMX_H264enc.c b/openmax/component/video/enc/h264/Exynos_OMX_H264enc.c index a9b8f3e..c9efd4c 100755 --- a/openmax/component/video/enc/h264/Exynos_OMX_H264enc.c +++ b/openmax/component/video/enc/h264/Exynos_OMX_H264enc.c @@ -2957,7 +2957,6 @@ OMX_ERRORTYPE Exynos_H264Enc_DstOut( ExynosVideoEncBufferOps *pOutbufOps = pH264Enc->hMFCH264Handle.pOutbufOps; ExynosVideoBuffer *pVideoBuffer = NULL; ExynosVideoBuffer videoBuffer; - ExynosVideoFrameStatusType displayStatus = VIDEO_FRAME_STATUS_UNKNOWN; ExynosVideoErrorType codecReturn = VIDEO_ERROR_NONE; OMX_S32 indexTimestamp = 0; @@ -3097,10 +3096,7 @@ OMX_ERRORTYPE Exynos_H264Enc_DstOut( } #endif - if (displayStatus == VIDEO_FRAME_STATUS_CHANGE_RESOL) { - Exynos_OSAL_Log(EXYNOS_LOG_INFO, "[%p][%s] resolution is changed", pExynosComponent, __FUNCTION__); - pDstOutputData->remainDataLen = 0; - } else if (((pDstOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS) && + if (((pDstOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS) && (pExynosComponent->bBehaviorEOS == OMX_FALSE)) { Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "[%p][%s] got end of stream", pExynosComponent, __FUNCTION__); pDstOutputData->remainDataLen = 0; diff --git a/openmax/component/video/enc/hevc/Exynos_OMX_HEVCenc.c b/openmax/component/video/enc/hevc/Exynos_OMX_HEVCenc.c index 87aa3cd..e7ae17a 100755 --- a/openmax/component/video/enc/hevc/Exynos_OMX_HEVCenc.c +++ b/openmax/component/video/enc/hevc/Exynos_OMX_HEVCenc.c @@ -2708,7 +2708,6 @@ OMX_ERRORTYPE Exynos_HEVCEnc_DstOut( ExynosVideoEncBufferOps *pOutbufOps = pHevcEnc->hMFCHevcHandle.pOutbufOps; ExynosVideoBuffer *pVideoBuffer = NULL; ExynosVideoBuffer videoBuffer; - ExynosVideoFrameStatusType displayStatus = VIDEO_FRAME_STATUS_UNKNOWN; ExynosVideoErrorType codecReturn = VIDEO_ERROR_NONE; OMX_S32 indexTimestamp = 0; @@ -2808,10 +2807,7 @@ OMX_ERRORTYPE Exynos_HEVCEnc_DstOut( } #endif - if (displayStatus == VIDEO_FRAME_STATUS_CHANGE_RESOL) { - Exynos_OSAL_Log(EXYNOS_LOG_INFO, "[%p][%s] resolution is changed", pExynosComponent, __FUNCTION__); - pDstOutputData->remainDataLen = 0; - } else if (((pDstOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS) && + if (((pDstOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS) && (pExynosComponent->bBehaviorEOS == OMX_FALSE)) { Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "[%p][%s] got end of stream", pExynosComponent, __FUNCTION__); pDstOutputData->remainDataLen = 0; diff --git a/openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c b/openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c index 2a8e3ed..14229ac 100755 --- a/openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c +++ b/openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c @@ -2568,7 +2568,6 @@ OMX_ERRORTYPE Exynos_Mpeg4Enc_DstOut( ExynosVideoEncBufferOps *pOutbufOps = pMpeg4Enc->hMFCMpeg4Handle.pOutbufOps; ExynosVideoBuffer *pVideoBuffer = NULL; ExynosVideoBuffer videoBuffer; - ExynosVideoFrameStatusType displayStatus = VIDEO_FRAME_STATUS_UNKNOWN; ExynosVideoErrorType codecReturn = VIDEO_ERROR_NONE; OMX_S32 indexTimestamp = 0; @@ -2691,10 +2690,7 @@ OMX_ERRORTYPE Exynos_Mpeg4Enc_DstOut( } #endif - if (displayStatus == VIDEO_FRAME_STATUS_CHANGE_RESOL) { - Exynos_OSAL_Log(EXYNOS_LOG_INFO, "[%p][%s] resolution is changed", pExynosComponent, __FUNCTION__); - pDstOutputData->remainDataLen = 0; - } else if (((pDstOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS) && + if (((pDstOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS) && (pExynosComponent->bBehaviorEOS == OMX_FALSE)) { Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "[%p][%s] got end of stream", pExynosComponent, __FUNCTION__); pDstOutputData->remainDataLen = 0; diff --git a/openmax/component/video/enc/vp8/Exynos_OMX_Vp8enc.c b/openmax/component/video/enc/vp8/Exynos_OMX_Vp8enc.c index 93a94ef..6921c25 100755 --- a/openmax/component/video/enc/vp8/Exynos_OMX_Vp8enc.c +++ b/openmax/component/video/enc/vp8/Exynos_OMX_Vp8enc.c @@ -2481,7 +2481,6 @@ OMX_ERRORTYPE Exynos_VP8Enc_DstOut( ExynosVideoEncBufferOps *pOutbufOps = pVp8Enc->hMFCVp8Handle.pOutbufOps; ExynosVideoBuffer *pVideoBuffer = NULL; ExynosVideoBuffer videoBuffer; - ExynosVideoFrameStatusType displayStatus = VIDEO_FRAME_STATUS_UNKNOWN; ExynosVideoErrorType codecReturn = VIDEO_ERROR_NONE; OMX_S32 indexTimestamp = 0; @@ -2581,10 +2580,7 @@ OMX_ERRORTYPE Exynos_VP8Enc_DstOut( } #endif - if (displayStatus == VIDEO_FRAME_STATUS_CHANGE_RESOL) { - Exynos_OSAL_Log(EXYNOS_LOG_INFO, "[%p][%s] resolution is changed", pExynosComponent, __FUNCTION__); - pDstOutputData->remainDataLen = 0; - } else if (((pDstOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS) && + if (((pDstOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS) && (pExynosComponent->bBehaviorEOS == OMX_FALSE)) { Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "[%p][%s] got end of stream", pExynosComponent, __FUNCTION__); pDstOutputData->remainDataLen = 0; diff --git a/openmax/component/video/enc/vp9/Exynos_OMX_Vp9enc.c b/openmax/component/video/enc/vp9/Exynos_OMX_Vp9enc.c index fae4f81..28b2dee 100755 --- a/openmax/component/video/enc/vp9/Exynos_OMX_Vp9enc.c +++ b/openmax/component/video/enc/vp9/Exynos_OMX_Vp9enc.c @@ -2372,7 +2372,6 @@ OMX_ERRORTYPE Exynos_VP9Enc_DstOut( ExynosVideoEncBufferOps *pOutbufOps = pVp9Enc->hMFCVp9Handle.pOutbufOps; ExynosVideoBuffer *pVideoBuffer = NULL; ExynosVideoBuffer videoBuffer; - ExynosVideoFrameStatusType displayStatus = VIDEO_FRAME_STATUS_UNKNOWN; ExynosVideoErrorType codecReturn = VIDEO_ERROR_NONE; OMX_S32 indexTimestamp = 0; @@ -2472,10 +2471,7 @@ OMX_ERRORTYPE Exynos_VP9Enc_DstOut( } #endif - if (displayStatus == VIDEO_FRAME_STATUS_CHANGE_RESOL) { - Exynos_OSAL_Log(EXYNOS_LOG_INFO, "[%p][%s] resolution is changed", pExynosComponent, __FUNCTION__); - pDstOutputData->remainDataLen = 0; - } else if (((pDstOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS) && + if (((pDstOutputData->nFlags & OMX_BUFFERFLAG_EOS) == OMX_BUFFERFLAG_EOS) && (pExynosComponent->bBehaviorEOS == OMX_FALSE)) { Exynos_OSAL_Log(EXYNOS_LOG_TRACE, "[%p][%s] got end of stream", pExynosComponent, __FUNCTION__); pDstOutputData->remainDataLen = 0; -- cgit v1.2.3