diff options
| author | Xin Li <delphij@google.com> | 2021-10-06 22:52:53 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-10-06 22:52:53 +0000 |
| commit | 1b5221d9fee482e03342eb1593f580754fa7ab3f (patch) | |
| tree | c6a1ddee22e29d9ea00ec2523071a711368189cd /libSBRdec/src/sbrdec_freq_sca.cpp | |
| parent | 6d10f91a77002b6371ebada491f507ef974ca572 (diff) | |
| parent | a950cd990528f07b93cc5af48145e7cb6bfeb3ca (diff) | |
| download | fdk-aac-1b5221d9fee482e03342eb1593f580754fa7ab3f.tar.gz fdk-aac-1b5221d9fee482e03342eb1593f580754fa7ab3f.tar.bz2 fdk-aac-1b5221d9fee482e03342eb1593f580754fa7ab3f.zip | |
Merge Android 12
Bug: 202323961
Merged-In: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
Change-Id: Iebff00b0ddec06e5d43a6f0109325613701dc05d
Diffstat (limited to 'libSBRdec/src/sbrdec_freq_sca.cpp')
| -rw-r--r-- | libSBRdec/src/sbrdec_freq_sca.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libSBRdec/src/sbrdec_freq_sca.cpp b/libSBRdec/src/sbrdec_freq_sca.cpp index e187656..daa3554 100644 --- a/libSBRdec/src/sbrdec_freq_sca.cpp +++ b/libSBRdec/src/sbrdec_freq_sca.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -765,9 +765,6 @@ resetFreqBandTables(HANDLE_SBR_HEADER_DATA hHeaderData, const UINT flags) { sbrdecUpdateLoRes(hFreq->freqBandTable[0], &nBandsLo, hFreq->freqBandTable[1], nBandsHi); - hFreq->nSfb[0] = nBandsLo; - hFreq->nSfb[1] = nBandsHi; - /* Check index to freqBandTable[0] */ if (!(nBandsLo > 0) || (nBandsLo > (((hHeaderData->numberOfAnalysisBands == 16) @@ -777,6 +774,9 @@ resetFreqBandTables(HANDLE_SBR_HEADER_DATA hHeaderData, const UINT flags) { return SBRDEC_UNSUPPORTED_CONFIG; } + hFreq->nSfb[0] = nBandsLo; + hFreq->nSfb[1] = nBandsHi; + lsb = hFreq->freqBandTable[0][0]; usb = hFreq->freqBandTable[0][nBandsLo]; @@ -814,15 +814,15 @@ resetFreqBandTables(HANDLE_SBR_HEADER_DATA hHeaderData, const UINT flags) { if (intTemp == 0) intTemp = 1; + if (intTemp > MAX_NOISE_COEFFS) { + return SBRDEC_UNSUPPORTED_CONFIG; + } + hFreq->nNfb = intTemp; } hFreq->nInvfBands = hFreq->nNfb; - if (hFreq->nNfb > MAX_NOISE_COEFFS) { - return SBRDEC_UNSUPPORTED_CONFIG; - } - /* Get noise bands */ sbrdecDownSampleLoRes(hFreq->freqBandTableNoise, hFreq->nNfb, hFreq->freqBandTable[0], nBandsLo); |