fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-06 18:53:31 +01:00
Code Issues Projects Releases Wiki Activity

Reject unsupported channel configuration / audio object type combinations.

Browse Source 
Bug: 131430997
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I84bd355df0f690636c109695d8df64fa7bdcf63c
This commit is contained in:
Fraunhofer IIS FDK 2019-08-09 17:07:39 +02:00 committed by Jean-Michel Trivi
parent 2b5217a953
commit 572f59359a
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libMpegTPDec/src/tpdec_asc.cpp
View File

@ -2144,6 +2144,24 @@ TRANSPORTDEC_ERROR AudioSpecificConfig_Parse(
self->m_channelConfiguration = FDKreadBits(bs, 4);
/* MPEG-04 standard ISO/IEC 14496-3: channelConfiguration == 0 is reserved
in er_raw_data_block (table 4.19) and er_raw_data_block_eld (table 4.75)
MPEG-04 conformance ISO/IEC 14496-4: channelConfiguration == 0 is not
permitted for AOT_ER_AAC_LC, AOT_ER_AAC_LTP, AOT_ER_AAC_LD,
AOT_ER_AAC_SCAL (chapter 6.6.4.1.2.1.1) */
if ((self->m_channelConfiguration == 0) &&
((self->m_aot == AOT_ER_AAC_LC) || (self->m_aot == AOT_ER_AAC_LTP) ||
(self->m_aot == AOT_ER_AAC_LD) || (self->m_aot == AOT_ER_AAC_SCAL) ||
(self->m_aot == AOT_ER_AAC_ELD))) {
return TRANSPORTDEC_UNSUPPORTED_FORMAT;
}
/* MPEG-04 conformance ISO/IEC 14496-4: channelConfiguration > 2 is not
* permitted for AOT_AAC_SCAL and AOT_ER_AAC_SCAL (chapter 6.6.4.1.2.1.1) */
if ((self->m_channelConfiguration > 2) &&
((self->m_aot == AOT_AAC_SCAL) || (self->m_aot == AOT_ER_AAC_SCAL))) {
return TRANSPORTDEC_UNSUPPORTED_FORMAT;
}
/* SBR extension ( explicit non-backwards compatible mode ) */
self->m_sbrPresentFlag = 0;
self->m_psPresentFlag = 0;