commit 305a12e403d3ae7e12df0d9218c152f9bb423af0
author Andy Hung <hunga@google.com> Sat May 30 01:54:42 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 30 01:54:43 2015 +0000
tree 85a20d5d43c51c1f5f9c9b2ee0ea5a6267bab98c
parent 187b78c384ddc0119da9909e89884ed5511a01e9
parent 2dcec6ae30b50d611758f8ee492901bf2235a8dc

Merge "libstagefright: Reset AMR decoder on input port flush" into mnc-dev

media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp

diff --git a/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp b/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
index d1b0f76..a9723ea 100644
--- a/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
+++ b/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
@@ -428,7 +428,15 @@
     }
 }
 
-void SoftAMR::onPortFlushCompleted(OMX_U32 /* portIndex */) {
+void SoftAMR::onPortFlushCompleted(OMX_U32 portIndex) {
+    ALOGV("onPortFlushCompleted portindex %d, resetting frame ", portIndex);
+    if (portIndex == 0) {
+        if (mMode == MODE_NARROW) {
+           Speech_Decode_Frame_reset(mState);
+        } else {
+           pvDecoder_AmrWb_Reset(mState, 0 /* reset_all */);
+        }
+    }
 }
 
 void SoftAMR::onPortEnableCompleted(OMX_U32 portIndex, bool enabled) {