Commit f0fc5f18 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch... 

Merge branch 'basop-2579-non-matching-variable-found-in-function-unclr_calc_corr_features_fx' into 'main'

Resolve "Non matching variable found in function unclr_calc_corr_features_fx()"

See merge request !3022
parents 34ce757d 226b2a1c

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ 
#define NONBE_FIX_2575                                  /* Fhg: Fix issue 2575, precision loss in FD CNG */

#define FIX_2584_TD_SM_ISSUE                            /* VA: Fix inconsistencies in the SM part of the TD stereo */

#define FIX_2556_ALIGN_CONDITIONS                       /* VA: Fix different conditions that were not exact between float and fix, BE on self-test */

#define FIX_NONBE_2579_INCORRECT_LAG_CALCULATION        /* Dolby: fix 2579: Incorrect lag calculation */



/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_stereo_ica_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -2314,7 +2314,11 @@ static void unclr_calc_corr_features_fx( 
    move32();



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

#ifndef FIX_NONBE_2579_INCORRECT_LAG_CALCULATION

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

#else

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

#endif

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



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