fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-06-05 22:39:13 +02:00
Code Issues Projects Releases Wiki Activity

Integer overflow fix in FDKaacEnc_initAvoidHoleFlag()

Browse Source 
am: 5def92cb0f

Change-Id: Ib2bb23763ffadc6a34669d0db79d203991cdf141
This commit is contained in:
Fraunhofer IIS FDK
2019-05-17 11:47:16 -07:00
committed by android-build-merger
parent d4a622c288 5def92cb0f
commit a79871af3c
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libAACenc/src/adj_thr.cpp
View File

@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android 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. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@@ -591,13 +591,11 @@ static void FDKaacEnc_initAvoidHoleFlag(
if (sfbEn > avgEn) { if (sfbEn > avgEn) {
FIXP_DBL tmpMinSnrLdData; FIXP_DBL tmpMinSnrLdData;
if (psyOutChannel[ch]->lastWindowSequence == LONG_WINDOW) if (psyOutChannel[ch]->lastWindowSequence == LONG_WINDOW)
tmpMinSnrLdData = tmpMinSnrLdData = SnrLdFac + fixMax(avgEnLdData - sfbEnLdData,
fixMax(SnrLdFac + (FIXP_DBL)(avgEnLdData - sfbEnLdData), SnrLdMin1 - SnrLdFac);
(FIXP_DBL)SnrLdMin1);
else else
tmpMinSnrLdData = tmpMinSnrLdData = SnrLdFac + fixMax(avgEnLdData - sfbEnLdData,
fixMax(SnrLdFac + (FIXP_DBL)(avgEnLdData - sfbEnLdData), SnrLdMin3 - SnrLdFac);
(FIXP_DBL)SnrLdMin3);
qcOutChan->sfbMinSnrLdData[sfbGrp + sfb] = fixMin( qcOutChan->sfbMinSnrLdData[sfbGrp + sfb] = fixMin(
qcOutChan->sfbMinSnrLdData[sfbGrp + sfb], tmpMinSnrLdData); qcOutChan->sfbMinSnrLdData[sfbGrp + sfb], tmpMinSnrLdData);