commit a5d693234054ad2f2031962632044f9545914983
author James Dong <jdong@google.com> Tue Feb 16 16:32:28 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 16 16:32:28 2010 -0800
tree a484fff444460144f8adf428ef14765ffc2dab30
parent 411bc9558fe8e4e5c692946e5f189af367900e6e
parent 6b13c05d9a88b7aede72519187315b0f6d53f669

Merge "Fix the 0-timestamp issue Don't return an output buffer back to the omx client if the input buffer(s) processed are only meant for setting the configuration"

omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c

diff --git a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c
index ad2eebd..97844e1 100644
--- a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c
+++ b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c
@@ -6255,18 +6255,20 @@
             if (pComponentPrivate->ProcessMode == 0) {
                 OMX_U8 ucIndex = 0;
                 OMX_PTR pBufferFlags = NULL;
-                ucIndex = VIDDEC_CircBuf_GetHead(pComponentPrivate,
+		if ((pBuffHead->nFlags & OMX_BUFFERFLAG_CODECCONFIG) == 0 ) {	//tag if not equal to OMX_BUFFERFLAG_CODECCONFIG
+                    ucIndex = VIDDEC_CircBuf_GetHead(pComponentPrivate,
                                                  VIDDEC_CBUFFER_TIMESTAMP,
                                                  VIDDEC_INPUT_PORT);
-                pComponentPrivate->aBufferFlags[ucIndex].nTimeStamp = pBuffHead->nTimeStamp;
-                pBuffHead->nFlags &= ~OMX_BUFFERFLAG_EOS;
-                pComponentPrivate->aBufferFlags[ucIndex].nFlags = pBuffHead->nFlags;
-                pComponentPrivate->aBufferFlags[ucIndex].nTickCount = pBuffHead->nTickCount;
-                pBufferFlags = &pComponentPrivate->aBufferFlags[ucIndex];
-                VIDDEC_CircBuf_Add(pComponentPrivate,
+                    pComponentPrivate->aBufferFlags[ucIndex].nTimeStamp = pBuffHead->nTimeStamp;
+                    pBuffHead->nFlags &= ~OMX_BUFFERFLAG_EOS;
+                    pComponentPrivate->aBufferFlags[ucIndex].nFlags = pBuffHead->nFlags;
+                    pComponentPrivate->aBufferFlags[ucIndex].nTickCount = pBuffHead->nTickCount;
+                    pBufferFlags = &pComponentPrivate->aBufferFlags[ucIndex];
+                    VIDDEC_CircBuf_Add(pComponentPrivate,
                                    VIDDEC_CBUFFER_TIMESTAMP,
                                    VIDDEC_INPUT_PORT,
                                    pBufferFlags);
+                }
             }
             else {
                 pComponentPrivate->arrBufIndex[pComponentPrivate->nInBufIndex] = pBuffHead->nTimeStamp;