commit b3f8b3a6286863be39cd7c432dc88ced4020b111
author Wonsik Kim <wonsik@google.com> Wed Sep 19 13:14:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 19 13:14:53 2018 -0700
tree 50172aadcffea0e7702a555bd4a3b47aa8e48cb8
parent 66010c272b6aa189120adb12d58c3e0361c7f0e4
parent 0932e7d154d728dd0ee6aa4bb452feddd3e9662b

Merge "vorbisdec: fix flush" am: 48f698163f
am: 0932e7d154

Change-Id: I3bd1e4454cff1a1a51b1feea2b1eca75eddd0be9

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 8912f8a..d534f64 100644
--- a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
+++ b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
@@ -548,11 +548,21 @@
         // Make sure that the next buffer output does not still
         // depend on fragments from the last one decoded.
 
+        mInputBufferCount = 0;
         mNumFramesOutput = 0;
+        if (mState != NULL) {
+            vorbis_dsp_clear(mState);
+            delete mState;
+            mState = NULL;
+        }
+        if (mVi != NULL) {
+            vorbis_info_clear(mVi);
+            delete mVi;
+            mVi = NULL;
+        }
         mSawInputEos = false;
         mSignalledOutputEos = false;
         mNumFramesLeftOnPage = -1;
-        vorbis_dsp_restart(mState);
     }
 }