Commit 4890db2a authored by multrus's avatar multrus
Browse files

remove code in FIX_ISSUE_1811_EXCEEDING_W_SHIFTS, since this is part of MR1928

parent 374d95aa

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ 
#define FIX_1822



#define FIX_ISSUE_1817_REPLACE_CARRY_OVERFLOW  /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 1931 */

#define FIX_ISSUE_1811_EXCEEDING_W_SHIFTS

#define FIX_1844_MISSING_FREE                                /* FhG: add missing free in ivas_binRenderer_convModuleClose_fx() */



/* #################### Start BASOP porting switches ############################ */

lib_rend/ivas_objectRenderer_sfx_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -229,11 +229,7 @@ static void sincResample_fx( 
        /* Calculate the sinc-index for the center value of the sinc */

        Word16 center_val_e;

        Word64 center_val;

#ifndef FIX_ISSUE_1811_EXCEEDING_W_SHIFTS

        center_val = W_sub( t_frac_plus_eps, W_shl( t, sub( 31, t_frac_plus_eps_e ) ) ); // exp(center_val_e)

#else

        center_val = W_sub( t_frac_plus_eps, W_shl( t, s_min( sub( 31, t_frac_plus_eps_e ), 63 ) ) ); // exp(center_val_e)

#endif

        center_val_e = add( t_frac_plus_eps_e, 6 );

        Word16 com_e = s_max( 0, center_val_e );

        center_val = W_add( W_shr( center_val, sub( com_e, center_val_e ) ), W_shl( 1, sub( 30, com_e ) ) ); // exp(center_val_e)