diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-05 21:08:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 21:08:27 +0000 |
| commit | d75233c2da4b49259d2e2de701f326d1a8d897b1 (patch) | |
| tree | bf142920435664c4383eb7cc7a43c34100a72f11 | |
| parent | 65750eae6583754ea9d84fed41dc12d1fc3d73d0 (diff) | |
| parent | 4834f01bdf9b9f371fcbb0b9cf4f7297fdf1fd55 (diff) | |
| download | fdk-aac-d75233c2da4b49259d2e2de701f326d1a8d897b1.tar.gz fdk-aac-d75233c2da4b49259d2e2de701f326d1a8d897b1.tar.bz2 fdk-aac-d75233c2da4b49259d2e2de701f326d1a8d897b1.zip | |
Fix aacDecoder_drcExtractAndMap()
am: 4834f01
* commit '4834f01bdf9b9f371fcbb0b9cf4f7297fdf1fd55':
Fix aacDecoder_drcExtractAndMap()
Change-Id: I4f9994a4d4e858b6193b006d6971536c391e0478
| -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]; |