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

Commit 4e79635e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4937098 from b9e82298 to pi-qpr1-release

Change-Id: I30d14ee18f9955a17c760e59b7fd3128556a2bd8
parents 8cf7a263 b9e82298
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -689,7 +689,6 @@ void SoftXAAC::onQueueFilled(OMX_U32 /* portIndex */) {
                    notify(OMX_EventError, OMX_ErrorUndefined, err_code, NULL);
                    return;
                }
                mIsCodecConfigFlushRequired = true;
            }

            if (!mSampFreq || !mNumChannels) {
@@ -713,10 +712,14 @@ void SoftXAAC::onQueueFilled(OMX_U32 /* portIndex */) {
            signed int bytesConsumed = 0;
            int errorCode = 0;
            if (mIsCodecInitialized) {
                mIsCodecConfigFlushRequired = true;
                errorCode =
                    decodeXAACStream(inBuffer, inBufferLength, &bytesConsumed, &numOutBytes);
            } else {
            } else if (!mIsCodecConfigFlushRequired) {
                ALOGW("Assumption that first frame after header initializes decoder failed!");
                mSignalledError = true;
                notify(OMX_EventError, OMX_ErrorUndefined, -1, NULL);
                return;
            }
            inHeader->nFilledLen -= bytesConsumed;
            inHeader->nOffset += bytesConsumed;