diff options
| author | Marco Nelissen <marcone@google.com> | 2013-04-16 08:22:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-16 08:22:58 -0700 |
| commit | 4cb26d5cb123131266b38d1bad3966cee55dce79 (patch) | |
| tree | 10213053e7bfce5cf09ec26f36ecdcf78e9fae5a /media/libstagefright/codecs | |
| parent | 3b72d24df4d78b63622937a4d20776b5f46304a6 (diff) | |
| parent | 589bee39de9b6b7450f43c9e61f7b0393772f4ac (diff) | |
| download | frameworks_av-4cb26d5cb123131266b38d1bad3966cee55dce79.zip frameworks_av-4cb26d5cb123131266b38d1bad3966cee55dce79.tar.gz frameworks_av-4cb26d5cb123131266b38d1bad3966cee55dce79.tar.bz2 | |
am 589bee39: am 94b66227: Fix Vorbis decoder reset
* commit '589bee39de9b6b7450f43c9e61f7b0393772f4ac':
Fix Vorbis decoder reset
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
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::onPortFlushCompleted(OMX_U32 portIndex) { } 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) { |