projects / platform / adaptation / ap_samsung / libomxil-e7270-v4l2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d708c02)
fixed svace issues 37/126537/3 accepted/tizen/unified/20170426.061906 submit/tizen/20170424.103917 submit/tizen/20170425.080426 submit/tizen/20170425.114810
authorSejun Park <sejun79.park@samsung.com>
Mon, 24 Apr 2017 05:54:57 +0000 (14:54 +0900)
committerSejun Park <sejun79.park@samsung.com>
Mon, 24 Apr 2017 09:50:36 +0000 (18:50 +0900)
Change-Id: I5065204573cd3cc623ef5e680a807792f21f93c0

exynos/libvideocodec/enc/ExynosVideoEncoder.c patch | blob | history
openmax/component/video/dec/h264/.Exynos_OMX_H264dec.c.swp [deleted file] patch | blob | history
openmax/component/video/enc/h264/Exynos_OMX_H264enc.c patch | blob | history
openmax/component/video/enc/hevc/Exynos_OMX_HEVCenc.c patch | blob | history
openmax/component/video/enc/mpeg4/Exynos_OMX_Mpeg4enc.c patch | blob | history
openmax/component/video/enc/vp8/Exynos_OMX_Vp8enc.c patch | blob | history
openmax/component/video/enc/vp9/Exynos_OMX_Vp9enc.c patch | blob | history

diff --git a/exynos/libvideocodec/enc/ExynosVideoEncoder.c b/exynos/libvideocodec/enc/ExynosVideoEncoder.c
index 19c9d0d64dbbaf8691e2b5922d0e3807b863526f..63d1a89588e6b2274d201a121d20fb08a440f00c 100755 (executable)
--- 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 (file)
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 a9b8f3ea120bf422dad7ab9f9c562c6466c9901d..c9efd4c20712aa47f6f19410d898c7c4fb0a3eb4 100755 (executable)
--- 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 87aa3cd442962abc9bef468329565b6843587021..e7ae17a89f530d3eada4f33fd843857f1f99e3f0 100755 (executable)
--- 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 2a8e3ed6f5c689780f370516327cd9e5bdf74b0f..14229acfc81e3a2dcdfa74c423ffbca1a788b1af 100755 (executable)
--- 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 93a94ef51ebcedafb5639d3e8e577c2dd2cc65b1..6921c25b1b8a0a8c1eea74de05b0bd3e389d03a5 100755 (executable)
--- 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 fae4f81cd1fe40c6e0c17d971a642958bc79af85..28b2dee21f9f3c9e70786c3be45432812231485e 100755 (executable)
--- 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;
Domain: Multimedia / Codec;