Commit 6fce347c authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_BASOP_2519_TCA_LA_ZERO_EXP

parent d95d702d

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ 
/* 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, */

/* for EVS_MONO, all is kept BE. */

#define FIX_BASOP_2519_TCA_LA_ZERO_EXP                  /* FhG: BASOP #2519: Exclude zero samples from exp_com calculation in tcaTargetCh_LA_fx */

#define FIX_BASOP_2519_ICBWE_DEC_Q_TRACK                /* FhG: BASOP #2519: Track Q-format of dec_2over3_mem_fx across frames in stereo_icBWE_preproc_fx */

#define FIX_BASOP_2592_OVERFLOW                         /* FhG: BASOP #2592: fix overflow in GetF0() */

#define FIX_BASOP_2591_EDGE_DETECT_COMP                 /* FhG: BASOP #2591: Wrong comparison in edge_detect_fx() */

lib_enc/ivas_stereo_ica_enc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -171,14 +171,10 @@ static void tcaTargetCh_LA_fx( 
        move32();

        target_exp_temp[i + currentNCShift] = temp;

        move16();

#ifdef FIX_BASOP_2519_TCA_LA_ZERO_EXP

        IF( NE_32( target[i + currentNCShift], 0 ) )

        {

            exp_com = s_max( exp_com, temp );

        }

#else

        exp_com = s_max( exp_com, temp );

#endif

    }



    FOR( ; i < input_frame; i++ )
@@ -187,14 +183,10 @@ static void tcaTargetCh_LA_fx( 
        move32();

        target_exp_temp[i + currentNCShift] = add( gAdj_exp, ref_exp );

        move16();

#ifdef FIX_BASOP_2519_TCA_LA_ZERO_EXP

        IF( NE_32( target[i + currentNCShift], 0 ) )

        {

            exp_com = s_max( exp_com, target_exp_temp[i + currentNCShift] );

        }

#else

        exp_com = s_max( exp_com, target_exp_temp[i + currentNCShift] );

#endif

    }



    FOR( i = 0; i < input_frame + currentNCShift; i++ )