Commit d967323c authored by reutelhuber's avatar reutelhuber
Browse files

Merge branch... 

Merge branch '89-wrong-parameter-shift-in-dft-stereo-adaptive-stereo-filling-if-input-is-48-khz' into 'main'

[Non-BE] fix bug in parameter shift of adaptive stereo filling

See merge request !101
parents 9ad39c0c 8f225b48

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ 




#define FIX_WRONG_NBANDS_IN_ITD_ESTIMATION              /* Issue 85: fix incorrect setting of nbands in calc_mean_E_ratio() if bwidth is limited on commandline*/

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





#define FIX_I87                                         /*  fix for issue 86: incorrect Ambisonics order set for head rotation in SBA */

lib_enc/ivas_stereo_dft_enc.c

100644 → 100755
+12 −0
Original line number Diff line number Diff line
@@ -2943,7 +2943,15 @@ 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) */
@@ -2963,7 +2971,11 @@ 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];

            }