diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-10-29 13:09:56 +0100 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2019-12-27 10:23:31 -0800 |
| commit | 40c083f59a308efe7d43b498e544756a43579261 (patch) | |
| tree | 5d66ef3e9462bd6cbbb882ca503f762b368e9f3b /libFDK | |
| parent | 2334454bc85e205b0d9f23ba6fbd1a966bf2c364 (diff) | |
| download | fdk-aac-40c083f59a308efe7d43b498e544756a43579261.tar.gz fdk-aac-40c083f59a308efe7d43b498e544756a43579261.tar.bz2 fdk-aac-40c083f59a308efe7d43b498e544756a43579261.zip | |
Avoid negation of INT_MIN in dst_IV().
Bug: 145669114
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I6ddd7a39376c5276ec636572c3bfd4d83d05f9f5
Diffstat (limited to 'libFDK')
| -rw-r--r-- | libFDK/src/dct.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libFDK/src/dct.cpp b/libFDK/src/dct.cpp index 776493e..bd26736 100644 --- a/libFDK/src/dct.cpp +++ b/libFDK/src/dct.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 @@ -489,18 +489,18 @@ void dst_IV(FIXP_DBL *pDat, int L, int *pDat_e) { for (i = 0; i < M - 1; i += 2, pDat_0 += 2, pDat_1 -= 2) { FIXP_DBL accu1, accu2, accu3, accu4; - accu1 = pDat_1[1]; - accu2 = -pDat_0[0]; - accu3 = pDat_0[1]; - accu4 = -pDat_1[0]; + accu1 = pDat_1[1] >> 1; + accu2 = -(pDat_0[0] >> 1); + accu3 = pDat_0[1] >> 1; + accu4 = -(pDat_1[0] >> 1); cplxMultDiv2(&accu1, &accu2, accu1, accu2, twiddle[i]); cplxMultDiv2(&accu3, &accu4, accu4, accu3, twiddle[i + 1]); - pDat_0[0] = accu2 >> 1; - pDat_0[1] = accu1 >> 1; - pDat_1[0] = accu4 >> 1; - pDat_1[1] = -(accu3 >> 1); + pDat_0[0] = accu2; + pDat_0[1] = accu1; + pDat_1[0] = accu4; + pDat_1[1] = -accu3; } if (M & 1) { FIXP_DBL accu1, accu2; |