From c76a512a2b7e734420aef79fd8121ef08bc3d61b Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Thu, 17 Apr 2025 17:29:36 +0200 Subject: [PATCH 1/4] Fix for metadata files for test_renderer.py --- tests/renderer/constants.py | 70 +++++++++++++++++++++++++++++++++ tests/renderer/test_renderer.py | 23 ----------- tests/renderer/utils.py | 11 ++++++ 3 files changed, 81 insertions(+), 23 deletions(-) diff --git a/tests/renderer/constants.py b/tests/renderer/constants.py index 39f57a6d89..43c8797d4a 100644 --- a/tests/renderer/constants.py +++ b/tests/renderer/constants.py @@ -298,6 +298,76 @@ FORMAT_TO_METADATA_FILES = { ], } +FORMAT_TO_METADATA_FILES_LTV = { + "ISM1": [str(TESTV_DIR.joinpath("ltvISM1.csv"))], + "ISM2": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltvISM2.csv")), + ], + "ISM3": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltvISM2.csv")), + str(TESTV_DIR.joinpath("ltvISM3.csv")), + ], + "ISM4": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltvISM2.csv")), + str(TESTV_DIR.joinpath("ltvISM3.csv")), + str(TESTV_DIR.joinpath("ltvISM4.csv")), + ], + "NDP_ISM4": [ # Should not be needed, because it is included in all ISM metadata files. + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltvISM2.csv")), + str(TESTV_DIR.joinpath("ltvISM3.csv")), + str(TESTV_DIR.joinpath("ltvISM4.csv")), + ], + "MASA1": [str(TESTV_DIR.joinpath("ltv48_MASA1TC.met"))], + "MASA2": [str(TESTV_DIR.joinpath("ltv48_MASA2TC.met"))], + "OMASA_1_1": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltv48_OMASA_1ISM_1TC.met")), + ], + "OMASA_1_2": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltvISM2.csv")), + str(TESTV_DIR.joinpath("ltv48_OMASA_2ISM_1TC.met ")), + ], + "OMASA_1_3": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltvISM2.csv")), + str(TESTV_DIR.joinpath("ltvISM3.csv")), + str(TESTV_DIR.joinpath("ltv48_OMASA_3ISM_1TC.met")), + ], + "OMASA_1_4": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltvISM2.csv")), + str(TESTV_DIR.joinpath("ltvISM3.csv")), + str(TESTV_DIR.joinpath("ltvISM4.csv")), + str(TESTV_DIR.joinpath("ltv48_OMASA_4ISM_1TC.met")), + ], + "OMASA_2_1": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltv48_OMASA_1ISM_2TC.met")), + ], + "OMASA_2_2": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltvISM2.csv")), + str(TESTV_DIR.joinpath("ltv48_OMASA_2ISM_2TC.met")), + ], + "OMASA_2_3": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltvISM2.csv")), + str(TESTV_DIR.joinpath("ltvISM3.csv")), + str(TESTV_DIR.joinpath("ltv48_OMASA_3ISM_2TC.met")), + ], + "OMASA_2_4": [ + str(TESTV_DIR.joinpath("ltvISM1.csv")), + str(TESTV_DIR.joinpath("ltvISM2.csv")), + str(TESTV_DIR.joinpath("ltvISM3.csv")), + str(TESTV_DIR.joinpath("ltvISM4.csv")), + str(TESTV_DIR.joinpath("ltv48_OMASA_4ISM_2TC.met")), + ], +} """ Input formats """ INPUT_FORMATS_AMBI = ["FOA", "HOA2", "HOA3"] diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py index b5758d6f06..de5e9929c9 100644 --- a/tests/renderer/test_renderer.py +++ b/tests/renderer/test_renderer.py @@ -42,7 +42,6 @@ from .constants import ( HR_TRAJECTORY_DIR, INPUT_FORMATS_MC, INPUT_FORMATS_ISM, - FORMAT_TO_METADATA_FILES, INPUT_FORMATS_MASA, METADATA_SCENES_TO_TEST_MASA_PREREND, TEST_VECTOR_DIR, @@ -383,7 +382,6 @@ def test_ism( test_info, in_fmt, out_fmt, - in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt], binary_suffix=EXE_SUFFIX, frame_size=frame_size, get_mld=get_mld, @@ -411,18 +409,12 @@ def test_ism_binaural_static( get_odg, get_odg_bin, ): - try: - in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt] - except KeyError: - in_meta_files = None - run_renderer( record_property, props_to_record, test_info, in_fmt, out_fmt, - in_meta_files=in_meta_files, binary_suffix=EXE_SUFFIX, frame_size=frame_size, get_mld=get_mld, @@ -452,11 +444,6 @@ def test_ism_binaural_headrotation( get_odg, get_odg_bin, ): - try: - in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt] - except KeyError: - in_meta_files = None - run_renderer( record_property, props_to_record, @@ -464,7 +451,6 @@ def test_ism_binaural_headrotation( in_fmt, out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), - in_meta_files=in_meta_files, binary_suffix=EXE_SUFFIX, frame_size=frame_size, get_mld=get_mld, @@ -501,7 +487,6 @@ def test_masa( test_info, in_fmt, out_fmt, - in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt], binary_suffix=EXE_SUFFIX, frame_size=frame_size, get_mld=get_mld, @@ -538,7 +523,6 @@ def test_masa_binaural_static( test_info, in_fmt, out_fmt, - in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt], binary_suffix=EXE_SUFFIX, frame_size=frame_size, get_mld=get_mld, @@ -578,7 +562,6 @@ def test_masa_binaural_headrotation( in_fmt, out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), - in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt], binary_suffix=EXE_SUFFIX, frame_size=frame_size, get_mld=get_mld, @@ -1206,11 +1189,6 @@ def test_ism_binaural_headrotation_refvec_rotating( if test_info.config.option.create_ref or test_info.config.option.create_cut: pytest.skip("OTR tests only run for smoke test") - try: - in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt] - except KeyError: - in_meta_files = None - compare_renderer_args( record_property, props_to_record, @@ -1222,7 +1200,6 @@ def test_ism_binaural_headrotation_refvec_rotating( "trj_file": HR_TRAJECTORY_DIR.joinpath( "full-circle-with-up-and-down-4s.csv" ), - "in_meta_files": in_meta_files, "frame_size": "5", }, cut_kwargs={ diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py index 13b03edc0b..14e6984967 100644 --- a/tests/renderer/utils.py +++ b/tests/renderer/utils.py @@ -52,6 +52,8 @@ from .constants import ( OUTPUT_PATH_CUT, FORMAT_TO_FILE_COMPARETEST, FORMAT_TO_FILE_LTV, + FORMAT_TO_METADATA_FILES, + FORMAT_TO_METADATA_FILES_LTV, FORMAT_TO_FILE_SMOKETEST, RENDERER_CMD, BIN_SUFFIX_MERGETARGET, @@ -237,12 +239,18 @@ def run_renderer( if test_info.config.option.use_ltv: if test_info.config.option.ltv_dir: format_to_file = dict() + format_to_metadata_files = dict() for k, v in FORMAT_TO_FILE_LTV.items(): format_to_file[k] = str(v).replace( str(LTV_DIR), str(test_info.config.option.ltv_dir) ) + for k, v in FORMAT_TO_METADATA_FILES_LTV.items(): + format_to_file[k] = str(v).replace( + str(LTV_DIR), str(test_info.config.option.ltv_dir) + ) else: format_to_file = FORMAT_TO_FILE_LTV + format_to_metadata_files = FORMAT_TO_METADATA_FILES_LTV if in_file is None: if metadata_input is not None: @@ -255,6 +263,9 @@ def run_renderer( in_file = format_to_file[in_fmt] in_name = in_fmt + if in_meta_files is None and in_fmt in format_to_metadata_files: + in_meta_files = format_to_metadata_files[in_fmt] + if out_file is None: out_file_stem = f"{in_name}_to_{out_name}{trj_name}{non_diegetic_pan}{refrot_name}{refvec_name}{refveclev_name}{config_name}{framing_name}{hrtf_file_name}{name_extension}{aeid_name}.wav" out_file = str(output_path_base.joinpath(out_file_stem)) -- GitLab From dc1d9733d52cac5326d6e6f1c2f18ad65c12014c Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Thu, 17 Apr 2025 17:41:05 +0200 Subject: [PATCH 2/4] Fix in STV renderer tests --- tests/renderer/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py index 14e6984967..3e5f5ea193 100644 --- a/tests/renderer/utils.py +++ b/tests/renderer/utils.py @@ -236,6 +236,8 @@ def run_renderer( else: format_to_file = FORMAT_TO_FILE_SMOKETEST + format_to_metadata_files = FORMAT_TO_METADATA_FILES + if test_info.config.option.use_ltv: if test_info.config.option.ltv_dir: format_to_file = dict() -- GitLab From 793b7a9ecd9867881aa765a7e4dc818bfbb7d3dc Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Thu, 17 Apr 2025 18:04:34 +0200 Subject: [PATCH 3/4] Fix in renderer tests --- tests/renderer/test_renderer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py index de5e9929c9..aa12863a7b 100644 --- a/tests/renderer/test_renderer.py +++ b/tests/renderer/test_renderer.py @@ -1207,7 +1207,6 @@ def test_ism_binaural_headrotation_refvec_rotating( "refvec_file": HR_TRAJECTORY_DIR.joinpath( "full-circle-with-up-and-down-4s-ccw-Vector3.csv" ), - "in_meta_files": in_meta_files, "frame_size": "5", }, ) -- GitLab From be88d6fdb9b1b879c3681062a15bffdf6db3bf6e Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Fri, 18 Apr 2025 10:58:04 +0200 Subject: [PATCH 4/4] Fix LTV_DIR constant for metadata files in different location --- tests/renderer/constants.py | 88 ++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/tests/renderer/constants.py b/tests/renderer/constants.py index 43c8797d4a..17260d91dd 100644 --- a/tests/renderer/constants.py +++ b/tests/renderer/constants.py @@ -299,73 +299,73 @@ FORMAT_TO_METADATA_FILES = { } FORMAT_TO_METADATA_FILES_LTV = { - "ISM1": [str(TESTV_DIR.joinpath("ltvISM1.csv"))], + "ISM1": [str(LTV_DIR.joinpath("ltvISM1.csv"))], "ISM2": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltvISM2.csv")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltvISM2.csv")), ], "ISM3": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltvISM2.csv")), - str(TESTV_DIR.joinpath("ltvISM3.csv")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltvISM2.csv")), + str(LTV_DIR.joinpath("ltvISM3.csv")), ], "ISM4": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltvISM2.csv")), - str(TESTV_DIR.joinpath("ltvISM3.csv")), - str(TESTV_DIR.joinpath("ltvISM4.csv")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltvISM2.csv")), + str(LTV_DIR.joinpath("ltvISM3.csv")), + str(LTV_DIR.joinpath("ltvISM4.csv")), ], "NDP_ISM4": [ # Should not be needed, because it is included in all ISM metadata files. - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltvISM2.csv")), - str(TESTV_DIR.joinpath("ltvISM3.csv")), - str(TESTV_DIR.joinpath("ltvISM4.csv")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltvISM2.csv")), + str(LTV_DIR.joinpath("ltvISM3.csv")), + str(LTV_DIR.joinpath("ltvISM4.csv")), ], - "MASA1": [str(TESTV_DIR.joinpath("ltv48_MASA1TC.met"))], - "MASA2": [str(TESTV_DIR.joinpath("ltv48_MASA2TC.met"))], + "MASA1": [str(LTV_DIR.joinpath("ltv48_MASA1TC.met"))], + "MASA2": [str(LTV_DIR.joinpath("ltv48_MASA2TC.met"))], "OMASA_1_1": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltv48_OMASA_1ISM_1TC.met")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltv48_OMASA_1ISM_1TC.met")), ], "OMASA_1_2": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltvISM2.csv")), - str(TESTV_DIR.joinpath("ltv48_OMASA_2ISM_1TC.met ")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltvISM2.csv")), + str(LTV_DIR.joinpath("ltv48_OMASA_2ISM_1TC.met ")), ], "OMASA_1_3": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltvISM2.csv")), - str(TESTV_DIR.joinpath("ltvISM3.csv")), - str(TESTV_DIR.joinpath("ltv48_OMASA_3ISM_1TC.met")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltvISM2.csv")), + str(LTV_DIR.joinpath("ltvISM3.csv")), + str(LTV_DIR.joinpath("ltv48_OMASA_3ISM_1TC.met")), ], "OMASA_1_4": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltvISM2.csv")), - str(TESTV_DIR.joinpath("ltvISM3.csv")), - str(TESTV_DIR.joinpath("ltvISM4.csv")), - str(TESTV_DIR.joinpath("ltv48_OMASA_4ISM_1TC.met")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltvISM2.csv")), + str(LTV_DIR.joinpath("ltvISM3.csv")), + str(LTV_DIR.joinpath("ltvISM4.csv")), + str(LTV_DIR.joinpath("ltv48_OMASA_4ISM_1TC.met")), ], "OMASA_2_1": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltv48_OMASA_1ISM_2TC.met")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltv48_OMASA_1ISM_2TC.met")), ], "OMASA_2_2": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltvISM2.csv")), - str(TESTV_DIR.joinpath("ltv48_OMASA_2ISM_2TC.met")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltvISM2.csv")), + str(LTV_DIR.joinpath("ltv48_OMASA_2ISM_2TC.met")), ], "OMASA_2_3": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltvISM2.csv")), - str(TESTV_DIR.joinpath("ltvISM3.csv")), - str(TESTV_DIR.joinpath("ltv48_OMASA_3ISM_2TC.met")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltvISM2.csv")), + str(LTV_DIR.joinpath("ltvISM3.csv")), + str(LTV_DIR.joinpath("ltv48_OMASA_3ISM_2TC.met")), ], "OMASA_2_4": [ - str(TESTV_DIR.joinpath("ltvISM1.csv")), - str(TESTV_DIR.joinpath("ltvISM2.csv")), - str(TESTV_DIR.joinpath("ltvISM3.csv")), - str(TESTV_DIR.joinpath("ltvISM4.csv")), - str(TESTV_DIR.joinpath("ltv48_OMASA_4ISM_2TC.met")), + str(LTV_DIR.joinpath("ltvISM1.csv")), + str(LTV_DIR.joinpath("ltvISM2.csv")), + str(LTV_DIR.joinpath("ltvISM3.csv")), + str(LTV_DIR.joinpath("ltvISM4.csv")), + str(LTV_DIR.joinpath("ltv48_OMASA_4ISM_2TC.met")), ], } -- GitLab