diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2019-01-02 20:35:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-02 20:35:07 +0000 |
| commit | 7884aefc84b56d7f805d8e84d378ab468274d3ff (patch) | |
| tree | 40e7c66aedbbc37b65f46caa6fbebd8d05e9bfbb | |
| parent | 3942213f19c242af6cf2768fee0cbb7f26c02ddc (diff) | |
| parent | 5174d33de07f94293ec7450641f96e799805ddb8 (diff) | |
| download | fdk-aac-7884aefc84b56d7f805d8e84d378ab468274d3ff.tar.gz fdk-aac-7884aefc84b56d7f805d8e84d378ab468274d3ff.tar.bz2 fdk-aac-7884aefc84b56d7f805d8e84d378ab468274d3ff.zip | |
Merge "Return transport decoder error in case of invalid ELD configuration"
| -rw-r--r-- | libMpegTPDec/src/tpdec_asc.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp index a81a137..5270f2b 100644 --- a/libMpegTPDec/src/tpdec_asc.cpp +++ b/libMpegTPDec/src/tpdec_asc.cpp @@ -1420,6 +1420,10 @@ static TRANSPORTDEC_ERROR EldSpecificConfig_Parse(CSAudioSpecificConfig *asc, if (ErrorStatus != TRANSPORTDEC_OK) { return TRANSPORTDEC_PARSE_ERROR; } + if (esc->m_downscaledSamplingFrequency != asc->m_samplingFrequency) { + return TRANSPORTDEC_UNSUPPORTED_FORMAT; /* ELDv2 w/ ELD downscaled + mode not allowed */ + } break; } @@ -1441,6 +1445,10 @@ static TRANSPORTDEC_ERROR EldSpecificConfig_Parse(CSAudioSpecificConfig *asc, if (downscale_fill_nibble != 0x0) { return TRANSPORTDEC_PARSE_ERROR; } + if (esc->m_useLdQmfTimeAlign == 1) { + return TRANSPORTDEC_UNSUPPORTED_FORMAT; /* ELDv2 w/ ELD downscaled + mode not allowed */ + } break; } } |