Commit a82876f5 authored by emerit's avatar emerit
Browse files

Merge branch 'float-pc' into 1741_ref_enable_switches

parents 6c52f844 18bfe071

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ 
#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */



#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 */

//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#define FIX_1020_AEID_SELECTION_ERRORS                   /* Philips: issue #1020: fix for acoustic environment ID selection errors */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS             /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF */             /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/

#define FIX_1009_ISM_NONDIEGETIC_PANNING                /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan      */

lib_util/render_config_reader.c

+4 −0
Original line number Diff line number Diff line
@@ -2239,7 +2239,11 @@ ivas_error RenderConfigReader_read( 
                    return IVAS_ERR_INVALID_RENDER_CONFIG;

                }

                idx = strtol( strtok( NULL, ":" ), NULL, 0 );

#ifdef FIX_1020_AEID_SELECTION_ERRORS

                pRenderConfigReader->pAE[acIdx].id = idx;

#else

                pRenderConfigReader->pAE->id = idx;

#endif



                aeHasFgIdx = aeHasPredelay = aeHasRt60 = aeHasDsr = FALSE;

                aeHasERsize = aeHasERabs = FALSE;