diff options
| author | Martin Storsjo <martin@martin.st> | 2020-11-17 12:38:51 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2020-11-17 12:38:51 +0200 |
| commit | c7a3808a2fd18bb4dad24d281cbb862b241806a9 (patch) | |
| tree | 2cea66fef9961cd71efc817fed7e857ef27099b0 /libFDK/src/mdct.cpp | |
| parent | d23a21ab427da642c8f32bb0659ae63a86f98e96 (diff) | |
| parent | f4adff7fbb0968a13fd5077ea3df734870aef3cf (diff) | |
| download | fdk-aac-c7a3808a2fd18bb4dad24d281cbb862b241806a9.tar.gz fdk-aac-c7a3808a2fd18bb4dad24d281cbb862b241806a9.tar.bz2 fdk-aac-c7a3808a2fd18bb4dad24d281cbb862b241806a9.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libFDK/src/mdct.cpp')
| -rw-r--r-- | libFDK/src/mdct.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libFDK/src/mdct.cpp b/libFDK/src/mdct.cpp index d697cfb..0062b27 100644 --- a/libFDK/src/mdct.cpp +++ b/libFDK/src/mdct.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -569,7 +569,7 @@ INT imlt_block(H_MDCT hMdct, FIXP_DBL *output, FIXP_DBL *spectrum, */ for (i = 0; i < hMdct->prev_nr; i++) { FIXP_DBL x = -(*pOvl--); - *pOut0 = IMDCT_SCALE_DBL(x + hMdct->pFacZir[i]); + *pOut0 = fAddSaturate(x, IMDCT_SCALE_DBL(hMdct->pFacZir[i])); pOut0++; } hMdct->pFacZir = NULL; @@ -678,7 +678,7 @@ INT imlt_block(H_MDCT hMdct, FIXP_DBL *output, FIXP_DBL *spectrum, FIXP_DBL *pOut = pOut0 - fl / 2; FDK_ASSERT(fl / 2 <= 128); for (i = 0; i < fl / 2; i++) { - pOut[i] += IMDCT_SCALE_DBL(hMdct->pFacZir[i]); + pOut[i] = fAddSaturate(pOut[i], IMDCT_SCALE_DBL(hMdct->pFacZir[i])); } hMdct->pFacZir = NULL; } |