aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2018-12-20 15:52:46 +0100
committerJean-Michel Trivi <jmtrivi@google.com>2019-01-15 12:19:05 -0500
commitc47066df27e6ba6eb3f9d00e663796b54e9f64e7 (patch)
treec1852ff4e55efbb73fa66528e1d6fbff09fc0d72 /libAACdec
parentbcda185d5694ad9d3f28f919f8b03000510b4d63 (diff)
downloadfdk-aac-c47066df27e6ba6eb3f9d00e663796b54e9f64e7.tar.gz
fdk-aac-c47066df27e6ba6eb3f9d00e663796b54e9f64e7.tar.bz2
fdk-aac-c47066df27e6ba6eb3f9d00e663796b54e9f64e7.zip
Add QMF analysis band sanity check
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I0001e0996a970e91a21bfe8ba051fdba0c06c219
Diffstat (limited to 'libAACdec')
-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 cbcd404..c214ba1 100644
--- a/libAACdec/src/aacdecoder_lib.cpp
+++ b/libAACdec/src/aacdecoder_lib.cpp
@@ -1398,9 +1398,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;