diff options
| author | Xin Li <delphij@google.com> | 2018-12-10 10:04:51 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-12-11 20:26:37 +0000 |
| commit | b857efbb106c62241879414628408556a55c852f (patch) | |
| tree | 558cec2d4bf125448aeac1ccf5c5cec12cde5b75 /libMpegTPDec | |
| parent | 6e4fe2e06bc33ceb9eddde6e628ea42e7ee3d130 (diff) | |
| parent | 33acbd97b67a3c740f7b54fae2ce127803b70c20 (diff) | |
| download | fdk-aac-b857efbb106c62241879414628408556a55c852f.tar.gz fdk-aac-b857efbb106c62241879414628408556a55c852f.tar.bz2 fdk-aac-b857efbb106c62241879414628408556a55c852f.zip | |
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
Bug: 120502534
Change-Id: I4c81feb609ac0590877ce923099d3ae63577857d
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; } |