diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-05 12:38:32 -0700 |
|---|---|---|
| committer | Feng Yu <feny@google.com> | 2016-04-21 06:20:04 +0000 |
| commit | 84da67779f407ccc29f1658d48c43f087a9e19a3 (patch) | |
| tree | 459cd88bd1541423d377b1e05fcc80472381823b | |
| parent | 914c69093c4e529c822f6b15942852ccbd2c51a8 (diff) | |
| download | android_external_aac-84da67779f407ccc29f1658d48c43f087a9e19a3.tar.gz android_external_aac-84da67779f407ccc29f1658d48c43f087a9e19a3.tar.bz2 android_external_aac-84da67779f407ccc29f1658d48c43f087a9e19a3.zip | |
Fix aacDecoder_drcExtractAndMap()
Parse DVB DRC data only when numThreads is below
MAX_DRC_THREADS. The post-increment is necessary as
it is used in fill element DRC data section.
This solution parses as many DRC payloads as allowed by
MAX_DRC_THREADS and skips all remaining DRC elements in the stream.
Bug 27792766
Bug 26751339
Change-Id: Ie1641888bac1757c4d1491119f977fc5d436eaea
(cherry picked from commit 97a1b8140d410ed3942006aa22b40ccb322f747b)
| -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]; |