Merge "Don't zero out spec coeffs before doing the final IMDCT." into jb-mr1-dev

ed8b5a74 · John Grossman · Android (Google) Code Review · 10435983 · 34ce250e · ed8b5a74
Commit ed8b5a74 authored Sep 12, 2012 by John Grossman Committed by Android (Google) Code Review Sep 12, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

libAACdec/src/aacdecoder.cpp libAACdec/src/aacdecoder.cpp +1 -4

No files found.
--- 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));
      }
    }