Merge remote-tracking branch 'remotes/origin/main' into Revision_of_common_api_types (c40ccaf3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

tests/renderer/constants.py

+45 −46

Original line number	Diff line number	Diff line
		@@ -299,77 +299,76 @@ 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": [
		str(TESTV_DIR.joinpath("ltvISM1.csv")),
		str(TESTV_DIR.joinpath("stvISM2_non-diegetic-pan.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(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")),
		],
		}


		""" Input formats """
		INPUT_FORMATS_AMBI = ["FOA", "HOA2", "HOA3"]
		INPUT_FORMATS_MC = ["MONO", "STEREO", "5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]

tests/renderer/test_renderer.py

+1 −56

Original line number	Diff line number	Diff line
		@@ -43,7 +43,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,
		@@ -386,18 +385,12 @@ def test_ism(
		get_odg_bin,
		split_comparison,
		):
		md_files = (
		FORMAT_TO_METADATA_FILES_LTV[in_fmt]
		if test_info.config.option.use_ltv
		else FORMAT_TO_METADATA_FILES[in_fmt]
		)
		run_renderer(
		record_property,
		props_to_record,
		test_info,
		in_fmt,
		out_fmt,
		in_meta_files=md_files,
		binary_suffix=EXE_SUFFIX,
		frame_size=frame_size,
		get_mld=get_mld,
		@@ -426,14 +419,6 @@ def test_ism_binaural_static(
		get_odg_bin,
		split_comparison,
		):
		try:
		in_meta_files = (
		FORMAT_TO_METADATA_FILES_LTV[in_fmt]
		if test_info.config.option.use_ltv
		else FORMAT_TO_METADATA_FILES[in_fmt]
		)
		except KeyError:
		in_meta_files = None

		run_renderer(
		record_property,
		@@ -441,7 +426,6 @@ def test_ism_binaural_static(
		test_info,
		in_fmt,
		out_fmt,
		in_meta_files=in_meta_files,
		binary_suffix=EXE_SUFFIX,
		frame_size=frame_size,
		get_mld=get_mld,
		@@ -472,14 +456,6 @@ def test_ism_binaural_headrotation(
		get_odg_bin,
		split_comparison,
		):
		try:
		in_meta_files = (
		FORMAT_TO_METADATA_FILES_LTV[in_fmt]
		if test_info.config.option.use_ltv
		else FORMAT_TO_METADATA_FILES[in_fmt]
		)
		except KeyError:
		in_meta_files = None

		run_renderer(
		record_property,
		@@ -488,7 +464,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,
		@@ -520,11 +495,6 @@ def test_masa(
		get_odg_bin,
		split_comparison,
		):
		md_files = (
		FORMAT_TO_METADATA_FILES_LTV[in_fmt]
		if test_info.config.option.use_ltv
		else FORMAT_TO_METADATA_FILES[in_fmt]
		)

		run_renderer(
		record_property,
		@@ -532,7 +502,6 @@ def test_masa(
		test_info,
		in_fmt,
		out_fmt,
		in_meta_files=md_files,
		binary_suffix=EXE_SUFFIX,
		frame_size=frame_size,
		get_mld=get_mld,
		@@ -564,18 +533,12 @@ def test_masa_binaural_static(
		if out_fmt in ["BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]:
		pytest.skip("Skipping binaural room outputs for MASA as unimplemented.")

		md_files = (
		FORMAT_TO_METADATA_FILES_LTV[in_fmt]
		if test_info.config.option.use_ltv
		else FORMAT_TO_METADATA_FILES[in_fmt]
		)
		run_renderer(
		record_property,
		props_to_record,
		test_info,
		in_fmt,
		out_fmt,
		in_meta_files=md_files,
		binary_suffix=EXE_SUFFIX,
		frame_size=frame_size,
		get_mld=get_mld,
		@@ -609,12 +572,6 @@ def test_masa_binaural_headrotation(
		if out_fmt in ["BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]:
		pytest.skip("Skipping binaural room outputs for MASA as unimplemented.")

		md_files = (
		FORMAT_TO_METADATA_FILES_LTV[in_fmt]
		if test_info.config.option.use_ltv
		else FORMAT_TO_METADATA_FILES[in_fmt]
		)

		run_renderer(
		record_property,
		props_to_record,
		@@ -622,7 +579,6 @@ def test_masa_binaural_headrotation(
		in_fmt,
		out_fmt,
		trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
		in_meta_files=md_files,
		binary_suffix=EXE_SUFFIX,
		frame_size=frame_size,
		get_mld=get_mld,
		@@ -1300,15 +1256,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_LTV[in_fmt]
		if test_info.config.option.use_ltv
		else FORMAT_TO_METADATA_FILES[in_fmt]
		)
		except KeyError:
		in_meta_files = None

		compare_renderer_args(
		record_property,
		props_to_record,
		@@ -1320,7 +1267,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={
		@@ -1328,7 +1274,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",
		},
		split_comparison=split_comparison,

tests/renderer/utils.py

+13 −0

Original line number	Diff line number	Diff line
		@@ -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,
		@@ -236,15 +238,23 @@ 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()
		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:
		@@ -257,6 +267,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))