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

Merge "Prevent integer overflow in subbandTPApply() energy update."

This commit is contained in:
Jean-Michel Trivi 2020-12-28 16:30:05 +00:00 committed by Android (Google) Code Review
parent f67a5bb99c aad908c262
commit 3708417303
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libSACdec/src/sac_stp.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 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten © Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -369,15 +369,15 @@ SACDEC_ERROR subbandTPApply(spatialDec *self, const SPATIAL_BS_FRAME *frame) {
hStpDec->update_old_ener = 1; hStpDec->update_old_ener = 1;
for (ch = 0; ch < self->numInputChannels; ch++) { for (ch = 0; ch < self->numInputChannels; ch++) {
hStpDec->oldDryEnerLD64[ch] = hStpDec->oldDryEnerLD64[ch] =
CalcLdData(hStpDec->runDryEner[ch] + ABS_THR__FDK); CalcLdData(fAddSaturate(hStpDec->runDryEner[ch], ABS_THR__FDK));
} }
for (ch = 0; ch < self->numOutputChannels; ch++) { for (ch = 0; ch < self->numOutputChannels; ch++) {
if (self->treeConfig == TREE_212) if (self->treeConfig == TREE_212)
hStpDec->oldWetEnerLD64[ch] = hStpDec->oldWetEnerLD64[ch] =
CalcLdData(hStpDec->runWetEner[ch] + ABS_THR__FDK); CalcLdData(fAddSaturate(hStpDec->runWetEner[ch], ABS_THR__FDK));
else else
hStpDec->oldWetEnerLD64[ch] = hStpDec->oldWetEnerLD64[ch] =
CalcLdData(hStpDec->runWetEner[ch] + ABS_THR2__FDK); CalcLdData(fAddSaturate(hStpDec->runWetEner[ch], ABS_THR2__FDK));
} }
} else { } else {
hStpDec->update_old_ener++; hStpDec->update_old_ener++;