fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Return transport decoder error in case of invalid ELD configuration" 

am: 7884aefc84

Change-Id: Iff226ac091d4dffb5d94033c0afcfb0af4c5bfd2
This commit is contained in:
Jean-Michel Trivi 2019-01-02 12:46:39 -08:00 committed by android-build-merger
parent 8d06f35f31 7884aefc84
commit 81b04be9ba
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libMpegTPDec/src/tpdec_asc.cpp
View File

@ -1420,6 +1420,10 @@ static TRANSPORTDEC_ERROR EldSpecificConfig_Parse(CSAudioSpecificConfig *asc,
if (ErrorStatus != TRANSPORTDEC_OK) { if (ErrorStatus != TRANSPORTDEC_OK) {
return TRANSPORTDEC_PARSE_ERROR; return TRANSPORTDEC_PARSE_ERROR;
} }
if (esc->m_downscaledSamplingFrequency != asc->m_samplingFrequency) {
return TRANSPORTDEC_UNSUPPORTED_FORMAT; /* ELDv2 w/ ELD downscaled
mode not allowed */
}
break; break;
} }
@ -1441,6 +1445,10 @@ static TRANSPORTDEC_ERROR EldSpecificConfig_Parse(CSAudioSpecificConfig *asc,
if (downscale_fill_nibble != 0x0) { if (downscale_fill_nibble != 0x0) {
return TRANSPORTDEC_PARSE_ERROR; return TRANSPORTDEC_PARSE_ERROR;
} }
if (esc->m_useLdQmfTimeAlign == 1) {
return TRANSPORTDEC_UNSUPPORTED_FORMAT; /* ELDv2 w/ ELD downscaled
mode not allowed */
}
break; break;
} }
} }