From 46734646b8804044e0ed6289fffeee573d612124 Mon Sep 17 00:00:00 2001 From: muxe6256 Date: Mon, 6 Feb 2023 17:23:48 +0100 Subject: [PATCH 1/2] add missing tests in self_test.prm --- scripts/config/self_test.prm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index b1d55a949c..b4ecbee9d9 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -369,7 +369,7 @@ // 1 ISm with metadata at 96 kbps, 48 kHz in, 16 kHz out, TD BINAURAL out (Model from file) ../IVAS_cod -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.pcm bit -../IVAS_dec -hrtf ../scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.pcm_96000_48-16_TD_binaural.tst +../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.pcm_96000_48-16_TD_binaural.tst // 2 ISm with metadata at 160 kbps, 48 kHz in, 32 kHz out, TD BINAURAL out ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 160000 48 testv/stv2ISM48s.pcm bit @@ -377,7 +377,7 @@ // 3 ISm with metadata at 192 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out (Model from file) ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.pcm bit -../IVAS_dec -hrtf ../scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.pcm_192000_48-48_TD_binaural.tst +../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.pcm_192000_48-48_TD_binaural.tst // 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out ../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.pcm bit @@ -385,11 +385,11 @@ // 1 ISm with metadata at 80 kbps, 48 kHz in, 16 kHz out, TD BINAURAL out (Model from file), head rotation, random FEC at 5% ../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.pcm bit -../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.pcm_80000_48-16_TDHR_FEC5.tst +../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.pcm_80000_48-16_TDHR_FEC5.tst // 2 ISm with metadata at 128 kbps, 48 kHz in, 32 kHz out, TD BINAURAL out (Model from file), head rotation ../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.pcm bit -../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.pcm_128000_48-32_TDHR.tst +../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.pcm_128000_48-32_TDHR.tst // 3 ISm with metadata at 192 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, random FEC at 5% ../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.pcm bit @@ -913,6 +913,23 @@ ../IVAS_dec -FEC 5 STEREO 32 bit testv/stv714MC48c.pcm_sw_48-32_stereo.tst +// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM out (Model from file) +../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.pcm bit +../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL_ROOM 16 bit testv/stv51MC48c.pcm_MC51_512000_48-16_MC_binaural_room.tst + +// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 32kHz out, BINAURAL out (Model from file) +../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.pcm bit +../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv714MC48c.pcm_MC714_512000_48-32_MC_binaural.tst + +// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL out (Model from file) +../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.pcm bit +../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv51MC48c.pcm_MC51_512000_48-48_MC_binaural.tst + +// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out (Model from file) +../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.pcm bit +../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL_ROOM 48 bit testv/stv714MC48c.pcm_MC714_512000_48-48_MC_binaural_room.tst + + // Stereo downmix to bit-exact EVS at 13200 kbps, 32kHz in, 32kHz out ../IVAS_cod -stereo_dmx_evs 13200 32 testv/stvST32c.pcm bit ../IVAS_dec 32 bit testv/stvST32c.pcm_StereoDmxEVS_13200_32-32.tst @@ -940,4 +957,4 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit // Multi-channel 5_1 at 384 kbps, 48kHz in, 48kHz out, 7_1_4 out, JBM Prof 5 ../IVAS_cod -mc 5_1 384000 48 testv/stv51MC48c.pcm bit networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0 -../IVAS_dec -Tracefile tracefile_dec -VOIP 7_1_4 48 netsimoutput testv/stv51MC48c.pcm_MC51_384000_48-48_7_1_4_JBM5.tst \ No newline at end of file +../IVAS_dec -Tracefile tracefile_dec -VOIP 7_1_4 48 netsimoutput testv/stv51MC48c.pcm_MC51_384000_48-48_7_1_4_JBM5.tst -- GitLab From 28501c00e98871b94a3ebc54eab7d036136b7455 Mon Sep 17 00:00:00 2001 From: muxe6256 Date: Mon, 6 Feb 2023 18:04:29 +0100 Subject: [PATCH 2/2] remove define FIX_FOR_TEST --- lib_com/options.h | 1 - lib_util/hrtf_file_reader.c | 27 --------------------------- 2 files changed, 28 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 35ade80901..85a4398186 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -150,7 +150,6 @@ #define HRTF_BINARY_FILE /* HRTF filters' binary file used for binaural rendering. */ #define FIX_197_CREND_INTERFACE -#define FIX_FOR_TEST /* allows tests to pass using old TD binary file, to be removed after merge*/ #define FIX_301_PLC /* FhG: issue 301 - fix bug of missing update of overlap buffer for DFT-stereo PLC*/ diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c index 97b33b7fd1..42ab5a869b 100644 --- a/lib_util/hrtf_file_reader.c +++ b/lib_util/hrtf_file_reader.c @@ -453,34 +453,7 @@ static ivas_error TDREND_MIX_LoadHRTF( if ( ( header_check_result = read_and_check_hrtf_binary_file_header( &hrtfs_file_header, f_hrtf ) ) != IVAS_ERR_OK ) { -#ifdef FIX_FOR_TEST - fseek( f_hrtf, 0, SEEK_SET ); - if ( fread( &tmp, 1, sizeof( int16_t ), f_hrtf ) == 0 ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); - } - - HrFiltSet_p->FilterMethod = (TDREND_HRFILT_Method_t) tmp; - - if ( HrFiltSet_p->FilterMethod != TDREND_HRFILT_Method_BSplineModel ) - { - error = IVAS_ERROR( IVAS_ERR_INVALID_HRTF, "The HR filter set file is not a supported type." ); - } - else - { - error = LoadBSplineBinary( HrFiltSet_p, f_hrtf ); - } - if ( error != IVAS_ERR_OK ) - { - return header_check_result; - } - else - { - return error; - } -#else return header_check_result; -#endif } is_tdrend = FALSE; -- GitLab