From b3ac921cae96686ec0902796bb8f8ef99ae08abd Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Tue, 9 Apr 2013 14:57:38 -0700
Subject: Fix MediaCodec.flush()

There were two problems here. One was that the skip/cut buffer
wasn't cleared when it should be, and the second was that we
were always sending the first buffer of encoded data to the AAC
decoder twice.
b/8543366

Change-Id: Ic040edabf16cccd1f6ef8c9e5c9cfbacbdd8a089
---
 media/libstagefright/ACodec.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'media/libstagefright/ACodec.cpp')

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index ff72b71..31a9490 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -3626,7 +3626,6 @@ bool ACodec::ExecutingState::onMessageReceived(const sp<AMessage> &msg) {
                      (status_t)OK);
 
             mCodec->changeState(mCodec->mFlushingState);
-
             handled = true;
             break;
         }
@@ -4141,6 +4140,10 @@ void ACodec::FlushingState::changeStateIfWeOwnAllBuffers() {
 
         mCodec->mInputEOSResult = OK;
 
+        if (mCodec->mSkipCutBuffer != NULL) {
+            mCodec->mSkipCutBuffer->clear();
+        }
+
         mCodec->changeState(mCodec->mExecutingState);
     }
 }
-- 
cgit v1.1