diff options
| author | Lajos Molnar <lajos@google.com> | 2014-08-22 23:58:05 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2014-08-23 00:01:32 -0700 |
| commit | 34febc9654ba3b447239b7761ce4c93ca9a20b5f (patch) | |
| tree | d9f442ade727b3c7b2e17827a533039cd98b081c | |
| parent | 848726d845b51da04364bdaf4ec915c85d593c0e (diff) | |
| download | frameworks_av-34febc9654ba3b447239b7761ce4c93ca9a20b5f.zip frameworks_av-34febc9654ba3b447239b7761ce4c93ca9a20b5f.tar.gz frameworks_av-34febc9654ba3b447239b7761ce4c93ca9a20b5f.tar.bz2 | |
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
| -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; |