diff options
Diffstat (limited to 'libAACenc/src/intensity.cpp')
| -rw-r--r-- | libAACenc/src/intensity.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libAACenc/src/intensity.cpp b/libAACenc/src/intensity.cpp index 514c8e0..632620a 100644 --- a/libAACenc/src/intensity.cpp +++ b/libAACenc/src/intensity.cpp @@ -584,6 +584,7 @@ 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)); @@ -739,6 +740,14 @@ 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); |