diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f16bf9e2f18544aa3b4c6292c0d1746f57c5a994..cace6c4614935574c9b3939d10478f467fea9cb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1268,8 +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/data testvec/renderer/data - - 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 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/scripts/testv/mixed_mc714_foa_masa2_ism4.txt b/scripts/testv/mixed_mc714_foa_masa2_ism4.txt new file mode 100644 index 0000000000000000000000000000000000000000..c7f8e4276a886b95d1be81e6ba4cf0eb20e45c75 --- /dev/null +++ b/scripts/testv/mixed_mc714_foa_masa2_ism4.txt @@ -0,0 +1,24 @@ +mixed_mc714_foa_masa2_ism4.wav +7 +MC +1 +7_1_4 +SBA +13 +1 +MASA +17 +2 +MASA2TC48c.met +ISM +19 +stvISM1.csv +ISM +20 +stvISM2.csv +ISM +21 +stvISM3.csv +ISM +22 +stvISM4.csv 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 056242bd3c6c8b1d8d58c20d08e4c17f307721f7..b49f006d79fa9081ff64c1291aa5e0b47f948fa2 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") diff --git a/tests/renderer/data/mixed_mc714_foa_masa2_ism4.txt b/tests/renderer/data/mixed_mc714_foa_masa2_ism4.txt deleted file mode 100644 index e29dabb46c22e62ccc64195d378557cf3f048546..0000000000000000000000000000000000000000 --- a/tests/renderer/data/mixed_mc714_foa_masa2_ism4.txt +++ /dev/null @@ -1,24 +0,0 @@ -../../../scripts/testv/mixed_mc714_foa_masa2_ism4.wav -7 -MC -1 -7_1_4 -SBA -13 -1 -MASA -17 -2 -../../../scripts/testv/stv2MASA2TC48c.met -ISM -19 -../../../scripts/testv/stvISM1.csv -ISM -20 -../../../scripts/testv/stvISM2.csv -ISM -21 -../../../scripts/testv/stvISM3.csv -ISM -22 -../../../scripts/testv/stvISM4.csv \ No newline at end of file