diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-19 00:48:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-19 00:48:42 +0000 |
| commit | b762ff3e4fdc29ce517824e19d187ba667e80623 (patch) | |
| tree | 8c421956dd65ce2292ab691dd87ca42cb0b21b75 | |
| parent | a06d1c2b9af1621037b48557aac42b5ecbdb03b3 (diff) | |
| parent | be3ff35425f026fb3714f1bd45c40aee6737fe05 (diff) | |
| download | fdk-aac-b762ff3e4fdc29ce517824e19d187ba667e80623.tar.gz fdk-aac-b762ff3e4fdc29ce517824e19d187ba667e80623.tar.bz2 fdk-aac-b762ff3e4fdc29ce517824e19d187ba667e80623.zip | |
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d
am: be3ff35425
* commit 'be3ff35425f026fb3714f1bd45c40aee6737fe05':
Fix aacDecoder_drcExtractAndMap()
Change-Id: I82060408eab9a8990c511af4c6be8a588d2a1b49
| -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 f939a1a..b836746 100644 --- a/libAACdec/src/aacdec_drc.cpp +++ b/libAACdec/src/aacdec_drc.cpp @@ -680,11 +680,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; @@ -710,10 +706,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]; |