fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-14 10:20:35 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Reapply: Avoid reading out of bounds due to negative aaIccIndexMapped"

Browse Source 
This reverts commit e6bb25613016ecd64ccbcb354768b4794ffd6351.

It seems like this isn't needed any longer on the latest upstream
version.
This commit is contained in:
Martin Storsjo 2019-10-08 15:10:34 +03:00
parent 3e6e1b2097
commit 10fcf89a3e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libSBRdec/src/psdec.cpp
View File

@ -329,7 +329,7 @@ void initSlotBasedRotation(
FIXP_SGL invL;
FIXP_DBL ScaleL, ScaleR;
FIXP_DBL Alpha, Beta, AlphasValue;
FIXP_DBL Alpha, Beta;
FIXP_DBL h11r, h12r, h21r, h22r;
const FIXP_DBL *PScaleFactors;
@ -363,15 +363,12 @@ void initSlotBasedRotation(
ScaleL = PScaleFactors[noIidSteps - h_ps_d->specificTo.mpeg.pCoef
->aaIidIndexMapped[env][bin]];
AlphasValue = 0;
if (h_ps_d->specificTo.mpeg.pCoef->aaIccIndexMapped[env][bin] >= 0)
AlphasValue = Alphas[h_ps_d->specificTo.mpeg.pCoef->aaIccIndexMapped[env][bin]];
Beta = fMult(
fMult(AlphasValue,
fMult(Alphas[h_ps_d->specificTo.mpeg.pCoef->aaIccIndexMapped[env][bin]],
(ScaleR - ScaleL)),
FIXP_SQRT05);
Alpha =
AlphasValue >> 1;
Alphas[h_ps_d->specificTo.mpeg.pCoef->aaIccIndexMapped[env][bin]] >> 1;
/* Alpha and Beta are now both scaled by 2 shifts right */