commit 94b66227ff5a57dd810aafa7b3aa810b9a185b8d
author Marco Nelissen <marcone@google.com> Mon Apr 15 16:28:49 2013 -0700
committer Marco Nelissen <marcone@google.com> Mon Apr 15 16:28:49 2013 -0700
tree 8bd962566759d631c8182d07e23bcd253f6b2cae
parent f4c873a64db2d5d2d74ca596e7482627dd6b4238

Fix Vorbis decoder reset

b/8543366

Change-Id: I9f32e96fdfc355cf444259a7c40554e2de184728

media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp

diff --git a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
index 922ac61..4115324 100644
--- a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
+++ b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
@@ -411,8 +411,19 @@
 }
 
 void SoftVorbis::onReset() {
+    mInputBufferCount = 0;
     mNumFramesOutput = 0;
-    vorbis_dsp_restart(mState);
+    if (mState != NULL) {
+        vorbis_dsp_clear(mState);
+        delete mState;
+        mState = NULL;
+    }
+
+    if (mVi != NULL) {
+        vorbis_info_clear(mVi);
+        delete mVi;
+        mVi = NULL;
+    }
 }
 
 void SoftVorbis::onPortEnableCompleted(OMX_U32 portIndex, bool enabled) {