From 44180776d47cf0e30331a040e36132aa24540cf2 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 10 Aug 2025 10:41:25 +0200 Subject: [PATCH] revert temporal changes --- scripts/config/self_test.prm | 12 +++ scripts/config/self_test_basop_encoder.prm | 117 +++++++++++++++++++++ 2 files changed, 129 insertions(+) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 5f358736e0..91f8c5e88d 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -1872,6 +1872,10 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -ism_sba 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_FOA48c.wav bit ../IVAS_dec 7_1_4 48 bit testv/stvOSBA_3ISM_FOA48c.wav_7_1_4_128000_48-48.tst +// OSBA FOA 4ISM at 256 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stvOSBA_4ISM_FOA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_FOA48c.wav_EXT_256000_48-48.tst + // OSBA FOA 4ISM at 512 kbps, 48kHz in, 48kHz out, BINAURAL (Model from file) out ../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_FOA48c.wav bit ../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stvOSBA_4ISM_FOA48c.wav_BINAURAL_512000_48-48.tst @@ -1900,6 +1904,10 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -ism_sba 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 48 testv/stvOSBA_4ISM_2OA48c.wav bit ../IVAS_dec BINAURAL 48 bit testv/stvOSBA_4ISM_2OA48c.wav_BINAURAL_384000_48-48.tst +// OSBA 3OA 1ISM at 512 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 1 3 testv/stvISM1.csv 512000 48 testv/stvOSBA_1ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_3OA48c.wav_EXT_512000_48-48.tst + // OSBA 3OA 2ISM at 256 kbps, 48kHz in, 48kHz out, 7_1 out ../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 48 testv/stvOSBA_2ISM_3OA48c.wav bit ../IVAS_dec 7_1 48 bit testv/stvOSBA_2ISM_3OA48c.wav_7_1_256000_48-48.tst @@ -1936,6 +1944,10 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 ../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 32 testv/stvOSBA_4ISM_FOA32c.wav bit ../IVAS_dec STEREO 48 bit testv/stvOSBA_4ISM_FOA32c.wav_STEREO_512000_32-48.tst +// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 32kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/stvOSBA_4ISM_3OA32c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA32c.wav_EXT_sw_13k2_512k_32-48.tst + // OSBA FOA 4ISM at br sw 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching ../IVAS_cod -max_band testv/ivas_bws_20fr_start_FB.txt -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_FOA48c.wav bit eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g192 bit_error diff --git a/scripts/config/self_test_basop_encoder.prm b/scripts/config/self_test_basop_encoder.prm index 6cc63528e9..bd43eecb6a 100644 --- a/scripts/config/self_test_basop_encoder.prm +++ b/scripts/config/self_test_basop_encoder.prm @@ -319,6 +319,123 @@ ../IVAS_cod -sba -1 128000 48 testv/stvFOA48c.wav bit ../IVAS_dec FOA 32 bit testv/stvFOA48c.pcm_planarSBA_128000_48-32_BinauralRoomReverb_Config_renderer_Headrot_BinauralFile.tst +// OSBA planar 3OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism_sba 4 -3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_p3OA48c.wav_EXT_512000_48-48.tst + +// OSBA planar 2OA 4ISM at 512 kbps, 48 kHz in, 48 kHz out, EXT out +../IVAS_cod -ism_sba 4 -2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_2OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_p3OA48c.wav_EXT_512000_48-48.tst + +// OSBA FOA 4ISM at 512 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_FOA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_FOA48c.wav_EXT_512000_48-48.tst + +// OSBA FOA 4ISM at 512 kbps, 32kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 32 testv/stvOSBA_4ISM_FOA32c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_FOA32c.wav_EXT_512000_32-48.tst + +// OSBA FOA 4ISM at 384 kbps, 32kHz in, 32kHz out, EXT out +../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 32 testv/stvOSBA_4ISM_FOA32c.wav bit +../IVAS_dec EXT 32 bit testv/stvOSBA_4ISM_FOA32c.wav_EXT_384000_32-32.tst + +// OSBA FOA 4ISM at 256 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stvOSBA_4ISM_FOA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_FOA48c.wav_EXT56000_48-48.tst + +// OSBA FOA 3ISM at 128 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_FOA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_3ISM_FOA48c.wav_EXT_128000_48-48.tst + +// OSBA FOA 1ISM at 48 kbps, 16kHz in, 16kHz out, EXT out +../IVAS_cod -ism_sba 1 1 testv/stvISM1.csv 32000 16 testv/stvOSBA_1ISM_FOA16c.wav bit +../IVAS_dec EXT 16 bit testv/stvOSBA_1ISM_FOA16c.wav_EXT_32000_16-16.tst + +// OSBA FOA 1ISM at 32 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 1 1 testv/stvISM1.csv 32000 48 testv/stvOSBA_1ISM_FOA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_FOA48c.wav_EXT_32000_48-48.tst + +// OSBA 3OA 4ISM bitrate switching 16.4 to 512, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_16k4_512k_50fr.bin 48 testv/stvOSBA_4ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_sw_16k4_512k_48-48.tst + +// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_4ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_sw_13k2_512k_48-48.tst + +// OSBA 3OA 4ISM bitrate switching 13.2 to 512, 32kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_13k2_512k.bin 32 testv/stvOSBA_4ISM_3OA32c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA32c.wav_EXT_sw_13k2_512k_32-48.tst + +// OSBA 3OA 4ISM at 64 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stvOSBA_4ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_64000_48-48_EXT.tst + +// OSBA 3OA 4ISM at 512 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stvOSBA_4ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_512000_48-48_EXT.tst + + +// OSBA 3OA 4ISM at 48 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stvOSBA_4ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_48000_48-48_EXT.tst + +// OSBA 3OA 4ISM at 16.4 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 16400 48 testv/stvOSBA_4ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_3OA48c.wav_EXT_16400_48-48.tst + +// OSBA 3OA 3ISM at 160 kbps, 16kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 3 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 160000 16 testv/stvOSBA_3ISM_3OA16c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_3ISM_3OA416c.wav_EXT_160000_16-48.tst + +// OSBA 3OA 3ISM at 128 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 3 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stvOSBA_3ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_3ISM_3OA48c.wav_EXT_128000_48-48.tst + +// OSBA 3OA 2ISM at 256 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 48 testv/stvOSBA_2ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_2ISM_3OA48c.wav_EXT_256000_48-48.tst + +// OSBA 3OA 2ISM at 256 kbps, 32kHz in, 32kHz out, EXT out +../IVAS_cod -ism_sba 2 3 testv/stvISM1.csv testv/stvISM2.csv 256000 32 testv/stvOSBA_2ISM_3OA32c.wav bit +../IVAS_dec EXT 32 bit testv/stvOSBA_2ISM_3OA32c.wav_EXT_256000_32-32.tst + +// OSBA 3OA 1ISM at 512 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 1 3 testv/stvISM1.csv 512000 48 testv/stvOSBA_1ISM_3OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_3OA48c.wav_EXT_512000_48-48.tst + +// OSBA 3ISM 3OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, EXT out +../IVAS_cod -ism_sba 3 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_3ISM_3OA48c.wav bit +../IVAS_dec EXT 32 bit testv/stvOSBA_3ISM_3OA48c.wav_EXT_sw_48-32.tst + +// OSBA 3ISM 2OA at bitrate switching 13.2 to 512 kbps, 48kHz in, 32kHz out, EXT out +../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stvOSBA_3ISM_2OA48c.wav bit +../IVAS_dec EXT 32 bit testv/stvOSBA_3ISM_2OA48c.wav_EXT_sw_48-32.tst + +// OSBA 2OA 4ISM at 384 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 48 testv/stvOSBA_4ISM_2OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_4ISM_2OA48c.wav_EXT_384000_48-48.tst + +// OSBA 2OA 3ISM at 96 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 96000 48 testv/stvOSBA_3ISM_2OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_3ISM_2OA48c.wav_EXT_96000_48-48.tst + +// OSBA 2OA 3ISM at 384 kbps, 16kHz in, 16kHz out, EXT out +../IVAS_cod -ism_sba 3 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 384000 16 testv/stvOSBA_3ISM_2OA16c.wav bit +../IVAS_dec EXT 16 bit testv/stvOSBA_3ISM_2OA16c.wav_EXT56000_16-16.tst + +// OSBA 2OA 2ISM at 64 kbps, 32kHz in, 16kHz out, EXT out +../IVAS_cod -ism_sba 2 2 testv/stvISM1.csv testv/stvISM2.csv 48000 32 testv/stvOSBA_2ISM_2OA32c.wav bit +../IVAS_dec EXT 16 bit testv/stvOSBA_2ISM_2OA32c.wav_EXT_64000_32-16.tst + +// OSBA 2OA 2ISM at 48 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 2 2 testv/stvISM1.csv testv/stvISM2.csv 48000 48 testv/stvOSBA_2ISM_2OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_2ISM_2OA48c.wav_EXT_48000_48-48.tst + +// OSBA 2OA 1ISM at 24.4 kbps, 48kHz in, 48kHz out, EXT out +../IVAS_cod -ism_sba 1 2 testv/stvISM1.csv 24400 48 testv/stvOSBA_1ISM_2OA48c.wav bit +../IVAS_dec EXT 48 bit testv/stvOSBA_1ISM_2OA48c.wav_EXT_24400_48-48.tst + // OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 384 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met ../scripts/switchPaths/sw_13k2_512k_2fr_start_384k_omasatechs_4ism.bin 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit ../IVAS_dec BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_sw_48-48.tst -- GitLab