From: Lajos Molnar <lajos@google.com>
Date: Sat, 23 Aug 2014 06:58:05 +0000 (-0700)
Subject: stagefright: process CSD regardless of what port was last queued
X-Git-Tag: android-x86-6.0-r1~852^2~435
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=34febc9654ba3b447239b7761ce4c93ca9a20b5f;p=android-x86%2Fframeworks-av.git

stagefright: process CSD regardless of what port was last queued

CSD is always on the input port, so it does not matter which port
a buffer was last queued to.
Bug: 17216852

Change-Id: I6d00eb4bf3c2e9b9cc3c9918229de958bc465693
---

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index 90df607472..8b4dd6f682 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -494,7 +494,7 @@ int32_t SoftAAC2::outputDelayRingBufferSamplesLeft() {
 }
 
 
-void SoftAAC2::onQueueFilled(OMX_U32 portIndex) {
+void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) {
     if (mSignalledError || mOutputPortSettingsChange != NONE) {
         return;
     }
@@ -513,8 +513,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) {
             OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;
 
             mEndOfInput = (inHeader->nFlags & OMX_BUFFERFLAG_EOS) != 0;
-            if (portIndex == 0 &&
-                    (inHeader->nFlags & OMX_BUFFERFLAG_CODECCONFIG) != 0) {
+            if ((inHeader->nFlags & OMX_BUFFERFLAG_CODECCONFIG) != 0) {
                 BufferInfo *inInfo = *inQueue.begin();
                 OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;