diff options
| author | hding3 <haitao.ding@intel.com> | 2014-12-04 09:11:40 +0800 |
|---|---|---|
| committer | Ed Tam <etam@google.com> | 2014-12-05 12:59:06 -0800 |
| commit | c8580eefbc2dc1a563a3a327bba6b1e5cc9aca5c (patch) | |
| tree | 297baf9d34529455d643ffe6005bf6b59cb9608b | |
| parent | 7c51a53fdded8c5115afd1f2f32dfd269841ec9e (diff) | |
| download | wrs_omxil_core-c8580eefbc2dc1a563a3a327bba6b1e5cc9aca5c.tar.gz | |
wrs_core: enable meta data mode on Landroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release
BZ: 230000
Bug:18575549
Ignore buffer return when format change happens
for meta data mode.
The patch was ported from imin_legacy branch: https://android.intel.com:443/291947
Change-Id: I9226eb87d273d25a3c8152d0e5837a29bb574ac1
Signed-off-by: hding3 <haitao.ding@intel.com>
| -rw-r--r-- | base/src/portbase.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/base/src/portbase.cpp b/base/src/portbase.cpp index e939960..a43fe86 100644 --- a/base/src/portbase.cpp +++ b/base/src/portbase.cpp @@ -754,16 +754,20 @@ OMX_ERRORTYPE PortBase::RetainAndReturnBuffer( OMX_BUFFERHEADERTYPE *pRetain, OM length = queue_length(&bufferq); OMX_BUFFERHEADERTYPE *p; /* remove returned buffer from the queue */ - for (OMX_U32 i = 0; i < length; i++) { + OMX_U32 i = 0; + for (i = 0; i < length; i++) { p = (OMX_BUFFERHEADERTYPE *)queue_pop_head(&bufferq); if (p == pReturn) { break; } queue_push_tail(&bufferq, p); } - pthread_mutex_unlock(&bufferq_lock); + if (i == length) { + return OMX_ErrorNone; + } + return ReturnThisBuffer(pReturn); } |