diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-04-15 15:38:08 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-04-15 15:38:08 +0200 |
| commit | 9c1ec56d860d76819f6d454441b1a7b9c8f7cdd2 (patch) | |
| tree | 715b55b36c7ba7a032edce6e7026fcee9cac0cee /libAACdec | |
| parent | c7f9c2d1d996ac8f67927e9c86b907196ca6a72d (diff) | |
| parent | 4edc5c4808c2a21e6dc8dc6c8d5a00290d042528 (diff) | |
| download | fdk-aac-9c1ec56d860d76819f6d454441b1a7b9c8f7cdd2.tar.gz fdk-aac-9c1ec56d860d76819f6d454441b1a7b9c8f7cdd2.tar.bz2 fdk-aac-9c1ec56d860d76819f6d454441b1a7b9c8f7cdd2.zip | |
Merge remote-tracking branch 'mstorjo/master' into dabplus2
Diffstat (limited to 'libAACdec')
| -rw-r--r-- | libAACdec/src/aacdecoder_lib.cpp | 10 | ||||
| -rw-r--r-- | libAACdec/src/conceal.cpp | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp index f287003..7df17b9 100644 --- a/libAACdec/src/aacdecoder_lib.cpp +++ b/libAACdec/src/aacdecoder_lib.cpp @@ -1400,9 +1400,13 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, mpegSurroundDecoder_ConfigureQmfDomain( (CMpegSurroundDecoder *)self->pMpegSurroundDecoder, sac_interface, (UINT)self->streamInfo.aacSampleRate, self->streamInfo.aot); - self->qmfDomain.globalConf.nQmfTimeSlots_requested = - self->streamInfo.aacSamplesPerFrame / - self->qmfDomain.globalConf.nBandsAnalysis_requested; + if (self->qmfDomain.globalConf.nBandsAnalysis_requested > 0) { + self->qmfDomain.globalConf.nQmfTimeSlots_requested = + self->streamInfo.aacSamplesPerFrame / + self->qmfDomain.globalConf.nBandsAnalysis_requested; + } else { + self->qmfDomain.globalConf.nQmfTimeSlots_requested = 0; + } } self->qmfDomain.globalConf.TDinput = pTimeData; diff --git a/libAACdec/src/conceal.cpp b/libAACdec/src/conceal.cpp index cc6de75..5895cb8 100644 --- a/libAACdec/src/conceal.cpp +++ b/libAACdec/src/conceal.cpp @@ -2081,11 +2081,11 @@ static void CConcealment_TDNoise_Apply(CConcealmentInfo *const pConcealmentInfo, noiseVal = FX_DBL2FX_PCM(fMult(noiseValLong, TDNoiseAtt)); /* add filtered noise - check for clipping, before */ - if (pcmdata[ii] > (FIXP_PCM)MAXVAL_FIXP_PCM - noiseVal && - noiseVal > (FIXP_PCM)0) { + if (noiseVal > (FIXP_PCM)0 && + pcmdata[ii] > (FIXP_PCM)MAXVAL_FIXP_PCM - noiseVal) { noiseVal = noiseVal * (FIXP_PCM)-1; - } else if (pcmdata[ii] < (FIXP_PCM)MINVAL_FIXP_PCM - noiseVal && - noiseVal < (FIXP_PCM)0) { + } else if (noiseVal < (FIXP_PCM)0 && + pcmdata[ii] < (FIXP_PCM)MINVAL_FIXP_PCM - noiseVal) { noiseVal = noiseVal * (FIXP_PCM)-1; } |