commit 64c4e0264a5fb1bf4700b85668d0fb50146f28e9
author Chong Zhang <chz@google.com> Mon Mar 09 21:57:59 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 09 21:58:01 2015 +0000
tree 1b1757786b55db072e963aed7f84445a93e28e3c
parent 434a6094f69542257864b4f4223ce915c77976b1
parent 5bb7e181d9156135e56ce44a3d0bd42eb31a9ee8

Merge "AnotherPacketSource: return format of first non-discontinuity packet"

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

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 @@
         mBufferSizes.clear();
         mDecodedSizes.clear();
         mLastInHeader = NULL;
+        mEndOfInput = false;
     } else {
         int avail;
         while ((avail = outputDelayRingBufferSamplesAvailable()) > 0) {
@@ -989,6 +990,7 @@
             mOutputBufferCount++;
         }
         mOutputDelayRingBufferReadPos = mOutputDelayRingBufferWritePos;
+        mEndOfOutput = false;
     }
 }