fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Integer overflow fix in FDKaacEnc_initAvoidHoleFlag() am: 5def92cb0f 

am: a79871af3c

Change-Id: I37b2577508e6f7f7d48f6b056c27f5eabe1fd9b5
This commit is contained in:
Fraunhofer IIS FDK 2019-05-17 12:44:48 -07:00 committed by android-build-merger
parent 9987c7ba88 a79871af3c
commit c48b4650d1
1 changed files with 5 additions and 7 deletions
Show Stats 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);