Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23718a84 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 34febc96: stagefright: process CSD regardless of what port was last queued 

* commit '34febc96':
  stagefright: process CSD regardless of what port was last queued
parents 211aae92 34febc96

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+2 −3
Original line number Diff line number Diff line
@@ -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;