fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-01-30 23:45:09 +01:00
Code Issues Projects Releases Wiki Activity

Limit too large shift exponent in CJointStereo_ApplyMS()

Browse Source 
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ia6ab654654e899368ba207a66eddf22b6b855635
This commit is contained in:
Fraunhofer IIS FDK 2019-08-09 17:10:07 +02:00 committed by Jean-Michel Trivi
parent 6f98eab350
commit 15965e3feb
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libAACdec/src/stereo.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 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
@ -807,19 +807,17 @@ void CJointStereo_ApplyMS(
for (int i = 0; i < windowLen; i++) {
dmx_re_prev[i] =
((staticSpectralCoeffsL[index_offset + i] >>
srLeftChan) +
fMin(DFRACT_BITS - 1, srLeftChan + 1)) +
(staticSpectralCoeffsR[index_offset + i] >>
srRightChan)) >>
1;
fMin(DFRACT_BITS - 1, srRightChan + 1)));
}
} else {
for (int i = 0; i < windowLen; i++) {
dmx_re_prev[i] =
((staticSpectralCoeffsL[index_offset + i] >>
srLeftChan) -
fMin(DFRACT_BITS - 1, srLeftChan + 1)) -
(staticSpectralCoeffsR[index_offset + i] >>
srRightChan)) >>
1;
fMin(DFRACT_BITS - 1, srRightChan + 1)));
}
}
}
@ -854,12 +852,13 @@ void CJointStereo_ApplyMS(
if (window == 0) {
if (dmx_re_prev_e < frameMaxScale) {
if (mainband_flag == 0) {
scaleValues(dmx_re_prev, store_dmx_re_prev, windowLen,
-(frameMaxScale - dmx_re_prev_e));
scaleValues(
dmx_re_prev, store_dmx_re_prev, windowLen,
-fMin(DFRACT_BITS - 1, (frameMaxScale - dmx_re_prev_e)));
} else {
for (int i = 0; i < windowLen; i++) {
dmx_re_prev[i] >>= (frameMaxScale - dmx_re_prev_e);
}
scaleValues(
dmx_re_prev, windowLen,
-fMin(DFRACT_BITS - 1, (frameMaxScale - dmx_re_prev_e)));
}
} else {
if (mainband_flag == 0) {
@ -873,10 +872,9 @@ void CJointStereo_ApplyMS(
FDK_ASSERT(pAacDecoderChannelInfo[L]->icsInfo.WindowSequence ==
BLOCK_SHORT);
if (specScaleL[window - 1] < frameMaxScale) {
for (int i = 0; i < windowLen; i++) {
dmx_re[windowLen * (window - 1) + i] >>=
(frameMaxScale - specScaleL[window - 1]);
}
scaleValues(&dmx_re[windowLen * (window - 1)], windowLen,
-fMin(DFRACT_BITS - 1,
(frameMaxScale - specScaleL[window - 1])));
} else {
specScaleL[window] = specScaleL[window - 1];
specScaleR[window] = specScaleR[window - 1];