Commit 450574bf authored by Manuel Jander's avatar Manuel Jander
Browse files

Fix merge errors. Reduce changes to MR3071

parent 45313db0

lib_com/options.h

+0 −5
Original line number Diff line number Diff line
@@ -117,11 +117,6 @@ 
#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_2493_CHECK_EXTRACT_L_FIX_INSTRUMENTATION    /* FhG: Fix instrumentation related to extract_l. */

#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() */

#define FIX_NONBE_2580_USE_LENGTH_NOT_CONSTANT          /* Dolby: fix 2580: use dynamic length denominator for average energy in unclr_calc_corr_features_fx() */



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



/* ################## End MAINTENANCE switches ######################### */

lib_dec/ivas_lfe_plc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ static void d_syn_filt_fx( 
        yy_q_fx[i] = sub( s_q_fx, 32 );

        move16();

#ifdef NONBE_FIX_2493_EXTRACT_L_d_syn_filt_fx

        y_fx[i] = W_extract_l2( W_shr( s_fx, s_min( 63, sub( s_q_fx, Q5 ) ) ) );

        y_fx[i] = W_extract_l( W_shr( s_fx, s_min( 63, sub( s_q_fx, Q5 ) ) ) );

#else

#ifdef FIX_2493_CHECK_EXTRACT_L

        y_fx[i] = W_extract_l2( W_shr( s_fx, sub( s_q_fx, Q5 ) ) );