Commit 08994ff8 authored by Manuel Jander's avatar Manuel Jander
Browse files

Disable all fixes that cannot be disentangled from EVS without larger changes.... 

Disable all fixes that cannot be disentangled from EVS without larger changes. Make macro names shorter.
parent c0e87676

lib_com/fft_fx_evs.c

+3 −3
Original line number Diff line number Diff line
@@ -2037,7 +2037,7 @@ static void cftmdl_16fx( 
    Word16 x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;

    Word16 tmp, tmp2;

    Word32 L_tmp;

#ifndef NONBE_FIX_2493_CHECK_EXTRACT_L_cftmdl_16fx

#ifndef NONBE_FIX_2493_EXTRACT_L_cftmdl_16fx

    Word32 L_x0r, L_x0i;

#endif
@@ -2189,13 +2189,13 @@ static void cftmdl_16fx( 
            a[j1 + 1] = round_fx_sat( L_shl_sat( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */

            move16();



#ifdef NONBE_FIX_2493_CHECK_EXTRACT_L_cftmdl_16fx

#ifdef NONBE_FIX_2493_EXTRACT_L_cftmdl_16fx

            x0r = add_sat( x1r, x3i );

            x0i = sub_sat( x1i, x3r );

#else

            L_x0r = L_add( (Word32) x1r, (Word32) x3i );

            L_x0i = L_sub( (Word32) x1i, (Word32) x3r );

#ifdef FIX_2493_CHECK_EXTRACT_L

#ifdef FIX_2493_CHECK_EXTRACT_L_EVS

            x0r = extract_l2( L_x0r );

            x0i = extract_l2( L_x0i );

#else

lib_com/gs_noisefill_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static void envelop_modify_fx( 
        {

            /**src = Ener1*(weight*(*src)*Ener + (1.0f-weight)*own_random(seed_tcx)/32768.0f); */

            L_tmp = Mult_32_16( Ener_fx, *src_fx ); /*Q(31-exp+Q_exc-15) -> Q(16-exp+Q_exc) */

#ifdef NONBE_FIX_2493_CHECK_EXTRACT_L_envelop_modify_fx

#ifdef NONBE_FIX_2493_EXTRACT_L_envelop_modify_fx

            tmp = extract_h( Mpy_32_16_1( L_shr( L_tmp, add( 4, sub( Q_exc, exp1 ) ) ), weight_fx ) ); /*Q12 */

#else

#ifdef FIX_2493_CHECK_EXTRACT_L

lib_com/lsf_tools_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -290,12 +290,12 @@ void E_LPC_a_isp_conversion( const Word16 a[], Word16 isp[], const Word16 old_is 
                    tmp = shl( tmp, exp );

                tmp = div_s( (Word16) 16383, tmp );

                t0 = L_mult( x, tmp );

#ifdef NONBE_FIX_2493_CHECK_EXTRACT_L_E_LPC_a_isp_conversion

#ifdef NONBE_FIX_2493_EXTRACT_L_E_LPC_a_isp_conversion

                t0 = L_shr_sat( t0, sub( 20 - 16, exp ) );

                tmp = extract_h( t0 ); /* y = (xhigh-xlow)/(yhigh-ylow) in Q11 */

#else

                t0 = L_shr( t0, sub( 20, exp ) );

#ifdef FIX_2493_CHECK_EXTRACT_L

#ifdef FIX_2493_CHECK_EXTRACT_L_EVS

                tmp = extract_l2( t0 ); /* y = (xhigh-xlow)/(yhigh-ylow) in Q11 */

#else

                tmp = extract_l( t0 ); /* y = (xhigh-xlow)/(yhigh-ylow) in Q11 */
@@ -1160,12 +1160,12 @@ void E_LPC_a_lsp_conversion( 
                    tmp = shl( tmp, exp );

                tmp = div_s( (Word16) 16383 / 2, tmp );

                t0 = L_mult( x, tmp );

#ifdef NONBE_FIX_2493_CHECK_EXTRACT_L_E_LPC_a_isp_conversion

#ifdef NONBE_FIX_2493_EXTRACT_L_E_LPC_a_isp_conversion

                t0 = L_shr_sat( t0, sub( 20 - 16, exp ) );

                tmp = extract_h( t0 ); /* y = (xhigh-xlow)/(yhigh-ylow) in Q11 */

#else

                t0 = L_shr( t0, sub( 20, exp ) );

#ifdef FIX_2493_CHECK_EXTRACT_L

#ifdef FIX_2493_CHECK_EXTRACT_L_EVS

                tmp = extract_l2( t0 ); /* y = (xhigh-xlow)/(yhigh-ylow) in Q11 */

#else

                tmp = extract_l( t0 ); /* y = (xhigh-xlow)/(yhigh-ylow) in Q11 */

lib_com/options.h

+17 −15
Original line number Diff line number Diff line
@@ -106,24 +106,26 @@ 
#define FIX_2493_CHECK_SCALE_NOSAT                      /* FhG: Verify that no saturation scaling do not encounter an overflow. */

#define FIX_2493_CHECK_64BIT                            /* FhG: Verify that 64 bit ops do not encounter an overflow. */

// #define FIX_2493_CHECK_EXTRACT_L_EVS                    /* FhG: Verify that extract_l, W_extract_l etc. do not encounter an overflow for EVS only modes. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_estDownmixGain_fx /* FhG: Fix extract_l overflow inside estDownmixGain_fx() */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_swb_pre_proc_fx  /* FhG: Fix extract_l overflow inside swb_pre_proc_fx(). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_estDownmixGain_fx     /* FhG: Fix extract_l overflow inside estDownmixGain_fx() */

#define NONBE_FIX_2493_EXTRACT_L_swb_pre_proc_fx       /* FhG: Fix extract_l overflow inside swb_pre_proc_fx(). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_spectral_balancer_fx16 /* FhG: Fix extract_l overflow inside spectral_balancer_fx16(). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_IGF_CalculateStereoEnvelope_fx /* FhG: Fix extract_l overflow inside IGF_CalculateStereoEnvelope_fx(). Was completely wrong. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_GetTCXMaxenergyChange_fx /* FhG: Fix extract_l overflow inside GetTCXMaxenergyChange_fx(). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_res_bpf_adapt_ivas_fx /* FhG: Fix extract_l overflow inside res_bpf_adapt_ivas_fx() */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_ivas_core_dec_fx  /* FhG: Fix extract_l overflow inside ivas_core_dec_fx(). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_d_syn_filt_fx     /* FhG: Fix extract_l overflow inside d_syn_filt_fx(). W_shr( x, s ) with s out of range problem. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_EnhanceClass_fx  /* FhG: Fix extract_l overflow inside EnhanceClass_fx() (EVS). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_decoder_tcx_post_fx /* FhG: Fix extract_l overflow inside decoder_tcx_post_fx() (EVS). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_WB_BWE_gain_pred_fx /* FhG: Fix extract_l overflow inside WB_BWE_gain_pred_fx() (EVS). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_cftmdl_16fx      /* FhG: Fix extract_l overflow inside cftmdl_16fx() (EVS). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_GetTCXMaxenergyChange_fx /* FhG: Fix extract_l overflow inside GetTCXMaxenergyChange_fx(). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_res_bpf_adapt_ivas_fx  /* FhG: Fix extract_l overflow inside res_bpf_adapt_ivas_fx() */

#define NONBE_FIX_2493_EXTRACT_L_ivas_core_dec_fx       /* FhG: Fix extract_l overflow inside ivas_core_dec_fx(). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_d_syn_filt_fx          /* FhG: Fix extract_l overflow inside d_syn_filt_fx(). W_shr( x, s ) with s out of range problem. */

#if 0

#define NONBE_FIX_2493_EXTRACT_L_EnhanceClass_fx        /* FhG: Fix extract_l overflow inside EnhanceClass_fx() (EVS). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_decoder_tcx_post_fx    /* FhG: Fix extract_l overflow inside decoder_tcx_post_fx() (EVS). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_WB_BWE_gain_pred_fx    /* FhG: Fix extract_l overflow inside WB_BWE_gain_pred_fx() (EVS). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_cftmdl_16fx            /* FhG: Fix extract_l overflow inside cftmdl_16fx() (EVS). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_E_LPC_a_isp_conversion /* FhG: Fix extract_l overflow inside E_LPC_a_isp_conversion() (EVS). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_envelop_modify_fx      /* FhG: Fix extract_l overflow inside envelop_modify_fx() (EVS). */

#endif

#define NONBE_FIX_2493_EXTRACT_L_acelp_core_dec_fx      /* FhG: Fix extract_l overflow inside acelp_core_dec_fx() */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_E_LPC_a_isp_conversion /* FhG: Fix extract_l overflow inside E_LPC_a_isp_conversion() (EVS). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_acelp_fast_fx    /* FhG: Fix extract_l overflow inside acelp_fast_fx(). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_envelop_modify_fx /* FhG: Fix extract_l overflow inside envelop_modify_fx() */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_swb_tbe_enc_fx   /* FhG: Fix extract_l overflow inside swb_tbe_enc_fx() */

#define NONBE_FIX_2493_CHECK_EXTRACT_L_bw_detect_fx     /* FhG: Fix extract_l overflow inside bw_detect_fx(). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_acelp_fast_fx          /* FhG: Fix extract_l overflow inside acelp_fast_fx(). Saturation, not a optimal fix. */

#define NONBE_FIX_2493_EXTRACT_L_swb_tbe_enc_fx         /* FhG: Fix extract_l overflow inside swb_tbe_enc_fx() */

#define NONBE_FIX_2493_EXTRACT_L_bw_detect_fx           /* FhG: Fix extract_l overflow inside bw_detect_fx(). Saturation, not a optimal fix. */

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

#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_com/swb_bwe_com_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ Word16 WB_BWE_gain_pred_fx( 


    L_tmp = L_mult0( alfa, WB_fenv[0] ); /*Q14+Q3->Q17 */

    L_tmp = L_shr( L_tmp, 14 );          /*Q3 */

#ifdef NONBE_FIX_2493_CHECK_EXTRACT_L_WB_BWE_gain_pred_fx

#ifdef NONBE_FIX_2493_EXTRACT_L_WB_BWE_gain_pred_fx

    tmp = extract_h( L_shl_sat( L_tmp, 16 ) );

#else

#ifdef FIX_2493_CHECK_EXTRACT_L