diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2019-02-01 07:49:57 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-01 07:49:57 -0800 |
| commit | 6ff2d3cf8efdc5c436d6a20d065063d50fd4ec09 (patch) | |
| tree | a7dcb32bd00be5b642f57235267938e0dbffb0e3 /libAACdec | |
| parent | 7ca245e21efa4ca0c934833a3763365d85daf6bf (diff) | |
| parent | db4a1deb28561e79086d041f704c8d83b7c8a0ed (diff) | |
| download | fdk-aac-6ff2d3cf8efdc5c436d6a20d065063d50fd4ec09.tar.gz fdk-aac-6ff2d3cf8efdc5c436d6a20d065063d50fd4ec09.tar.bz2 fdk-aac-6ff2d3cf8efdc5c436d6a20d065063d50fd4ec09.zip | |
Merge "Add QMF analysis band sanity check" am: b30e02cfd3
am: db4a1deb28
Change-Id: I0b4b5de02becd0a105e9958231ef2e58000d2cc8
Diffstat (limited to 'libAACdec')
| -rw-r--r-- | libAACdec/src/aacdecoder_lib.cpp | 10 |
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; |