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

Call QMF transposer initialization only with successful SBR processing 

Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Change-Id: I8a8626a83e1bd87b2c14fad7c90174e4172c01b6
This commit is contained in:
Fraunhofer IIS FDK 2018-10-19 16:41:01 +02:00 committed by Jean-Michel Trivi
parent 804f41ac64
commit 0271d6a6f3
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libSBRdec/src/hbe.cpp
View File

@ -1056,6 +1056,10 @@ SBR_ERROR QmfTransposerReInit(HANDLE_HBE_TRANSPOSER hQmfTransposer,
const FIXP_QTW* tmp_t_sin; const FIXP_QTW* tmp_t_sin;
hQmfTransposer->startBand = FreqBandTable[0][0]; hQmfTransposer->startBand = FreqBandTable[0][0];
FDK_ASSERT((!hQmfTransposer->bSbr41 && hQmfTransposer->startBand <= 32) ||
(hQmfTransposer->bSbr41 &&
hQmfTransposer->startBand <=
16)); /* is checked by resetFreqBandTables() */
hQmfTransposer->stopBand = FreqBandTable[0][NSfb[0]]; hQmfTransposer->stopBand = FreqBandTable[0][NSfb[0]];
hQmfTransposer->synthSize = hQmfTransposer->synthSize =

2
libSBRdec/src/sbr_dec.cpp
View File

@ -1248,7 +1248,7 @@ resetSbrDec(HANDLE_SBR_DEC hSbrDec, HANDLE_SBR_HEADER_DATA hHeaderData,
hSbrDec->savedStates = 0; hSbrDec->savedStates = 0;
if (flags & SBRDEC_USAC_HARMONICSBR) { if ((flags & SBRDEC_USAC_HARMONICSBR) && applySbrProc) {
sbrError = QmfTransposerReInit(hSbrDec->hHBE, sbrError = QmfTransposerReInit(hSbrDec->hHBE,
hHeaderData->freqBandData.freqBandTable, hHeaderData->freqBandData.freqBandTable,
hHeaderData->freqBandData.nSfb); hHeaderData->freqBandData.nSfb);

5
libSBRdec/src/sbrdecoder.cpp
View File

@ -1677,6 +1677,9 @@ static SBR_ERROR sbrDecoder_DecodeElement(
/* reset */ /* reset */
if (hSbrHeader->status & SBRDEC_HDR_STAT_RESET) { if (hSbrHeader->status & SBRDEC_HDR_STAT_RESET) {
int ch; int ch;
int applySbrProc = (hSbrHeader->syncState == SBR_ACTIVE ||
(hSbrHeader->frameErrorFlag == 0 &&
hSbrHeader->syncState == SBR_HEADER));
for (ch = 0; ch < numElementChannels; ch++) { for (ch = 0; ch < numElementChannels; ch++) {
SBR_ERROR errorStatusTmp = SBRDEC_OK; SBR_ERROR errorStatusTmp = SBRDEC_OK;
@ -1688,8 +1691,10 @@ static SBR_ERROR sbrDecoder_DecodeElement(
hSbrHeader->syncState = UPSAMPLING; hSbrHeader->syncState = UPSAMPLING;
} }
} }
if (applySbrProc) {
hSbrHeader->status &= ~SBRDEC_HDR_STAT_RESET; hSbrHeader->status &= ~SBRDEC_HDR_STAT_RESET;
} }
}
/* decoding */ /* decoding */
if ((hSbrHeader->syncState == SBR_ACTIVE) || if ((hSbrHeader->syncState == SBR_ACTIVE) ||