merge conflict issue _1965_

/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

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

#define ISSUE_1836_replace_overflow_libcom__remnant          /* FhG: replace remaining overflow operators by non-overflow-alternatives in lib_com - 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 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 */

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

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

#define	NONBE_SVD_OPTIMIZATION                               /* FhG: reduce WMOPS of HouseHolderReduction() in ivas_svd_dec.c() by removing redundant mathematics and using 64 bit additions */

#define FIX_1766_TCX2ACELP_BWE_ISSUE                         /* VA : Fix rare BWE issue when switching from TCX to ACELP */

#define FIX_1781_SPECTRAL_GAPS                               /* FhG: Change internal calculation of tcx_noise_factor_ivas_fx() to 32-bit*/

#define FIX_ISSUE_1811_EXCEEDING_W_SHIFTS                    /* FhG: limit exceeding 64bit shifts */

#define FIX_1843_IO_QFACTOR_INIT                             /* FhG: initialize CRend's io_qfactor also in IVAS_rend */

#define FIX_1931_BIN_COHR_CROSS_MIX                    /* FhG: correct binauralCoherenceCrossmixGains_fx calculation */

#define FIX_1939_REVERB_DMX_OUT_Q                       /*Dlb: output correct q factor for the reverb dmx function*/

#define EVS_BE_REUSAGE

#ifdef EVS_BE_REUSAGE

#define REUSE_EVS_BE_ACELP_LP_FILT

#define REUSE_EVS_BE_ACELP_4T64

#define REUSE_EVS_BE_ACELP_2t32

#define REUSE_EVS_BE_ACELP_1t64

#define REUSE_EVS_BE_ACELP_AVQ

#define REUSE_EVS_BE_GAUSS          

#define REUSE_EVS_BE_GAINQ          

#define REUSE_EVS_BE_ACELP_PITCH

#define REUSE_EVS_BE_ACELP_PITCH_PIT_Q

#define REUSE_EVS_BE_GAINQ_LBR   // BE by adding one condition, but could be harmonized in a non-BE way. There is a small difference in how Etot is computed

#endif

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

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

#define FIX_1942_ASSERTION_LOWSHELF                          /* FhG: Modified the target_gains_db_fx calculation in compute_t60_coeffs_fx() */

#define FIX_1944_CRASH_FOR_STEREO                            /* FhG: improve TonalMDCTConceal_InsertNoise calculation precision */

#define FIX_1970_SBA_CRASH                                   /* Dlb: Fix for issue 1970, SBA crash */