diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-19 01:30:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-19 01:30:15 +0000 |
| commit | 0cf3a7671ad40c1036387d55462f1710a44eec31 (patch) | |
| tree | 459cd88bd1541423d377b1e05fcc80472381823b /libAACdec | |
| parent | 7657556633262752ad2db9e3914a04128bd64e1b (diff) | |
| parent | d110691d01e15a555d84fcd98e4b275dd38b37ba (diff) | |
| download | fdk-aac-0cf3a7671ad40c1036387d55462f1710a44eec31.tar.gz fdk-aac-0cf3a7671ad40c1036387d55462f1710a44eec31.tar.bz2 fdk-aac-0cf3a7671ad40c1036387d55462f1710a44eec31.zip | |
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f
am: d110691d01
* commit 'd110691d01e15a555d84fcd98e4b275dd38b37ba':
Fix aacDecoder_drcExtractAndMap()
Change-Id: I6c009e94d626cc1dd6ec1510fd2e07c1b3a4031a
Diffstat (limited to 'libAACdec')
| -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]; |