diff options
| author | Robert Shih <robertshih@google.com> | 2014-08-22 19:52:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 19:52:53 +0000 |
| commit | d2f9a299082ae7ef9b9a03d4df11d37de63d62ae (patch) | |
| tree | c97423dfc6ebf79e385a70ab5c8e950f3386a634 /media | |
| parent | e0960c932205ffe77018584f4f82e7a918b7f022 (diff) | |
| parent | e2f34c14d15fc59a8ad60ea16782862592ff28cb (diff) | |
| download | frameworks_av-d2f9a299082ae7ef9b9a03d4df11d37de63d62ae.zip frameworks_av-d2f9a299082ae7ef9b9a03d4df11d37de63d62ae.tar.gz frameworks_av-d2f9a299082ae7ef9b9a03d4df11d37de63d62ae.tar.bz2 | |
am e2f34c14: am 143a951f: SoftAAC2: allow reconfiguring output after multiple output buffers
* commit 'e2f34c14d15fc59a8ad60ea16782862592ff28cb':
SoftAAC2: allow reconfiguring output after multiple output buffers
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", |