diff options
| author | Robert Shih <robertshih@google.com> | 2014-08-20 18:17:03 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2014-08-22 10:23:45 -0700 |
| commit | 143a951f1f19161fa12ca97f3dee85094078365a (patch) | |
| tree | b392f0ac447cdf07c54753d201a09173fd57c0d9 /media | |
| parent | fa1fc7086313f2f1868cae4c1a5698e592a437cb (diff) | |
| download | frameworks_av-143a951f1f19161fa12ca97f3dee85094078365a.zip frameworks_av-143a951f1f19161fa12ca97f3dee85094078365a.tar.gz frameworks_av-143a951f1f19161fa12ca97f3dee85094078365a.tar.bz2 | |
SoftAAC2: allow reconfiguring output after multiple output buffers
Bug: 17134697
Change-Id: Iaa8bdccbf1a8ccd3f898e48cfd22a0a443710fdd
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index 09c6e69..b032f9c 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -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", |