diff options
| author | Marco Nelissen <marcone@google.com> | 2013-04-15 16:28:49 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2013-04-15 16:28:49 -0700 |
| commit | 94b66227ff5a57dd810aafa7b3aa810b9a185b8d (patch) | |
| tree | 8bd962566759d631c8182d07e23bcd253f6b2cae /media/libstagefright/codecs | |
| parent | f4c873a64db2d5d2d74ca596e7482627dd6b4238 (diff) | |
| download | frameworks_av-94b66227ff5a57dd810aafa7b3aa810b9a185b8d.zip frameworks_av-94b66227ff5a57dd810aafa7b3aa810b9a185b8d.tar.gz frameworks_av-94b66227ff5a57dd810aafa7b3aa810b9a185b8d.tar.bz2 | |
Fix Vorbis decoder reset
b/8543366
Change-Id: I9f32e96fdfc355cf444259a7c40554e2de184728
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) { |