summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorezicomezigo <jonathan75sd@gmail.com>2017-12-20 18:25:56 +0900
committerezicomezigo <jonathan75sd@gmail.com>2017-12-20 18:25:56 +0900
commit89aeea5f292306c429550e4c9fe55d865c903600 (patch)
treeacc13865346f6bfe60ebc23ec39d9631c8dfd00f
parent1b0cec288c5a0867ee0c008cd5a846facb72a524 (diff)
downloadfdk-aac-89aeea5f292306c429550e4c9fe55d865c903600.tar.gz
fdk-aac-89aeea5f292306c429550e4c9fe55d865c903600.tar.bz2
fdk-aac-89aeea5f292306c429550e4c9fe55d865c903600.zip
Fix SBR multichannel noise
for 5.1 ch, the channel elements are as follows: SCE - CPE - CPE - LFE and the channel-mapping table for 5.1 ch is : { 2, 0, 1, 4, 5, 3,255,255}, /* 5.1ch */ For the last LFE channel, sbr decoder returns error, SBRDEC_UNSUPPORTED_CONFIG;
-rw-r--r--libSBRdec/src/sbrdecoder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libSBRdec/src/sbrdecoder.cpp b/libSBRdec/src/sbrdecoder.cpp
index 7d9468c..a341746 100644
--- a/libSBRdec/src/sbrdecoder.cpp
+++ b/libSBRdec/src/sbrdecoder.cpp
@@ -1444,7 +1444,7 @@ sbrDecoder_DecodeElement (
self->flags |= (applyPs) ? SBRDEC_PS_DECODED : 0;
}
- if (channelMapping[0] == 255 || channelMapping[1] == 255)
+ if (channelMapping[0] == 255 || ((*numOutChannels == 2) && channelMapping[1] == 255))
return SBRDEC_UNSUPPORTED_CONFIG;
if (!pSbrChannel[0]->SbrDec.LppTrans.pSettings)
return SBRDEC_UNSUPPORTED_CONFIG;