aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec/src/aacdecoder_lib.cpp
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2019-03-15 14:03:19 +0200
committerMartin Storsjo <martin@martin.st>2019-03-15 14:03:19 +0200
commit4edc5c4808c2a21e6dc8dc6c8d5a00290d042528 (patch)
treef4e87a39dfeadfb60bfadc9f6851c1cf4420e856 /libAACdec/src/aacdecoder_lib.cpp
parent95858d7bd36f19bde4a9595e2bd68f195215b164 (diff)
parentd5724aefe91189c173833d792f1ab1b5e17d8eec (diff)
downloadfdk-aac-4edc5c4808c2a21e6dc8dc6c8d5a00290d042528.tar.gz
fdk-aac-4edc5c4808c2a21e6dc8dc6c8d5a00290d042528.tar.bz2
fdk-aac-4edc5c4808c2a21e6dc8dc6c8d5a00290d042528.zip
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libAACdec/src/aacdecoder_lib.cpp')
-rw-r--r--libAACdec/src/aacdecoder_lib.cpp10
1 files changed, 7 insertions, 3 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;