aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2018-12-20 15:52:46 +0100
committerJean-Michel Trivi <jmtrivi@google.com>2019-01-02 14:01:25 -0500
commite81e8c2cc0b978e986fcb59dfca0ebfcd4db2a8e (patch)
treece6a09a61b0194fa8a55bda052261e7844bf5414
parent5174d33de07f94293ec7450641f96e799805ddb8 (diff)
downloadfdk-aac-e81e8c2cc0b978e986fcb59dfca0ebfcd4db2a8e.tar.gz
fdk-aac-e81e8c2cc0b978e986fcb59dfca0ebfcd4db2a8e.tar.bz2
fdk-aac-e81e8c2cc0b978e986fcb59dfca0ebfcd4db2a8e.zip
Do not support channel configuration change within PCE
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Change-Id: I94bddad6c88148dd01fff0850e261d98ef691793
-rw-r--r--libAACdec/src/aacdecoder.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index fffc1f0..8f03328 100644
--- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp
@@ -539,13 +539,7 @@ static int CProgramConfigElement_Read(HANDLE_FDK_BITSTREAM bs,
sizeof(CProgramConfig)); /* Store the complete PCE */
pceStatus = 1; /* New PCE but no change of config */
break;
- case 2: /* The number of channels are identical but not the config */
- if (channelConfig == 0) {
- FDKmemcpy(pce, tmpPce,
- sizeof(CProgramConfig)); /* Store the complete PCE */
- pceStatus = 2; /* Decoder needs re-configuration */
- }
- break;
+ case 2: /* The number of channels are identical but not the config */
case -1: /* The channel configuration is completely different */
pceStatus = -1; /* Not supported! */
break;