summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-06-05 16:58:57 -0700
committerMarco Nelissen <marcone@google.com>2014-06-05 16:58:57 -0700
commit475300b8ac5438b5037ac088ff599394e9658022 (patch)
tree38af1ccfcec9df579b0e9a20e6571ba438aedf26 /media/libstagefright/codecs/aacdec/SoftAAC2.cpp
parent5981fc5acb23eecf659bed49f29354b440cbb68e (diff)
downloadframeworks_av-475300b8ac5438b5037ac088ff599394e9658022.zip
frameworks_av-475300b8ac5438b5037ac088ff599394e9658022.tar.gz
frameworks_av-475300b8ac5438b5037ac088ff599394e9658022.tar.bz2
Make AAC decoder behavior after flush consistent with non-flush
Timestamps don't start at zero, but at least they're consistent. Change-Id: I2ce9cd60655a4ece787802902b679fda01cb6182
Diffstat (limited to 'media/libstagefright/codecs/aacdec/SoftAAC2.cpp')
-rw-r--r--media/libstagefright/codecs/aacdec/SoftAAC2.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index a0e3265..edb7448 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -846,6 +846,7 @@ void SoftAAC2::onPortFlushCompleted(OMX_U32 portIndex) {
// but only if initialization has already happened.
if (mInputBufferCount != 0) {
mInputBufferCount = 1;
+ mOutputBufferCount = -1;
}
} else {
while (outputDelayRingBufferSamplesAvailable() > 0) {