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

Commit e2f34c14 authored by Robert Shih's avatar Robert Shih Committed by Android Git Automerger
Browse files

am 143a951f: SoftAAC2: allow reconfiguring output after multiple output buffers 

* commit '143a951f':
  SoftAAC2: allow reconfiguring output after multiple output buffers
parents dbddcd51 143a951f

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+1 −10
Original line number Diff line number Diff line
@@ -720,16 +720,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { 
                 * Thus, we could not say for sure whether a stream is

                 * AAC+/eAAC+ until the first data frame is decoded.

                 */

                if (mOutputBufferCount > 1) {

                    if (mStreamInfo->sampleRate != prevSampleRate ||

                        mStreamInfo->numChannels != prevNumChannels) {

                        ALOGE("can not reconfigure AAC output");

                        mSignalledError = true;

                        notify(OMX_EventError, OMX_ErrorUndefined, decoderErr, NULL);

                        return;

                    }

                }

                if (mInputBufferCount <= 2) { // TODO: <= 1

                if (mInputBufferCount <= 2 || mOutputBufferCount > 1) { // TODO: <= 1

                    if (mStreamInfo->sampleRate != prevSampleRate ||

                        mStreamInfo->numChannels != prevNumChannels) {

                        ALOGI("Reconfiguring decoder: %d->%d Hz, %d->%d channels",