Commit e8f1b4cb authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_NONBE_2579_INCORRECT_LAG_CALCULATION

parent c30dab52

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ 
#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */

#define FIX_2585_BIT_ALLOCATION_DIFF                    /* VA : issue 2585, bit allocation different behaviors between float and fixed-point for corner cases */

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



/* Macros for issue 1966 are independent, phase diff is always BE for EVS_MONO */

/* The changes for F0+thdModification are mainly for IVAS better float compatibility, */

lib_enc/ivas_stereo_ica_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -2331,11 +2331,7 @@ 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 );