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: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 

am: 6318d60241

* commit '6318d6024194f89d809f4e22266105f27389f41b':
  Fix aacDecoder_drcExtractAndMap()

Change-Id: I1a836bd8b024948f18b2d2c0e912601722f887bc
This commit is contained in:
Jean-Michel Trivi 2016-04-19 01:00:01 +00:00 committed by android-build-merger
parent 118fc75eee 6318d60241
commit 7147e71a75
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];