diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-12 23:07:54 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-12 23:07:54 +0000 |
| commit | b7cb239980c1cebec56249c2fc2e9cc8806fa724 (patch) | |
| tree | ae2b2bd164968afce7c3727c7b6b205c2e3fc558 /libAACdec/src/aacdecoder.cpp | |
| parent | 1ceab98d555e261f39efc75a1ec2d6786491be48 (diff) | |
| parent | f26eb8af7c38047ad113072a6de38e069dc5cf3f (diff) | |
| download | fdk-aac-b7cb239980c1cebec56249c2fc2e9cc8806fa724.tar.gz fdk-aac-b7cb239980c1cebec56249c2fc2e9cc8806fa724.tar.bz2 fdk-aac-b7cb239980c1cebec56249c2fc2e9cc8806fa724.zip | |
Snap for 5936682 from f26eb8af7c38047ad113072a6de38e069dc5cf3f to rvc-release
Change-Id: I5a7309c9ef4f186d05c08f072707ce3e2bf6a9b8
Diffstat (limited to 'libAACdec/src/aacdecoder.cpp')
| -rw-r--r-- | libAACdec/src/aacdecoder.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp index 7617937..b15fc80 100644 --- a/libAACdec/src/aacdecoder.cpp +++ b/libAACdec/src/aacdecoder.cpp @@ -1303,7 +1303,8 @@ static void CAacDecoder_DeInit(HANDLE_AACDECODER self, const int subStreamIndex) { int ch; int aacChannelOffset = 0, aacChannels = (8); - int numElements = (((8)) + (8)), elementOffset = 0; + int numElements = (3 * ((8) * 2) + (((8) * 2)) / 2 + 4 * (1) + 1), + elementOffset = 0; if (self == NULL) return; @@ -1928,6 +1929,9 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, self->samplingRateInfo[0].samplingRate / self->downscaleFactor; self->streamInfo.aacSamplesPerFrame = asc->m_samplesPerFrame / self->downscaleFactor; + if (self->streamInfo.aacSampleRate <= 0) { + return AAC_DEC_UNSUPPORTED_SAMPLINGRATE; + } } } |