From d5c2b34fc166f6bfd3afef0def9fa08bfeff90f4 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 8 Feb 2024 16:24:21 +0100 Subject: [PATCH 1/4] move renderer pytest data to scripts/testv --- .../renderer/data => scripts/testv}/ism1_ivas_mtdt_config.txt | 0 .../renderer/data => scripts/testv}/ism1_shorthand_config.txt | 0 .../renderer/data => scripts/testv}/ism2_ivas_mtdt_config.txt | 0 .../renderer/data => scripts/testv}/ism2_shorthand_config.txt | 0 .../renderer/data => scripts/testv}/ism3_ivas_mtdt_config.txt | 0 .../renderer/data => scripts/testv}/ism3_shorthand_config.txt | 0 .../renderer/data => scripts/testv}/ism4_ivas_mtdt_config.txt | 0 .../renderer/data => scripts/testv}/ism4_shorthand_config.txt | 0 {tests/renderer/data => scripts/testv}/ism_0a_0e.csv | 0 {tests/renderer/data => scripts/testv}/masa_scene.txt | 0 .../renderer/data => scripts/testv}/mixed_ivas_mtdt_config.txt | 0 .../data => scripts/testv}/mixed_ivas_mtdt_gain_config.txt | 0 .../data => scripts/testv}/mixed_mc714_foa_masa2_ism4.txt | 0 {tests/renderer/data => scripts/testv}/mixed_scene.txt | 0 {tests/renderer/data => scripts/testv}/mixed_scene_simple.txt | 0 .../renderer/data => scripts/testv}/mixed_shorthand_config.txt | 0 .../data => scripts/testv}/mixed_shorthand_gain_config.txt | 0 .../data => scripts/testv}/mixed_shorthand_limiter_config.txt | 0 .../data => scripts/testv}/renderer_config_format_readme.txt | 0 .../data => scripts/testv}/spectral_test_10ch_48kHz.wav | 0 .../data => scripts/testv}/spectral_test_11ch_48kHz.wav | 0 .../data => scripts/testv}/spectral_test_12ch_48kHz.wav | 0 .../data => scripts/testv}/spectral_test_13ch_48kHz.wav | 0 .../data => scripts/testv}/spectral_test_15ch_48kHz.wav | 0 .../data => scripts/testv}/spectral_test_16ch_48kHz.wav | 0 .../data => scripts/testv}/spectral_test_17ch_48kHz.wav | 0 .../data => scripts/testv}/spectral_test_18ch_48kHz.wav | 0 .../data => scripts/testv}/spectral_test_19ch_48kHz.wav | 0 .../renderer/data => scripts/testv}/spectral_test_1ch_48kHz.wav | 0 .../data => scripts/testv}/spectral_test_20ch_48kHz.wav | 0 .../renderer/data => scripts/testv}/spectral_test_2ch_48kHz.wav | 0 .../renderer/data => scripts/testv}/spectral_test_3ch_48kHz.wav | 0 .../renderer/data => scripts/testv}/spectral_test_4ch_48kHz.wav | 0 .../renderer/data => scripts/testv}/spectral_test_5ch_48kHz.wav | 0 .../renderer/data => scripts/testv}/spectral_test_6ch_48kHz.wav | 0 .../renderer/data => scripts/testv}/spectral_test_7ch_48kHz.wav | 0 .../renderer/data => scripts/testv}/spectral_test_8ch_48kHz.wav | 0 .../renderer/data => scripts/testv}/spectral_test_9ch_48kHz.wav | 0 tests/renderer/constants.py | 2 +- 39 files changed, 1 insertion(+), 1 deletion(-) rename {tests/renderer/data => scripts/testv}/ism1_ivas_mtdt_config.txt (100%) rename {tests/renderer/data => scripts/testv}/ism1_shorthand_config.txt (100%) rename {tests/renderer/data => scripts/testv}/ism2_ivas_mtdt_config.txt (100%) rename {tests/renderer/data => scripts/testv}/ism2_shorthand_config.txt (100%) rename {tests/renderer/data => scripts/testv}/ism3_ivas_mtdt_config.txt (100%) rename {tests/renderer/data => scripts/testv}/ism3_shorthand_config.txt (100%) rename {tests/renderer/data => scripts/testv}/ism4_ivas_mtdt_config.txt (100%) rename {tests/renderer/data => scripts/testv}/ism4_shorthand_config.txt (100%) rename {tests/renderer/data => scripts/testv}/ism_0a_0e.csv (100%) rename {tests/renderer/data => scripts/testv}/masa_scene.txt (100%) rename {tests/renderer/data => scripts/testv}/mixed_ivas_mtdt_config.txt (100%) rename {tests/renderer/data => scripts/testv}/mixed_ivas_mtdt_gain_config.txt (100%) rename {tests/renderer/data => scripts/testv}/mixed_mc714_foa_masa2_ism4.txt (100%) rename {tests/renderer/data => scripts/testv}/mixed_scene.txt (100%) rename {tests/renderer/data => scripts/testv}/mixed_scene_simple.txt (100%) rename {tests/renderer/data => scripts/testv}/mixed_shorthand_config.txt (100%) rename {tests/renderer/data => scripts/testv}/mixed_shorthand_gain_config.txt (100%) rename {tests/renderer/data => scripts/testv}/mixed_shorthand_limiter_config.txt (100%) rename {tests/renderer/data => scripts/testv}/renderer_config_format_readme.txt (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_10ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_11ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_12ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_13ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_15ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_16ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_17ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_18ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_19ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_1ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_20ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_2ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_3ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_4ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_5ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_6ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_7ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_8ch_48kHz.wav (100%) rename {tests/renderer/data => scripts/testv}/spectral_test_9ch_48kHz.wav (100%) diff --git a/tests/renderer/data/ism1_ivas_mtdt_config.txt b/scripts/testv/ism1_ivas_mtdt_config.txt similarity index 100% rename from tests/renderer/data/ism1_ivas_mtdt_config.txt rename to scripts/testv/ism1_ivas_mtdt_config.txt diff --git a/tests/renderer/data/ism1_shorthand_config.txt b/scripts/testv/ism1_shorthand_config.txt similarity index 100% rename from tests/renderer/data/ism1_shorthand_config.txt rename to scripts/testv/ism1_shorthand_config.txt diff --git a/tests/renderer/data/ism2_ivas_mtdt_config.txt b/scripts/testv/ism2_ivas_mtdt_config.txt similarity index 100% rename from tests/renderer/data/ism2_ivas_mtdt_config.txt rename to scripts/testv/ism2_ivas_mtdt_config.txt diff --git a/tests/renderer/data/ism2_shorthand_config.txt b/scripts/testv/ism2_shorthand_config.txt similarity index 100% rename from tests/renderer/data/ism2_shorthand_config.txt rename to scripts/testv/ism2_shorthand_config.txt diff --git a/tests/renderer/data/ism3_ivas_mtdt_config.txt b/scripts/testv/ism3_ivas_mtdt_config.txt similarity index 100% rename from tests/renderer/data/ism3_ivas_mtdt_config.txt rename to scripts/testv/ism3_ivas_mtdt_config.txt diff --git a/tests/renderer/data/ism3_shorthand_config.txt b/scripts/testv/ism3_shorthand_config.txt similarity index 100% rename from tests/renderer/data/ism3_shorthand_config.txt rename to scripts/testv/ism3_shorthand_config.txt diff --git a/tests/renderer/data/ism4_ivas_mtdt_config.txt b/scripts/testv/ism4_ivas_mtdt_config.txt similarity index 100% rename from tests/renderer/data/ism4_ivas_mtdt_config.txt rename to scripts/testv/ism4_ivas_mtdt_config.txt diff --git a/tests/renderer/data/ism4_shorthand_config.txt b/scripts/testv/ism4_shorthand_config.txt similarity index 100% rename from tests/renderer/data/ism4_shorthand_config.txt rename to scripts/testv/ism4_shorthand_config.txt diff --git a/tests/renderer/data/ism_0a_0e.csv b/scripts/testv/ism_0a_0e.csv similarity index 100% rename from tests/renderer/data/ism_0a_0e.csv rename to scripts/testv/ism_0a_0e.csv diff --git a/tests/renderer/data/masa_scene.txt b/scripts/testv/masa_scene.txt similarity index 100% rename from tests/renderer/data/masa_scene.txt rename to scripts/testv/masa_scene.txt diff --git a/tests/renderer/data/mixed_ivas_mtdt_config.txt b/scripts/testv/mixed_ivas_mtdt_config.txt similarity index 100% rename from tests/renderer/data/mixed_ivas_mtdt_config.txt rename to scripts/testv/mixed_ivas_mtdt_config.txt diff --git a/tests/renderer/data/mixed_ivas_mtdt_gain_config.txt b/scripts/testv/mixed_ivas_mtdt_gain_config.txt similarity index 100% rename from tests/renderer/data/mixed_ivas_mtdt_gain_config.txt rename to scripts/testv/mixed_ivas_mtdt_gain_config.txt diff --git a/tests/renderer/data/mixed_mc714_foa_masa2_ism4.txt b/scripts/testv/mixed_mc714_foa_masa2_ism4.txt similarity index 100% rename from tests/renderer/data/mixed_mc714_foa_masa2_ism4.txt rename to scripts/testv/mixed_mc714_foa_masa2_ism4.txt diff --git a/tests/renderer/data/mixed_scene.txt b/scripts/testv/mixed_scene.txt similarity index 100% rename from tests/renderer/data/mixed_scene.txt rename to scripts/testv/mixed_scene.txt diff --git a/tests/renderer/data/mixed_scene_simple.txt b/scripts/testv/mixed_scene_simple.txt similarity index 100% rename from tests/renderer/data/mixed_scene_simple.txt rename to scripts/testv/mixed_scene_simple.txt diff --git a/tests/renderer/data/mixed_shorthand_config.txt b/scripts/testv/mixed_shorthand_config.txt similarity index 100% rename from tests/renderer/data/mixed_shorthand_config.txt rename to scripts/testv/mixed_shorthand_config.txt diff --git a/tests/renderer/data/mixed_shorthand_gain_config.txt b/scripts/testv/mixed_shorthand_gain_config.txt similarity index 100% rename from tests/renderer/data/mixed_shorthand_gain_config.txt rename to scripts/testv/mixed_shorthand_gain_config.txt diff --git a/tests/renderer/data/mixed_shorthand_limiter_config.txt b/scripts/testv/mixed_shorthand_limiter_config.txt similarity index 100% rename from tests/renderer/data/mixed_shorthand_limiter_config.txt rename to scripts/testv/mixed_shorthand_limiter_config.txt diff --git a/tests/renderer/data/renderer_config_format_readme.txt b/scripts/testv/renderer_config_format_readme.txt similarity index 100% rename from tests/renderer/data/renderer_config_format_readme.txt rename to scripts/testv/renderer_config_format_readme.txt diff --git a/tests/renderer/data/spectral_test_10ch_48kHz.wav b/scripts/testv/spectral_test_10ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_10ch_48kHz.wav rename to scripts/testv/spectral_test_10ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_11ch_48kHz.wav b/scripts/testv/spectral_test_11ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_11ch_48kHz.wav rename to scripts/testv/spectral_test_11ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_12ch_48kHz.wav b/scripts/testv/spectral_test_12ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_12ch_48kHz.wav rename to scripts/testv/spectral_test_12ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_13ch_48kHz.wav b/scripts/testv/spectral_test_13ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_13ch_48kHz.wav rename to scripts/testv/spectral_test_13ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_15ch_48kHz.wav b/scripts/testv/spectral_test_15ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_15ch_48kHz.wav rename to scripts/testv/spectral_test_15ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_16ch_48kHz.wav b/scripts/testv/spectral_test_16ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_16ch_48kHz.wav rename to scripts/testv/spectral_test_16ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_17ch_48kHz.wav b/scripts/testv/spectral_test_17ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_17ch_48kHz.wav rename to scripts/testv/spectral_test_17ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_18ch_48kHz.wav b/scripts/testv/spectral_test_18ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_18ch_48kHz.wav rename to scripts/testv/spectral_test_18ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_19ch_48kHz.wav b/scripts/testv/spectral_test_19ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_19ch_48kHz.wav rename to scripts/testv/spectral_test_19ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_1ch_48kHz.wav b/scripts/testv/spectral_test_1ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_1ch_48kHz.wav rename to scripts/testv/spectral_test_1ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_20ch_48kHz.wav b/scripts/testv/spectral_test_20ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_20ch_48kHz.wav rename to scripts/testv/spectral_test_20ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_2ch_48kHz.wav b/scripts/testv/spectral_test_2ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_2ch_48kHz.wav rename to scripts/testv/spectral_test_2ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_3ch_48kHz.wav b/scripts/testv/spectral_test_3ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_3ch_48kHz.wav rename to scripts/testv/spectral_test_3ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_4ch_48kHz.wav b/scripts/testv/spectral_test_4ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_4ch_48kHz.wav rename to scripts/testv/spectral_test_4ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_5ch_48kHz.wav b/scripts/testv/spectral_test_5ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_5ch_48kHz.wav rename to scripts/testv/spectral_test_5ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_6ch_48kHz.wav b/scripts/testv/spectral_test_6ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_6ch_48kHz.wav rename to scripts/testv/spectral_test_6ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_7ch_48kHz.wav b/scripts/testv/spectral_test_7ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_7ch_48kHz.wav rename to scripts/testv/spectral_test_7ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_8ch_48kHz.wav b/scripts/testv/spectral_test_8ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_8ch_48kHz.wav rename to scripts/testv/spectral_test_8ch_48kHz.wav diff --git a/tests/renderer/data/spectral_test_9ch_48kHz.wav b/scripts/testv/spectral_test_9ch_48kHz.wav similarity index 100% rename from tests/renderer/data/spectral_test_9ch_48kHz.wav rename to scripts/testv/spectral_test_9ch_48kHz.wav diff --git a/tests/renderer/constants.py b/tests/renderer/constants.py index 056242bd3c..b49f006d79 100644 --- a/tests/renderer/constants.py +++ b/tests/renderer/constants.py @@ -35,7 +35,7 @@ from pathlib import Path """ Set up paths """ TESTS_DIR = Path(__file__).parent SCRIPTS_DIR = TESTS_DIR.parents[1].joinpath("scripts").resolve() -TEST_VECTOR_DIR = TESTS_DIR.joinpath("data") +TEST_VECTOR_DIR = SCRIPTS_DIR.joinpath("testv") OUTPUT_PATH_REF = TESTS_DIR.joinpath("ref") OUTPUT_PATH_CUT = TESTS_DIR.joinpath("cut") -- GitLab From 8bef53f6d3986f976901f40522d96719642b480e Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 8 Feb 2024 16:32:37 +0100 Subject: [PATCH 2/4] update mixed scene .txt file --- scripts/testv/mixed_mc714_foa_masa2_ism4.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/testv/mixed_mc714_foa_masa2_ism4.txt b/scripts/testv/mixed_mc714_foa_masa2_ism4.txt index e29dabb46c..c7f8e4276a 100644 --- a/scripts/testv/mixed_mc714_foa_masa2_ism4.txt +++ b/scripts/testv/mixed_mc714_foa_masa2_ism4.txt @@ -1,4 +1,4 @@ -../../../scripts/testv/mixed_mc714_foa_masa2_ism4.wav +mixed_mc714_foa_masa2_ism4.wav 7 MC 1 @@ -9,16 +9,16 @@ SBA MASA 17 2 -../../../scripts/testv/stv2MASA2TC48c.met +MASA2TC48c.met ISM 19 -../../../scripts/testv/stvISM1.csv +stvISM1.csv ISM 20 -../../../scripts/testv/stvISM2.csv +stvISM2.csv ISM 21 -../../../scripts/testv/stvISM3.csv +stvISM3.csv ISM 22 -../../../scripts/testv/stvISM4.csv \ No newline at end of file +stvISM4.csv -- GitLab From c610912336ae13e77dbfc903e2035cced5a73a97 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 8 Feb 2024 16:43:56 +0100 Subject: [PATCH 3/4] [ci] remove old cp command in .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f16bf9e2f1..de622c6cfb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1268,7 +1268,6 @@ ivas-conformance: - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface - cp -r tests/ref testvec/testv/ref - cp -r tests/dut/* testvec/testv/ref - - cp -r tests/renderer/data testvec/renderer/data - cp -r tests/renderer/cut testvec/testv/renderer/ref - cp -r conformance-test testvec/ - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec -- GitLab From 7ef27b78f65d05258bd21a1d0628bd1a6ecb704d Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 8 Feb 2024 17:00:39 +0100 Subject: [PATCH 4/4] [ci] fix path in conformance test --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de622c6cfb..cace6c4614 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1268,7 +1268,7 @@ ivas-conformance: - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface - cp -r tests/ref testvec/testv/ref - cp -r tests/dut/* testvec/testv/ref - - cp -r tests/renderer/cut testvec/testv/renderer/ref + - cp -r tests/renderer/cut testvec/renderer/ref - cp -r conformance-test testvec/ - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin -- GitLab