summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-06-03 15:48:11 -0700
committerAndreas Huber <andih@google.com>2013-06-03 15:48:11 -0700
commitd94e716af0e49d775f0c0c4f36dd2c136ba5f2b2 (patch)
tree5e070c15cf8bf6fb69c1efca1866303fa99e6390 /media/libstagefright/codecs/aacdec/SoftAAC2.cpp
parent7c684c622110af460025eff85082030947278430 (diff)
downloadframeworks_av-d94e716af0e49d775f0c0c4f36dd2c136ba5f2b2.zip
frameworks_av-d94e716af0e49d775f0c0c4f36dd2c136ba5f2b2.tar.gz
frameworks_av-d94e716af0e49d775f0c0c4f36dd2c136ba5f2b2.tar.bz2
Fix our software decoders to reset (more of) their internal state
properly on a transition from idle->loaded. Change-Id: I56ccfeef24c391e50e42b522194206e35c7ab700 related-to-bug: 9105408
Diffstat (limited to 'media/libstagefright/codecs/aacdec/SoftAAC2.cpp')
-rw-r--r--media/libstagefright/codecs/aacdec/SoftAAC2.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index cf50dc9..1b20cbb 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -604,6 +604,9 @@ void SoftAAC2::onReset() {
// To make the codec behave the same before and after a reset, we need to invalidate the
// streaminfo struct. This does that:
mStreamInfo->sampleRate = 0;
+
+ mSignalledError = false;
+ mOutputPortSettingsChange = NONE;
}
void SoftAAC2::onPortEnableCompleted(OMX_U32 portIndex, bool enabled) {