diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2019-01-02 12:50:22 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-02 12:50:22 -0800 |
| commit | 9cc8070883b24126085012c0a742d3746450bab8 (patch) | |
| tree | ae0c3b1a550baaf7c5a649cb70cbe2abc2288ebc | |
| parent | 04b22fae53c04876b3071804c3afdbd8ad4b7f64 (diff) | |
| parent | 81b04be9baf3540329e940b6ce8117463d71279e (diff) | |
| download | fdk-aac-9cc8070883b24126085012c0a742d3746450bab8.tar.gz fdk-aac-9cc8070883b24126085012c0a742d3746450bab8.tar.bz2 fdk-aac-9cc8070883b24126085012c0a742d3746450bab8.zip | |
Merge "Return transport decoder error in case of invalid ELD configuration" am: 7884aefc84
am: 81b04be9ba
Change-Id: Iab2c9ead062dd99dc441f7765bf02fb72736e37f
| -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; } } |