diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-24 04:13:28 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-24 04:13:28 +0000 |
commit | 5d864894785ccf240717f78aa35e8a2b9371b62f (patch) | |
tree | e4bd2c8d1c13085e3c2babcfeb39ea867a3f596e /libDRCdec/src/drcDec_gainDecoder.cpp | |
parent | 3a6eca5c661f7e7596c39aa9e4a5c6763bbef035 (diff) | |
parent | f04a8a855cf8ddb5996c8e191fd3fa15b3808657 (diff) | |
download | fdk-aac-5d864894785ccf240717f78aa35e8a2b9371b62f.tar.gz fdk-aac-5d864894785ccf240717f78aa35e8a2b9371b62f.tar.bz2 fdk-aac-5d864894785ccf240717f78aa35e8a2b9371b62f.zip |
Snap for 6157842 from f04a8a855cf8ddb5996c8e191fd3fa15b3808657 to rvc-release
Change-Id: Icd800c3d313c30fc67595fc70baaf69b12188cd7
Diffstat (limited to 'libDRCdec/src/drcDec_gainDecoder.cpp')
-rw-r--r-- | libDRCdec/src/drcDec_gainDecoder.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libDRCdec/src/drcDec_gainDecoder.cpp b/libDRCdec/src/drcDec_gainDecoder.cpp index 9d91267..de54dde 100644 --- a/libDRCdec/src/drcDec_gainDecoder.cpp +++ b/libDRCdec/src/drcDec_gainDecoder.cpp @@ -297,9 +297,11 @@ drcDec_GainDecoder_Conceal(HANDLE_DRC_GAIN_DECODER hGainDec, int seq, gainSequenceCount; DRC_COEFFICIENTS_UNI_DRC* pCoef = selectDrcCoefficients(hUniDrcConfig, LOCATION_SELECTED); - if (pCoef == NULL) return DE_OK; - - gainSequenceCount = fMin(pCoef->gainSequenceCount, (UCHAR)12); + if (pCoef && pCoef->gainSequenceCount) { + gainSequenceCount = fMin(pCoef->gainSequenceCount, (UCHAR)12); + } else { + gainSequenceCount = 1; + } for (seq = 0; seq < gainSequenceCount; seq++) { int lastNodeIndex = 0; |