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

Commit 34febc96 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

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
parent 848726d8

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;