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

Prevent too large shift exponent in apply_inter_tes() and merge two loops. am: 2a40fde39d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14471061

Change-Id: I585bba83fcd1fd2c288b20f492cb72e377533f56
This commit is contained in:
Fraunhofer IIS FDK 2021-05-07 21:49:57 +00:00 committed by Automerger Merge Worker
parent e91474fcce 2a40fde39d
commit 6fc7e4ae3a
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libSBRdec/src/env_calc.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 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten © Copyright 1995 - 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -664,7 +664,7 @@ static void apply_inter_tes(FIXP_DBL **qmfReal, FIXP_DBL **qmfImag,
gain_sf[i] = mult_sf - total_power_low_sf + sf2; gain_sf[i] = mult_sf - total_power_low_sf + sf2;
gain[i] = sqrtFixp_lookup(gain[i], &gain_sf[i]); gain[i] = sqrtFixp_lookup(gain[i], &gain_sf[i]);
if (gain_sf[i] < 0) { if (gain_sf[i] < 0) {
gain[i] >>= -gain_sf[i]; gain[i] >>= fMin(DFRACT_BITS - 1, -gain_sf[i]);
gain_sf[i] = 0; gain_sf[i] = 0;
} }
} else { } else {
@ -683,11 +683,6 @@ static void apply_inter_tes(FIXP_DBL **qmfReal, FIXP_DBL **qmfImag,
/* gain[i] = g_inter[i] */ /* gain[i] = g_inter[i] */
for (i = 0; i < nbSubsample; ++i) { for (i = 0; i < nbSubsample; ++i) {
if (gain_sf[i] < 0) {
gain[i] >>= -gain_sf[i];
gain_sf[i] = 0;
}
/* calculate: gain[i] = 1.0f + gamma * (gain[i] - 1.0f); */ /* calculate: gain[i] = 1.0f + gamma * (gain[i] - 1.0f); */
FIXP_DBL one = (FIXP_DBL)MAXVAL_DBL >> FIXP_DBL one = (FIXP_DBL)MAXVAL_DBL >>
gain_sf[i]; /* to substract this from gain[i] */ gain_sf[i]; /* to substract this from gain[i] */
@ -755,23 +750,15 @@ static void apply_inter_tes(FIXP_DBL **qmfReal, FIXP_DBL **qmfImag,
int gain_adj_sf = gain_adj_2_sf; int gain_adj_sf = gain_adj_2_sf;
for (i = 0; i < nbSubsample; ++i) { for (i = 0; i < nbSubsample; ++i) {
gain[i] = fMult(gain[i], gain_adj); int gain_e = fMax(
gain_sf[i] += gain_adj_sf; fMin(gain_sf[i] + gain_adj_sf - INTER_TES_SF_CHANGE, DFRACT_BITS - 1),
-(DFRACT_BITS - 1));
/* limit gain */ FIXP_DBL gain_final = fMult(gain[i], gain_adj);
if (gain_sf[i] > INTER_TES_SF_CHANGE) { gain_final = scaleValueSaturate(gain_final, gain_e);
gain[i] = (FIXP_DBL)MAXVAL_DBL;
gain_sf[i] = INTER_TES_SF_CHANGE;
}
}
for (i = 0; i < nbSubsample; ++i) {
/* equalize gain[]'s scale factors */
gain[i] >>= INTER_TES_SF_CHANGE - gain_sf[i];
for (j = lowSubband; j < highSubband; j++) { for (j = lowSubband; j < highSubband; j++) {
qmfReal[startPos + i][j] = fMult(qmfReal[startPos + i][j], gain[i]); qmfReal[startPos + i][j] = fMult(qmfReal[startPos + i][j], gain_final);
qmfImag[startPos + i][j] = fMult(qmfImag[startPos + i][j], gain[i]); qmfImag[startPos + i][j] = fMult(qmfImag[startPos + i][j], gain_final);
} }
} }
} else { /* gamma_idx == 0 */ } else { /* gamma_idx == 0 */