diff options
Diffstat (limited to 'libAACenc/src/quantize.cpp')
| -rw-r--r-- | libAACenc/src/quantize.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/libAACenc/src/quantize.cpp b/libAACenc/src/quantize.cpp index 9694901..a1698a8 100644 --- a/libAACenc/src/quantize.cpp +++ b/libAACenc/src/quantize.cpp @@ -313,6 +313,9 @@ FIXP_DBL FDKaacEnc_calcSfbDist(FIXP_DBL *mdctSpectrum, &mdctSpectrum[i], &quantSpectrum[i]); + if (fAbs(quantSpectrum[i])>MAX_QUANT) { + return FL2FXCONST_DBL(0.0f); + } /* inverse quantization */ FDKaacEnc_invQuantizeLines(gain,1,&quantSpectrum[i],&invQuantSpec); @@ -355,15 +358,22 @@ void FDKaacEnc_calcSfbQuantEnergyAndDist(FIXP_DBL *mdctSpectrum, FIXP_DBL invQuantSpec; FIXP_DBL diff; - *en = FL2FXCONST_DBL(0.0f); - *dist = FL2FXCONST_DBL(0.0f); + FIXP_DBL energy = FL2FXCONST_DBL(0.0f); + FIXP_DBL distortion = FL2FXCONST_DBL(0.0f); for (i=0; i<noOfLines; i++) { + + if (fAbs(quantSpectrum[i])>MAX_QUANT) { + *en = FL2FXCONST_DBL(0.0f); + *dist = FL2FXCONST_DBL(0.0f); + return; + } + /* inverse quantization */ FDKaacEnc_invQuantizeLines(gain,1,&quantSpectrum[i],&invQuantSpec); /* energy */ - *en += fPow2(invQuantSpec); + energy += fPow2(invQuantSpec); /* dist */ diff = fixp_abs(fixp_abs(invQuantSpec) - fixp_abs(mdctSpectrum[i]>>1)); @@ -376,10 +386,10 @@ void FDKaacEnc_calcSfbQuantEnergyAndDist(FIXP_DBL *mdctSpectrum, diff = scaleValue(diff, -scale); - *dist += diff; + distortion += diff; } - *en = CalcLdData(*en)+FL2FXCONST_DBL(0.03125f); - *dist = CalcLdData(*dist); + *en = CalcLdData(energy)+FL2FXCONST_DBL(0.03125f); + *dist = CalcLdData(distortion); } |