fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-07 15:18:48 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot 2020-12-28 18:33:39 +00:00 committed by Android (Google) Code Review
commit d4fb5f5374
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
© 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.
1. INTRODUCTION
@ -233,14 +233,19 @@ void sbrDecoder_drcApplySlot(HANDLE_SBR_DRC_CHANNEL hDrcData,
if (hDrcData->winSequenceCurr != 2) { /* long window */
int j = col + (numQmfSubSamples >> 1);
if (hDrcData->drcInterpolationSchemeCurr == 0) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
if (j < winBorderToColMap[15]) {
if (hDrcData->drcInterpolationSchemeCurr == 0) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
alphaValue = (FIXP_DBL)(j * k);
} else {
if (j >= (int)winBorderToColMap[hDrcData->drcInterpolationSchemeCurr]) {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
alphaValue = (FIXP_DBL)(j * k);
} else {
if (j >=
(int)winBorderToColMap[hDrcData->drcInterpolationSchemeCurr]) {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
}
}
} else {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
}
} else { /* short windows */
shortDrc = 1;
@ -254,14 +259,19 @@ void sbrDecoder_drcApplySlot(HANDLE_SBR_DRC_CHANNEL hDrcData,
if (hDrcData->winSequenceNext != 2) { /* next: long window */
int j = col - (numQmfSubSamples >> 1);
if (hDrcData->drcInterpolationSchemeNext == 0) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
if (j < winBorderToColMap[15]) {
if (hDrcData->drcInterpolationSchemeNext == 0) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
alphaValue = (FIXP_DBL)(j * k);
} else {
if (j >= (int)winBorderToColMap[hDrcData->drcInterpolationSchemeNext]) {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
alphaValue = (FIXP_DBL)(j * k);
} else {
if (j >=
(int)winBorderToColMap[hDrcData->drcInterpolationSchemeNext]) {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
}
}
} else {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
}
fact_mag = hDrcData->nextFact_mag;
@ -289,14 +299,19 @@ void sbrDecoder_drcApplySlot(HANDLE_SBR_DRC_CHANNEL hDrcData,
if (hDrcData->winSequenceNext != 2) { /* long window */
int j = col - (numQmfSubSamples >> 1);
if (hDrcData->drcInterpolationSchemeNext == 0) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
if (j < winBorderToColMap[15]) {
if (hDrcData->drcInterpolationSchemeNext == 0) {
INT k = (frameLenFlag) ? 0x4444445 : 0x4000000;
alphaValue = (FIXP_DBL)(j * k);
} else {
if (j >= (int)winBorderToColMap[hDrcData->drcInterpolationSchemeNext]) {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
alphaValue = (FIXP_DBL)(j * k);
} else {
if (j >=
(int)winBorderToColMap[hDrcData->drcInterpolationSchemeNext]) {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
}
}
} else {
alphaValue = (FIXP_DBL)MAXVAL_DBL;
}
} else { /* short windows */
shortDrc = 1;