commit 08fce45fdb537e135868604522aba15461f516be
author Marco Nelissen <marcone@google.com> Fri Sep 20 07:18:21 2013 -0700
committer Glenn Kasten <gkasten@android.com> Wed Apr 02 11:41:14 2014 -0700
tree 0645a0440cbb2f4bda446d3e073916c82d30e033
parent c71a99131ca97bd3bdc5b78473d06e613e96e073

Fix aac decoder flush

b/8543366

Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index c9b5d26..f842e27 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -567,6 +567,12 @@
         // depend on fragments from the last one decoded.
         // drain all existing data
         drainDecoder();
+        // force decoder loop to drop the first decoded buffer by resetting these state variables,
+        // but only if initialization has already happened.
+        if (mInputBufferCount != 0) {
+            mInputBufferCount = 1;
+            mStreamInfo->sampleRate = 0;
+        }
     }
 }