diff options
| author | Martin Storsjo <martin@martin.st> | 2013-11-01 10:58:46 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2013-11-01 10:58:46 +0200 |
| commit | b41a6f9e8171ae069b9f2b5ef19292dbee4cecc8 (patch) | |
| tree | f603892038976c31f8feab5900d261e857d1b4e2 /libAACenc/src | |
| parent | 321233ee92e138f44294c7bb9a375eadad9d24fa (diff) | |
| download | fdk-aac-b41a6f9e8171ae069b9f2b5ef19292dbee4cecc8.tar.gz fdk-aac-b41a6f9e8171ae069b9f2b5ef19292dbee4cecc8.tar.bz2 fdk-aac-b41a6f9e8171ae069b9f2b5ef19292dbee4cecc8.zip | |
Revert "Avoid too big changes in isScale"
This reverts commit 226601a8d9bce81455e161a0e26051d2f22c5d7a.
This change doesn't seem to be necessary any longer, a proper
fix seems to be included upstream now in
60a27b7fe5bf2c3b07ae7f679ca67c0c5cba3b00.
Diffstat (limited to 'libAACenc/src')
| -rw-r--r-- | libAACenc/src/intensity.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libAACenc/src/intensity.cpp b/libAACenc/src/intensity.cpp index 3807233..6d807f7 100644 --- a/libAACenc/src/intensity.cpp +++ b/libAACenc/src/intensity.cpp @@ -593,7 +593,6 @@ void FDKaacEnc_IntensityStereoProcessing( FIXP_DBL realIsScale[MAX_GROUPED_SFB]; INTENSITY_PARAMETERS isParams; INT isMask[MAX_GROUPED_SFB]; - INT lastValIs = 0, delta; FDKmemclear((void*)isBook,sfbCnt*sizeof(INT)); FDKmemclear((void*)isMask,sfbCnt*sizeof(INT)); @@ -749,14 +748,6 @@ void FDKaacEnc_IntensityStereoProcessing( isScale[sfb+sfboffs] = (INT)(((realIsScale[sfb+sfboffs]>>1)+FL2FXCONST_DBL(0.5f/(1<<(REAL_SCALE_SF+LD_DATA_SHIFT+1))))>>(DFRACT_BITS-1-REAL_SCALE_SF-LD_DATA_SHIFT-1)); } - delta = isScale[sfb+sfboffs] - lastValIs; - if (delta < -CODE_BOOK_SCF_LAV) { - isScale[sfb+sfboffs] = lastValIs - CODE_BOOK_SCF_LAV; - } else if (delta + CODE_BOOK_SCF_LAV >= (INT)(sizeof(FDKaacEnc_huff_ltabscf)/sizeof(FDKaacEnc_huff_ltabscf[0]))) { - isScale[sfb+sfboffs] = lastValIs + sizeof(FDKaacEnc_huff_ltabscf)/sizeof(FDKaacEnc_huff_ltabscf[0]) - CODE_BOOK_SCF_LAV - 1; - } - lastValIs = isScale[sfb+sfboffs]; - sfbEnergyRight[sfb+sfboffs] = FL2FXCONST_DBL(0.0f); sfbEnergyLdDataRight[sfb+sfboffs] = FL2FXCONST_DBL(-1.0f); sfbThresholdRight[sfb+sfboffs] = FL2FXCONST_DBL(0.0f); |