Commit fd0091a0 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1020_AEID_SELECTION_ERRORS

parent 7c54e695

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



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

#define FIX_993_REMOVE_SBA_GET_ORDER                    /* VA: issue 993: remove unused function ivas_sba_get_order() */

#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_960_SYN_OUTPUT                              /* VA: issue 960: unused function syn_output() is removed */

lib_util/render_config_reader.c

+0 −4
Original line number Diff line number Diff line
@@ -2241,11 +2241,7 @@ 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;