fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-06 18:53:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge "Add QMF analysis band sanity check" am: b30e02cfd3 am: db4a1deb28

Browse Source 
am: 6ff2d3cf8e

Change-Id: I12bc58a0ed01daba0295a4a8feab853b6cc3f0f0
This commit is contained in:
Jean-Michel Trivi 2019-02-01 07:54:00 -08:00 committed by android-build-merger
commit 169e4207a3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libAACdec/src/aacdecoder_lib.cpp
View File

@ -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;

4
libSACdec/src/sac_dec_lib.cpp
View File

@ -1658,6 +1658,10 @@ int mpegSurroundDecoder_Apply(CMpegSurroundDecoder *pMpegSurroundDecoder,
initControlFlags = controlFlags;
/* Check that provided output buffer is large enough. */
if (pMpegSurroundDecoder->pQmfDomain->globalConf.nBandsAnalysis == 0) {
err = MPS_UNSUPPORTED_FORMAT;
goto bail;
}
timeDataRequiredSize =
(timeDataFrameSize *
pMpegSurroundDecoder->pSpatialDec->numOutputChannelsAT *