diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-15 03:11:12 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-15 03:11:12 +0000 |
| commit | b56a4ce3f7bee6d24a8658b08d6277bea99e425e (patch) | |
| tree | 1f8eca55fa97fd166bc633462d327bb171ee20dd /libSACdec | |
| parent | b7cb239980c1cebec56249c2fc2e9cc8806fa724 (diff) | |
| parent | b1b306443a1cc0308fa563b40a281bae53346d01 (diff) | |
| download | fdk-aac-b56a4ce3f7bee6d24a8658b08d6277bea99e425e.tar.gz fdk-aac-b56a4ce3f7bee6d24a8658b08d6277bea99e425e.tar.bz2 fdk-aac-b56a4ce3f7bee6d24a8658b08d6277bea99e425e.zip | |
Snap for 5939454 from b1b306443a1cc0308fa563b40a281bae53346d01 to rvc-release
Change-Id: I6dae09bcdf2319101d416e69dbd3b8a5cc97ac95
Diffstat (limited to 'libSACdec')
| -rw-r--r-- | libSACdec/src/sac_bitdec.cpp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/libSACdec/src/sac_bitdec.cpp b/libSACdec/src/sac_bitdec.cpp index a1bdca4..4b47132 100644 --- a/libSACdec/src/sac_bitdec.cpp +++ b/libSACdec/src/sac_bitdec.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -1554,22 +1554,20 @@ static SACDEC_ERROR mapIndexData( /* Interpolate */ i1 = 0; for (i = 0; i < numParameterSets; i++) { - int xi, i2, x1, x2; - if (aInterpolate[i] != 1) { i1 = i; - } - i2 = i; - while (aInterpolate[i2] == 1) { - i2++; - if (i2 >= MAX_PARAMETER_SETS) return MPS_WRONG_PARAMETERSETS; - } - x1 = paramSlot[i1]; - xi = paramSlot[i]; - x2 = paramSlot[i2]; + } else { + int xi, i2, x1, x2; - if (aInterpolate[i] == 1) { + for (i2 = i; i2 < numParameterSets; i2++) { + if (aInterpolate[i2] != 1) break; + } if (i2 >= numParameterSets) return MPS_WRONG_PARAMETERSETS; + + x1 = paramSlot[i1]; + xi = paramSlot[i]; + x2 = paramSlot[i2]; + for (band = startBand; band < stopBand; band++) { int yi, y1, y2; y1 = outputIdxData[xttIdx][i1][band]; @@ -1588,9 +1586,9 @@ static SACDEC_ERROR mapIndexData( for (ps = 0; ps < numParameterSets; ps++) { if (quantMode && (paramType == t_CLD)) { if (pOttVsTotDbIn == 0) return MPS_WRONG_OTT; - if ((pOttVsTotDb1 == 0) && (ottVsTotDbMode == ottVsTotDb1Activ)) + if ((pOttVsTotDb1 == 0) && (ottVsTotDbMode & ottVsTotDb1Activ)) return MPS_WRONG_OTT; - if ((pOttVsTotDb2 == 0) && (ottVsTotDbMode == ottVsTotDb2Activ)) + if ((pOttVsTotDb2 == 0) && (ottVsTotDbMode & ottVsTotDb2Activ)) return MPS_WRONG_OTT; for (pb = startBand; pb < stopBand; pb++) { |