diff options
| author | Lajos Molnar <lajos@google.com> | 2014-08-23 19:02:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-23 19:02:13 +0000 |
| commit | 23718a84fb2f9932b484dabb748c761c37af3742 (patch) | |
| tree | da863eceea6d23eedff32204df2b3507c4be3cd9 | |
| parent | 211aae92d3f48a56f266a2b933d6f53b625098b0 (diff) | |
| parent | 34febc9654ba3b447239b7761ce4c93ca9a20b5f (diff) | |
| download | frameworks_av-23718a84fb2f9932b484dabb748c761c37af3742.zip frameworks_av-23718a84fb2f9932b484dabb748c761c37af3742.tar.gz frameworks_av-23718a84fb2f9932b484dabb748c761c37af3742.tar.bz2 | |
am 34febc96: stagefright: process CSD regardless of what port was last queued
* commit '34febc9654ba3b447239b7761ce4c93ca9a20b5f':
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; |