Commit 339587af authored by Manuel Jander's avatar Manuel Jander
Browse files

Add macro FIX_2493_CHECK_EXTRACT_L_swb_pre_proc_fx_BE_EVS to skipt extract_l() checks for EVS.

parent 2bc5cc8a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
#define HARMONIZE_2481_EXTEND_SHRINK                    /* FhG: basop issue 2481: Harmonize extend_frm_*fx() and shrink_frm_*fx() */

#define FIX_2493_CHECK_EXTRACT_L                        /* FhG: Verify that extract_l, W_extract_l etc. do not encounter an overflow. */

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

#define FIX_2493_CHECK_EXTRACT_L_swb_pre_proc_fx_BE_EVS /* FhG: Keep EVS bitexact within the fix in swb_pre_proc_fx() */



/* #################### End BE switches ################################## */

lib_enc/swb_pre_proc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ void swb_pre_proc_fx( 
                {

                    FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )

                    {

#ifdef FIX_2493_CHECK_EXTRACT_L

#if defined( FIX_2493_CHECK_EXTRACT_L ) && !defined( FIX_2493_CHECK_EXTRACT_L_swb_pre_proc_fx_BE_EVS )

                        realQ_neg1 = extract_l2( L_shr( realBufferFlipped[ts][nB], 31 - ( 15 + cldfbScale->hb_scale ) + 1 ) );

                        imagQ_neg1 = extract_l2( L_shr( imagBufferFlipped[ts][nB], 31 - ( 15 + cldfbScale->hb_scale ) + 1 ) ); /* Q(-1), headroom needed */

#else