From f9ecf82ff0c80db026ebcc371720e41cc9e8a883 Mon Sep 17 00:00:00 2001 From: Shanush Prema Thasarathan Date: Thu, 3 Nov 2022 12:54:53 +1100 Subject: [PATCH 1/2] Re-add self test --- scripts/config/self_test.prm | 15 +++++++++++++++ scripts/switchPaths/sw_13k2_192k_50fr.bin | 3 +++ scripts/switchPaths/sw_16k4_512k_50fr.bin | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 scripts/switchPaths/sw_13k2_192k_50fr.bin create mode 100644 scripts/switchPaths/sw_16k4_512k_50fr.bin diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index 470b649ce0..fda5d04295 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -585,6 +585,21 @@ ../IVAS_cod -sba 3 512000 48 testv/stv3OA48c.pcm bit ../IVAS_dec binaural 48 bit testv/stv3OA48c.pcm_SBA_512000_48-48_binaural.tst +// SBA FOA bitrate switching from 16.4 kbps to 512 kbps, 48kHz in, 48kHz out, FOA out +../IVAS_cod -sba 1 ../scripts/switchPaths/sw_16k4_512k_50fr.bin 48 testv/stvFOA48c.pcm bit +../IVAS_dec FOA 48 bit testv/stvFOA48c.pcm_sw_48-48_FOA.tst + +// SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 48kHz in, 48kHz out, BINAURAL out +../IVAS_cod -sba 1 ../scripts/switchPaths/sw_13k2_192k_50fr.bin 48 testv/stvFOA48c.pcm bit +../IVAS_dec BINAURAL 48 bit testv/stvFOA48c.pcm_sw_48-48_BINAURAL.tst + +// SBA 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, HOA3 out +../IVAS_cod -sba 3 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv3OA48c.pcm bit +../IVAS_dec HOA3 48 bit testv/stv3OA48c.pcm_sw_48-48_HOA3.tst + +// SBA 3OA bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, 7_1_4 out +../IVAS_cod -sba 3 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stvFOA48c.pcm bit +../IVAS_dec 7_1_4 48 bit testv/stvFOA48c.pcm_sw_48-48_7_1_4.tst // MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -masa 1 testv/stv_IVASMASA_1dir1TC.met 13200 48 testv/stv_IVASMASA_1dir1TC.pcm bit diff --git a/scripts/switchPaths/sw_13k2_192k_50fr.bin b/scripts/switchPaths/sw_13k2_192k_50fr.bin new file mode 100644 index 0000000000..cd833ebd24 --- /dev/null +++ b/scripts/switchPaths/sw_13k2_192k_50fr.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58b5dfb78c283c6d9d5f52502a695c1f9e9e62589507736af5667e00dac4a890 +size 3996 diff --git a/scripts/switchPaths/sw_16k4_512k_50fr.bin b/scripts/switchPaths/sw_16k4_512k_50fr.bin new file mode 100644 index 0000000000..6f57a5afe8 --- /dev/null +++ b/scripts/switchPaths/sw_16k4_512k_50fr.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8abe2e5fb8110fa5f79f8df67986f4ac00809db9b7c19b9824a520a437b00250 +size 3996 -- GitLab From 849eb266d417019a1bc02c608e1145dc22e93a26 Mon Sep 17 00:00:00 2001 From: Shanush Prema Thasarathan Date: Thu, 3 Nov 2022 21:23:28 +1100 Subject: [PATCH 2/2] Change two tests to cover 2nd order HOA and planar 3rd order HOA --- scripts/config/self_test.prm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm index fda5d04295..2f14e098a2 100644 --- a/scripts/config/self_test.prm +++ b/scripts/config/self_test.prm @@ -585,20 +585,20 @@ ../IVAS_cod -sba 3 512000 48 testv/stv3OA48c.pcm bit ../IVAS_dec binaural 48 bit testv/stv3OA48c.pcm_SBA_512000_48-48_binaural.tst -// SBA FOA bitrate switching from 16.4 kbps to 512 kbps, 48kHz in, 48kHz out, FOA out -../IVAS_cod -sba 1 ../scripts/switchPaths/sw_16k4_512k_50fr.bin 48 testv/stvFOA48c.pcm bit -../IVAS_dec FOA 48 bit testv/stvFOA48c.pcm_sw_48-48_FOA.tst - // SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 48kHz in, 48kHz out, BINAURAL out ../IVAS_cod -sba 1 ../scripts/switchPaths/sw_13k2_192k_50fr.bin 48 testv/stvFOA48c.pcm bit ../IVAS_dec BINAURAL 48 bit testv/stvFOA48c.pcm_sw_48-48_BINAURAL.tst +// SBA 2OA bitrate switching from 16.4 kbps to 512 kbps, 48kHz in, 48kHz out, FOA out +../IVAS_cod -sba 2 ../scripts/switchPaths/sw_16k4_512k_50fr.bin 48 testv/stvFOA48c.pcm bit +../IVAS_dec FOA 48 bit testv/stvFOA48c.pcm_sw_48-48_FOA.tst + // SBA 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, HOA3 out ../IVAS_cod -sba 3 ../scripts/switchPaths/sw_13k2_512k.bin 48 testv/stv3OA48c.pcm bit ../IVAS_dec HOA3 48 bit testv/stv3OA48c.pcm_sw_48-48_HOA3.tst -// SBA 3OA bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, 7_1_4 out -../IVAS_cod -sba 3 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stvFOA48c.pcm bit +// SBA planar 3OA bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, 7_1_4 out +../IVAS_cod -sba -3 ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stvFOA48c.pcm bit ../IVAS_dec 7_1_4 48 bit testv/stvFOA48c.pcm_sw_48-48_7_1_4.tst // MASA 1dir 1TC at 13.2 kbps, 48kHz in, 48kHz out, BINAURAL out -- GitLab