Commit 07479fab authored by emerit's avatar emerit
Browse files

Merge branch '1741_ref_enable-new-hrtf-format' of...

Merge branch '1741_ref_enable-new-hrtf-format' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into 1741_ref_enable-new-hrtf-format
parents de48fe9e 3e499f8b
Loading
Loading
Loading
Loading
+3 −13
Original line number Diff line number Diff line
@@ -184,23 +184,13 @@
#define FIX_960_SYN_OUTPUT                              /* VA: issue 960: unused function syn_output() is removed */

#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */
#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES       /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers	*/
#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format */
#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
#define NONBE_FIX_AVG_IAC_CLDFB_REVERB
#endif
#endif
#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format*/
#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
#define NONBE_FIX_AVG_IAC_CLDFB_REVERB
#endif
/*#define FIX_OLD_BINARY_FORMAT*/                           /* Orange: trick to make tests succesful when changing hrtf binary format between ref and new branch*/      
/*#define FIX_OLD_BINARY_FILE*/                             /* Orange: current hrtf binary file in ref branch contains wrong values for fastconv value. This switch can be activated to compre running codec with and without hrtf file*/      
#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */
#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */
#endif


#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE            /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions   */
//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */