Commit b13940c9 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ADAP_STEFI_SHIFT

parent 08de555f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ 
/*#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT*/            /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define FIX_ADAP_STEFI_SHIFT                            /* Issue 89: fix bug in parameter shift of adaptive stereo filling */

#define SPAR_SCALING_HARMONIZATION                      /* Issue 80: Changes to harmonize scaling in spar */

lib_enc/ivas_stereo_dft_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -2943,15 +2943,11 @@ static void stereo_dft_enc_compute_prm( 


        /* parameters for bred0 <= b < bpred1 are estimated from parameters of

        the remaining bands with ptrans0 <= b < btrans1. */

#ifdef FIX_ADAP_STEFI_SHIFT

        bpred1 = ( hStereoDft->nbands > 10 ) ? STEREO_DFT_RES_PRED_BAND_MAX - 2 : hStereoDft->nbands;

        if ( hStereoDft->band_res[k_offset] == STEREO_DFT_BAND_RES_LOW )

        {

            bpred1 = min( bpred1, 6 );

        }

#else

        bpred1 = ( hStereoDft->nbands > 10 ) ? hStereoDft->nbands - 2 : hStereoDft->nbands;

#endif

        bpred0 = bpred1 - STEREO_DFT_RES_PRED_BAND_MIN_CONST;



        /* get estimate (currently the maximal index) */
@@ -2971,11 +2967,7 @@ static void stereo_dft_enc_compute_prm( 


        if ( hStereoDft->reverb_flag && hStereoDft->nbands > 10 ) /*SWB and FB*/

        {

#ifdef FIX_ADAP_STEFI_SHIFT

            for ( b = STEREO_DFT_RES_PRED_BAND_MAX - 1; b >= STEREO_DFT_RES_PRED_BAND_MAX - 2; b-- )

#else

            for ( b = hStereoDft->nbands - 1; b >= hStereoDft->nbands - 2; b-- )

#endif

            {

                hStereoDft->res_pred_index_EC[b - STEREO_DFT_RES_PRED_BAND_MIN_CONST] = hStereoDft->res_pred_index_EC[b];

            }