Commit e4c1da2f authored by Fabian Bauer's avatar Fabian Bauer
Browse files

buildfix

parent 0c11a11b

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#define ISSUE_1796_replace_shl_o                             /* FhG: replace shl_ro by overflow-free alternatives - BE*/

#define ISSUE_1836_replace_overflow_libcom                   /* FhG: replace overflow operators by non-overflow-alternatives - BE */

#define ISSUE_1866_replace_overflow_libdec                   /* FhG: BE - Replace BASOPoverflow operators all over the lib_dec module if Overflow result is not used */

#define ISSUE_1867_replace_overflow_libenc                   /* FhG: BE - replace overflow operators by non-overflow-alternatives all over the lib_enc module */



#define FIX_1917_DIRAC_RENDER_PTR_INCR                       /* FhG: fix wrong pointer increment in ivas_dirac_dec_render_sf_fx() for object rendering */

#define FIX_CDLFB_BUFFER_SCALING                             /* FhG: fix wrong buffer scaling in ivas_dirac_dec_render_sf_fx() for object rendering */
@@ -99,7 +100,6 @@ 
#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

#define ISSUE_1867_replace_overflow_libenc              /* FhG: BE - replace overflow operators by non-overflow-alternatives all over the lib_enc module */



#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

#define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */

lib_enc/find_tilt_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -502,11 +502,7 @@ void find_tilt_ivas_fx( 
            m_hpE = extract_h( L_shl( hp_E[i], e_hpE ) ); // e_hpE+q_bckr-16

            m_tmp = div_s( m_tmp, m_hpE );                // Q15+(e_tmp+q_lp_E)-(e_hpE+q_bckr)

            e_tmp = sub( add( e_tmp, q_lp_E ), add( e_hpE, q_bckr ) );

#ifdef ISSUE_1799_replace_L_shr_o

            ee[i] = L_shr_sat( m_tmp, add( e_tmp, 15 - 6 ) ); /* ee in Q6 */

#else

            ee[i] = L_shr_o( m_tmp, add( e_tmp, 15 - 6 ), &Overflow ); /* ee in Q6 */

#endif

            move32();

        }

lib_enc/find_uv_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -695,11 +695,7 @@ Word16 find_uv_ivas_fx( /* o : coding typ 
        exp1 = sub( norm_l( *pt_enr_ssf1 ), 1 );

        wtmp1 = extract_h( L_shl( *pt_enr_ssf1, exp1 ) );

        fac = div_s( wtmp1, wtmp0 );

#ifdef ISSUE_1799_replace_L_shr_o

        fac_32 = L_shr_sat( L_deposit_l( fac ), add( sub( exp1, exp0 ), 15 - 13 ) ); /* fac32 in Q13*/

#else

        fac_32 = L_shr_o( L_deposit_l( fac ), add( sub( exp1, exp0 ), 15 - 13 ), &Overflow );                                /* fac32 in Q13*/

#endif



        if ( GT_32( fac_32, dE1 ) )

        {