Commit c14c77ea authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch '1020-fix-aeid-selection-errors' into 'main' 

Renderer config reader: fix for erroneous acoustic environment structure access

See merge request !1429
parents 9049c1df dbbde191

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ 


#define FIX_998_UNUSED_FUNCTION                         /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */ 

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

#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

+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;

scripts/config/self_test.prm

+4 −1
Original line number Diff line number Diff line
@@ -878,12 +878,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -sba -1 128000 48 testv/stvFOA48c.wav bit

../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin -t testv/headrot_case00_3000_q.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/stvFOA48c.pcm_planarSBA_12800032-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst



// SBA 3OA at 128 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB combined renderer configuration with selected acoustic environment

//../IVAS_cod -sba 3 128000 48 testv/stv3OA48c.wav bit

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1 BINAURAL_ROOM_REVERB 48 bit testv/stv3OA48c.pcm_SBA_12800048-48_BinauralRoomReverb_Config_renderer_combined_AEID_1.tst



// SBA at 256 kbps, 48kHz in, 48kHz out, PCA, BINAURAL out

../IVAS_cod -pca -sba 1 256000 48 testv/stvFOA48c.wav bit

../IVAS_dec BINAURAL 48 bit testv/stvFOA48c.wav_SBA_PCA_256000_48-48_BINAURAL.tst







// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching

../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -masa 1 testv/stv1MASA1TC48c.met 13200 48 testv/stv1MASA1TC48c.wav bit

../IVAS_dec BINAURAL 48 bit testv/stv1MASA1TC48c.wav_13200_48-48_BINAURAL.tst

scripts/config/self_test_ltv.prm

+4 −2
Original line number Diff line number Diff line
@@ -878,13 +878,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -sba -1 128000 48 testv/ltv48_FOA.wav bit

../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin -t testv/headrot_case00_3000_q.csv -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 32 bit testv/ltv48_FOA.pcm_planarSBA_12800032-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst



// SBA 3OA at 128 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB combined renderer configuration with selected acoustic environment

//../IVAS_cod -sba 3 128000 48 testv/ltv48_HOA3.wav bit

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1 BINAURAL_ROOM_REVERB 48 bit testv/ltv48_HOA3.pcm_SBA_12800048-48_BinauralRoomReverb_Config_renderer_combined_AEID_1.tst



// SBA at 256 kbps, 48kHz in, 48kHz out, PCA, BINAURAL out

../IVAS_cod -pca -sba 1 256000 48 testv/ltv48_FOA.wav bit

../IVAS_dec BINAURAL 48 bit testv/ltv48_FOA.wav_SBA_PCA_256000_48-48_BINAURAL.tst









// MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out, bandwidth switching

../IVAS_cod -max_band testv/ivas_bws_20fr_start_SWB.txt -masa 1 testv/ltv48_MASA1TC.met 13200 48 testv/ltv48_MASA1TC.wav bit

../IVAS_dec BINAURAL 48 bit testv/ltv48_MASA1TC.wav_13200_48-48_BINAURAL.tst