Commit 6df5a327 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue 2579: Creating the switch and making the necessary change: correcting... 

issue 2579: Creating the switch and making the necessary change: correcting value of the variable corrLagMax according to floating point counterpart
parent 9db396b3

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
#define HARMONIZE_2539_cng_energy                       /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA: float issue 1585: alternative fix memory leaks with format switching */

#define FIX_BASOP_2573_RF_MODE_UPDATE                   /* FhG: BASOP issue 2573: remove duplicated update of rf_mode parameters from evs_enc_fx(); was already done in updt_enc_common_fx() */

#define FIX_ISSUE_2579_CORRLAGMAX                       /* FhG: BASOP issue 2579: Non matching variable found in function unclr_calc_corr_features_fx()*/



/* #################### End BE switches ################################## */

lib_enc/ivas_stereo_ica_enc_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -2314,7 +2314,12 @@ static void unclr_calc_corr_features_fx( 
    move32();



    /* L/R correlation values (zero lag, maximum) */

#ifndef FIX_ISSUE_2579_CORRLAGMAX

    corrLagMax = maximum_l(corrEst, sub(lagSearchRange[1], add(lagSearchRange[0], 1)), &corrEstMax);

#else

    corrLagMax = maximum_l(corrEst, sub( add(lagSearchRange[1], 1), lagSearchRange[0]), &corrEstMax);

#endif // !FIX_ISSUE_2579_CORRLAGMAX



    d_corrLagMax = sub( corrLagMax, hStereoClassif->unclr_corrLagMax_prev );



    hStereoClassif->unclr_fv_fx[E_d_corrLagMax] = L_shl( d_corrLagMax, 15 );