projects / GitHub / LineageOS / android_hardware_samsung_slsi_openmax.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb51ef9)
video_[enc|dec]: Add support for resubmitting CSDs after flush
authorSeungBeom Kim <sbcrux.kim@samsung.com>
Mon, 30 Mar 2015 16:31:20 +0000 (18:31 +0200)
committerGerrit Code Review <gerrit@cyanogenmod.org>
Tue, 31 Mar 2015 17:19:13 +0000 (17:19 +0000)
This modifies OMX code for seeking.

Backported-from: hardware/samsung_slsi/exynos5

Change-Id: Ia340e4d9274f7691917e71fa77fd38f0bd037d81
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
component/video/dec/Exynos_OMX_Vdec.c patch | blob | blame | history
component/video/enc/Exynos_OMX_Venc.c patch | blob | blame | history

diff --git a/component/video/dec/Exynos_OMX_Vdec.c b/component/video/dec/Exynos_OMX_Vdec.c
index 154f8142ea7d5a4797ea7a8ae241284e23f01ffd..bb2b785d8b42591b61c1f0213db08fe7a2dab43c 100644 (file)
--- a/component/video/dec/Exynos_OMX_Vdec.c
+++ b/component/video/dec/Exynos_OMX_Vdec.c
@@ -587,7 +587,8 @@ OMX_BOOL Exynos_Preprocessor_InputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_
                 pExynosComponent->bBehaviorEOS = OMX_TRUE;
         }
 
-        if (pExynosComponent->checkTimeStamp.needSetStartTimeStamp == OMX_TRUE) {
+        if ((pExynosComponent->checkTimeStamp.needSetStartTimeStamp == OMX_TRUE) &&
+            (srcInputData->nFlags & OMX_BUFFERFLAG_CODECCONFIG) != OMX_BUFFERFLAG_CODECCONFIG) {
             pExynosComponent->checkTimeStamp.needCheckStartTimeStamp = OMX_TRUE;
             pExynosComponent->checkTimeStamp.startTimeStamp = srcInputData->timeStamp;
             pExynosComponent->checkTimeStamp.nStartFlags = srcInputData->nFlags;
diff --git a/component/video/enc/Exynos_OMX_Venc.c b/component/video/enc/Exynos_OMX_Venc.c
index 66f6a3211509a2e71a05f95215949bba9a6fe34b..b03ce13d256af2ea29e421869bd1dbc94538f635 100644 (file)
--- a/component/video/enc/Exynos_OMX_Venc.c
+++ b/component/video/enc/Exynos_OMX_Venc.c
@@ -680,7 +680,8 @@ OMX_BOOL Exynos_Preprocessor_InputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_
                 pExynosComponent->bBehaviorEOS = OMX_TRUE;
         }
 
-        if (pExynosComponent->checkTimeStamp.needSetStartTimeStamp == OMX_TRUE) {
+        if ((pExynosComponent->checkTimeStamp.needSetStartTimeStamp == OMX_TRUE) &&
+            (srcInputData->nFlags & OMX_BUFFERFLAG_CODECCONFIG) != OMX_BUFFERFLAG_CODECCONFIG) {
             pExynosComponent->checkTimeStamp.needCheckStartTimeStamp = OMX_TRUE;
             pExynosComponent->checkTimeStamp.startTimeStamp = srcInputData->timeStamp;
             pExynosComponent->checkTimeStamp.nStartFlags = srcInputData->nFlags;