Commit 2e6cbc92 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Renderer config reader: fix for erronous acoustic environment structure access

parent 0d834736

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



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



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



/* #################### End BE switches ################################## */

lib_util/render_config_reader.c

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