diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-05 21:12:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 21:12:04 +0000 |
| commit | 20e8db77ff09cefbe191f1e50815ff8f971a3353 (patch) | |
| tree | bf142920435664c4383eb7cc7a43c34100a72f11 | |
| parent | b802750fd273c5914970b4cfa0c959fc5fcc32a4 (diff) | |
| parent | d75233c2da4b49259d2e2de701f326d1a8d897b1 (diff) | |
| download | fdk-aac-20e8db77ff09cefbe191f1e50815ff8f971a3353.tar.gz fdk-aac-20e8db77ff09cefbe191f1e50815ff8f971a3353.tar.bz2 fdk-aac-20e8db77ff09cefbe191f1e50815ff8f971a3353.zip | |
Fix aacDecoder_drcExtractAndMap() am: 4834f01
am: d75233c
* commit 'd75233c2da4b49259d2e2de701f326d1a8d897b1':
Fix aacDecoder_drcExtractAndMap()
Change-Id: Ib64d28f680ed52b98fdaf75e124981abb95ba956
| -rw-r--r-- | libAACdec/src/aacdec_drc.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libAACdec/src/aacdec_drc.cpp b/libAACdec/src/aacdec_drc.cpp index 9cfc5d5..eb8e410 100644 --- a/libAACdec/src/aacdec_drc.cpp +++ b/libAACdec/src/aacdec_drc.cpp @@ -705,11 +705,7 @@ static int aacDecoder_drcExtractAndMap ( } self->numPayloads = 0; - if (self->numThreads >= MAX_DRC_THREADS) { - self->numThreads = MAX_DRC_THREADS - 1; - } - - if (self->dvbAncDataAvailable) + if (self->dvbAncDataAvailable && self->numThreads < MAX_DRC_THREADS) { /* Append a DVB heavy compression payload thread if available. */ int bitsParsed; @@ -735,10 +731,6 @@ static int aacDecoder_drcExtractAndMap ( /* coupling channels not supported */ - if (self->numThreads >= MAX_DRC_THREADS) { - self->numThreads = MAX_DRC_THREADS - 1; - } - /* check for valid threads */ for (thread = 0; thread < self->numThreads; thread++) { CDrcPayload *pThreadBs = &threadBs[thread]; |