summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-03-08 15:48:24 -0700
committerChong Zhang <chz@google.com>2015-03-09 14:56:00 -0700
commit434a6094f69542257864b4f4223ce915c77976b1 (patch)
tree0a0b0cf4eca5274791b9aed7e73e30a523b4508e /media
parentb4f18f964cba9f124e5a264428290ada6eb4aa00 (diff)
downloadframeworks_av-434a6094f69542257864b4f4223ce915c77976b1.zip
frameworks_av-434a6094f69542257864b4f4223ce915c77976b1.tar.gz
frameworks_av-434a6094f69542257864b4f4223ce915c77976b1.tar.bz2
SoftAAC2: reset EOS status after a flush
bug:19656539 Change-Id: I27f41d885f4fd5bb5a0e29510f808fb84a0f75f3
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/codecs/aacdec/SoftAAC2.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index 1505f08..10937ec 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -975,6 +975,7 @@ void SoftAAC2::onPortFlushCompleted(OMX_U32 portIndex) {
mBufferSizes.clear();
mDecodedSizes.clear();
mLastInHeader = NULL;
+ mEndOfInput = false;
} else {
int avail;
while ((avail = outputDelayRingBufferSamplesAvailable()) > 0) {
@@ -989,6 +990,7 @@ void SoftAAC2::onPortFlushCompleted(OMX_U32 portIndex) {
mOutputBufferCount++;
}
mOutputDelayRingBufferReadPos = mOutputDelayRingBufferWritePos;
+ mEndOfOutput = false;
}
}