fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix aacDecoder_drcExtractAndMap() am: 4834f01 

am: d75233c

* commit 'd75233c2da4b49259d2e2de701f326d1a8d897b1':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: Ib64d28f680ed52b98fdaf75e124981abb95ba956
This commit is contained in:
Jean-Michel Trivi 2016-04-05 21:12:04 +00:00 committed by android-build-merger
parent b802750fd2 d75233c2da
commit 20e8db77ff
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libAACdec/src/aacdec_drc.cpp
View File

@ -705,11 +705,7 @@ static int aacDecoder_drcExtractAndMap (
} }
self->numPayloads = 0; self->numPayloads = 0;
if (self->numThreads >= MAX_DRC_THREADS) { if (self->dvbAncDataAvailable && self->numThreads < MAX_DRC_THREADS)
self->numThreads = MAX_DRC_THREADS - 1;
}
if (self->dvbAncDataAvailable)
{ /* Append a DVB heavy compression payload thread if available. */ { /* Append a DVB heavy compression payload thread if available. */
int bitsParsed; int bitsParsed;
@ -735,10 +731,6 @@ static int aacDecoder_drcExtractAndMap (
/* coupling channels not supported */ /* coupling channels not supported */
if (self->numThreads >= MAX_DRC_THREADS) {
self->numThreads = MAX_DRC_THREADS - 1;
}
/* check for valid threads */ /* check for valid threads */
for (thread = 0; thread < self->numThreads; thread++) { for (thread = 0; thread < self->numThreads; thread++) {
CDrcPayload *pThreadBs = &threadBs[thread]; CDrcPayload *pThreadBs = &threadBs[thread];