diff options
| author | Lajos Molnar <lajos@google.com> | 2014-08-25 08:24:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 08:24:22 +0000 |
| commit | b5f9ccfa2f8ddcd2e0c391d15fededc66533c9dd (patch) | |
| tree | 0c92a2e3d77d28f42db78ad11a31616c6fe7afeb | |
| parent | f5dea40eefb085b74ee37a548a51ade2ff10d150 (diff) | |
| parent | 23718a84fb2f9932b484dabb748c761c37af3742 (diff) | |
| download | frameworks_av-b5f9ccfa2f8ddcd2e0c391d15fededc66533c9dd.zip frameworks_av-b5f9ccfa2f8ddcd2e0c391d15fededc66533c9dd.tar.gz frameworks_av-b5f9ccfa2f8ddcd2e0c391d15fededc66533c9dd.tar.bz2 | |
am 23718a84: am 34febc96: stagefright: process CSD regardless of what port was last queued
* commit '23718a84fb2f9932b484dabb748c761c37af3742':
stagefright: process CSD regardless of what port was last queued
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index 90df607..8b4dd6f 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; |