diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-19 00:50:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-19 00:50:57 +0000 |
| commit | 1a54e8f6385f9cbb8d950f0ff003bb71daa62caf (patch) | |
| tree | 36524f8b79ead3f8d15670cf3737fbc8ac9cb5f1 | |
| parent | 47739cd9d8d7842436b90ef14207c935b0a799fe (diff) | |
| parent | b762ff3e4fdc29ce517824e19d187ba667e80623 (diff) | |
| download | fdk-aac-1a54e8f6385f9cbb8d950f0ff003bb71daa62caf.tar.gz fdk-aac-1a54e8f6385f9cbb8d950f0ff003bb71daa62caf.tar.bz2 fdk-aac-1a54e8f6385f9cbb8d950f0ff003bb71daa62caf.zip | |
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425
am: b762ff3e4f
* commit 'b762ff3e4fdc29ce517824e19d187ba667e80623':
Fix aacDecoder_drcExtractAndMap()
Change-Id: I29eaf51574e1834f223a9755a353abd90fcf912b
| -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]; |