diff options
| author | Xin Li <delphij@google.com> | 2018-12-11 13:59:07 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-12-11 13:59:07 -0800 |
| commit | 20c336953febeabbf6deeb38f479ec7642b5a69b (patch) | |
| tree | 558cec2d4bf125448aeac1ccf5c5cec12cde5b75 /libMpegTPDec | |
| parent | d2be744af28a784177d1de8d7190377c8932e03d (diff) | |
| parent | 33acbd97b67a3c740f7b54fae2ce127803b70c20 (diff) | |
| download | fdk-aac-20c336953febeabbf6deeb38f479ec7642b5a69b.tar.gz fdk-aac-20c336953febeabbf6deeb38f479ec7642b5a69b.tar.bz2 fdk-aac-20c336953febeabbf6deeb38f479ec7642b5a69b.zip | |
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: Ie44ac2dc553c40a8a9bd9b42b00a0b01cfa9799a
Diffstat (limited to 'libMpegTPDec')
| -rw-r--r-- | libMpegTPDec/src/tpdec_asc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp index b0f1c6a..8d411e8 100644 --- a/libMpegTPDec/src/tpdec_asc.cpp +++ b/libMpegTPDec/src/tpdec_asc.cpp @@ -2102,7 +2102,9 @@ TRANSPORTDEC_ERROR AudioSpecificConfig_Parse( self->m_aot = getAOT(bs); self->m_samplingFrequency = getSampleRate(bs, &self->m_samplingFrequencyIndex, 4); - if (self->m_samplingFrequency <= 0) { + if (self->m_samplingFrequency <= 0 || + (self->m_samplingFrequency > 96000 && self->m_aot != 39) || + self->m_samplingFrequency > 4 * 96000) { return TRANSPORTDEC_PARSE_ERROR; } |