diff options
| author | John Grossman <johngro@google.com> | 2012-09-12 15:11:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-12 15:11:17 -0700 |
| commit | ed8b5a747e97c9b8b029ba6485e33f3aad081652 (patch) | |
| tree | cfcb1c0a5896cf8edea6cdbb2a2e0f5bac26ebd6 /libAACdec/src/aacdecoder.cpp | |
| parent | 1043598349977d71cf19cc9db0d09d3c0cbfb2f9 (diff) | |
| parent | 34ce250e9075adda4fb8a797c7f47dc049476e8b (diff) | |
| download | ODR-AudioEnc-ed8b5a747e97c9b8b029ba6485e33f3aad081652.tar.gz ODR-AudioEnc-ed8b5a747e97c9b8b029ba6485e33f3aad081652.tar.bz2 ODR-AudioEnc-ed8b5a747e97c9b8b029ba6485e33f3aad081652.zip | |
Merge "Don't zero out spec coeffs before doing the final IMDCT." into jb-mr1-dev
Diffstat (limited to 'libAACdec/src/aacdecoder.cpp')
| -rw-r--r-- | libAACdec/src/aacdecoder.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp index 4cf1391..2843e9f 100644 --- a/libAACdec/src/aacdecoder.cpp +++ b/libAACdec/src/aacdecoder.cpp @@ -1646,10 +1646,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( self->sbrEnabled ); - if ( flags&AACDEC_FLUSH ) { - FDKmemclear(pAacDecoderChannelInfo->pSpectralCoefficient, sizeof(FIXP_DBL)*self->streamInfo.aacSamplesPerFrame); - } - switch (pAacDecoderChannelInfo->renderMode) { case AACDEC_RENDER_IMDCT: @@ -1677,6 +1673,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( break; } if ( flags&AACDEC_FLUSH ) { + FDKmemclear(pAacDecoderChannelInfo->pSpectralCoefficient, sizeof(FIXP_DBL)*self->streamInfo.aacSamplesPerFrame); FDKmemclear(self->pAacDecoderStaticChannelInfo[c]->pOverlapBuffer, OverlapBufferSize*sizeof(FIXP_DBL)); } } |