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

Make sure that alphaValue is correctly initialized in sbrDecoder_drcApplySlot(). 

Bug: 176246647
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I5bded2e3d29278bb5df561eaa2a46d963ee21df8
This commit is contained in:
Fraunhofer IIS FDK 2020-04-09 17:55:17 +02:00 committed by Jean-Michel Trivi
parent 293ccc7fbc
commit 9256cfbb73
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libSBRdec/src/sbrdec_drc.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 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -233,14 +233,19 @@ void sbrDecoder_drcApplySlot(HANDLE_SBR_DRC_CHANNEL hDrcData,
if (hDrcData->winSequenceCurr != 2) { /* long window */ if (hDrcData->winSequenceCurr != 2) { /* long window */
int j = col + (numQmfSubSamples >> 1); int j = col + (numQmfSubSamples >> 1);
if (hDrcData->drcInterpolationSchemeCurr == 0) { if (j < winBorderToColMap[15]) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000; if (hDrcData->drcInterpolationSchemeCurr == 0) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
alphaValue = (FIXP_DBL)(j * k); alphaValue = (FIXP_DBL)(j * k);
} else { } else {
if (j >= (int)winBorderToColMap[hDrcData->drcInterpolationSchemeCurr]) { if (j >=
alphaValue = (FIXP_DBL)MAXVAL_DBL; (int)winBorderToColMap[hDrcData->drcInterpolationSchemeCurr]) {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
}
} }
} else {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
} }
} else { /* short windows */ } else { /* short windows */
shortDrc = 1; shortDrc = 1;
@ -254,14 +259,19 @@ void sbrDecoder_drcApplySlot(HANDLE_SBR_DRC_CHANNEL hDrcData,
if (hDrcData->winSequenceNext != 2) { /* next: long window */ if (hDrcData->winSequenceNext != 2) { /* next: long window */
int j = col - (numQmfSubSamples >> 1); int j = col - (numQmfSubSamples >> 1);
if (hDrcData->drcInterpolationSchemeNext == 0) { if (j < winBorderToColMap[15]) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000; if (hDrcData->drcInterpolationSchemeNext == 0) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
alphaValue = (FIXP_DBL)(j * k); alphaValue = (FIXP_DBL)(j * k);
} else { } else {
if (j >= (int)winBorderToColMap[hDrcData->drcInterpolationSchemeNext]) { if (j >=
alphaValue = (FIXP_DBL)MAXVAL_DBL; (int)winBorderToColMap[hDrcData->drcInterpolationSchemeNext]) {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
}
} }
} else {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
} }
fact_mag = hDrcData->nextFact_mag; fact_mag = hDrcData->nextFact_mag;
@ -289,14 +299,19 @@ void sbrDecoder_drcApplySlot(HANDLE_SBR_DRC_CHANNEL hDrcData,
if (hDrcData->winSequenceNext != 2) { /* long window */ if (hDrcData->winSequenceNext != 2) { /* long window */
int j = col - (numQmfSubSamples >> 1); int j = col - (numQmfSubSamples >> 1);
if (hDrcData->drcInterpolationSchemeNext == 0) { if (j < winBorderToColMap[15]) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000; if (hDrcData->drcInterpolationSchemeNext == 0) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
alphaValue = (FIXP_DBL)(j * k); alphaValue = (FIXP_DBL)(j * k);
} else { } else {
if (j >= (int)winBorderToColMap[hDrcData->drcInterpolationSchemeNext]) { if (j >=
alphaValue = (FIXP_DBL)MAXVAL_DBL; (int)winBorderToColMap[hDrcData->drcInterpolationSchemeNext]) {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
}
} }
} else {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
} }
} else { /* short windows */ } else { /* short windows */
shortDrc = 1; shortDrc = 1;