Separate renderer and split renderer trajectories to test, and update trajectory used in README.md (11b5940b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

tests/renderer/constants.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -200,7 +200,8 @@ METADATA_SCENES_TO_TEST_NO_BE = ["masa_scene"]
		""" Binaural rendering """
		OUTPUT_FORMATS_BINAURAL = ["BINAURAL", "BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]
		HR_TRAJECTORIES_TO_TEST = [
		"rotate_euler_quaternion_5s",
		"full_circle_in_15s",
		"rotate_yaw_pitch_roll1",
		]

		""" Per-testcase xfail SNR thresholds (dB) """

tests/split_rendering/README.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ Commands executed for a test can be found from the corresponding test output.
		```bash
		IVAS_cod -sba 3 512000 48 tests/renderer/data/spectral_test_16ch_48kHz.wav ivas.192

		IVAS_dec -T scripts/trajectories/rotate_yaw_pitch_roll1_delayed.csv -render_config tests/split_rendering/renderer_configs/split_renderer_config_3dof_768k_default.txt BINAURAL_SPLIT_CODED 48 ivas.192 split.bit
		IVAS_dec -T scripts/trajectories/rotate_euler_quaternion_5s_delayed.csv -render_config tests/split_rendering/renderer_configs/split_renderer_config_3dof_768k_default.txt BINAURAL_SPLIT_CODED 48 ivas.192 split.bit

		IVAS_rend -fs 48 -i split.bit -if BINAURAL_SPLIT_CODED -o tests/split_rendering/cut/HOA3_512000bps_rotate_yaw_pitch_roll1_delayed_split_full_rotate_yaw_pitch_roll1__config_split_renderer_config_3dof_768k_default.wav -of BINAURAL -tf scripts/trajectories/rotate_yaw_pitch_roll1.csv
		IVAS_rend -fs 48 -i split.bit -if BINAURAL_SPLIT_CODED -o tests/split_rendering/cut/HOA3_512000bps_rotate_euler_quaternion_5s_delayed_split_full_rotate_euler_quaternion_5s__config_split_renderer_config_3dof_768k_default.wav -of BINAURAL -tf scripts/trajectories/rotate_euler_quaternion_5s.csv
		```

tests/split_rendering/constants.py

+5 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ from tests.renderer.constants import (
		FORMAT_TO_FILE_COMPARETEST,
		FORMAT_TO_FILE_SMOKETEST,
		FORMAT_TO_METADATA_FILES,
		HR_TRAJECTORIES_TO_TEST,
		INPUT_FORMATS_AMBI,
		INPUT_FORMATS_ISM,
		INPUT_FORMATS_MASA,
		@@ -89,6 +88,11 @@ RENDERER_CONFIGS_TO_TEST_MASA = (
		)
		RENDERER_CONFIGS_TO_TEST_PLC = RENDERER_CONFIGS_FASTCONV_RENDERER

		""" Trajectories """
		SPLIT_REND_HR_TRAJECTORIES_TO_TEST = [
		"rotate_euler_quaternion_5s",
		]

		""" IVAS specific constants """
		FORMAT_TO_IVAS_COD_FORMAT = {
		"MONO": "",

tests/split_rendering/test_split_rendering.py

+8 −8

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ def check_xfail(test_info, in_fmt, render_config, bitrate=None):
		""" Ambisonics """


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_AMBI)
		@pytest.mark.parametrize("bitrate", IVAS_BITRATES_AMBI)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
		@@ -87,7 +87,7 @@ def test_ambisonics_full_chain_split(
		)


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_AMBI)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
		def test_ambisonics_external_split(test_info, in_fmt, render_config, trajectory):
		@@ -108,7 +108,7 @@ def test_ambisonics_external_split(test_info, in_fmt, render_config, trajectory)
		""" Multichannel """


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MC)
		@pytest.mark.parametrize("bitrate", IVAS_BITRATES_MC)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC[2:])
		@@ -130,7 +130,7 @@ def test_multichannel_full_chain_split(
		)


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MC)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC[2:])
		def test_multichannel_external_split(test_info, in_fmt, render_config, trajectory):
		@@ -151,7 +151,7 @@ def test_multichannel_external_split(test_info, in_fmt, render_config, trajector
		""" ISM """


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_ISM)
		@pytest.mark.parametrize("bitrate", IVAS_BITRATES_ISM)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)
		@@ -171,7 +171,7 @@ def test_ism_full_chain_split(test_info, in_fmt, bitrate, render_config, traject
		)


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_ISM)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)
		def test_ism_external_split(test_info, in_fmt, render_config, trajectory):
		@@ -192,7 +192,7 @@ def test_ism_external_split(test_info, in_fmt, render_config, trajectory):
		""" MASA """


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MASA)
		@pytest.mark.parametrize("bitrate", IVAS_BITRATES_MASA)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA)
		@@ -216,7 +216,7 @@ def test_masa_full_chain_split(test_info, in_fmt, bitrate, render_config, trajec


		@pytest.mark.parametrize("error_pattern", PLC_ERROR_PATTERNS)
		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_PLC)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI[-1:])
		def test_post_rend_plc(test_info, in_fmt, render_config, trajectory, error_pattern):

tests/split_rendering/test_split_rendering_be_comparison.py

+8 −8

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ from tests.split_rendering.utils import *
		""" Ambisonics """


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_AMBI)
		@pytest.mark.parametrize("bitrate", IVAS_BITRATES_AMBI)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
		@@ -60,7 +60,7 @@ def test_ambisonics_full_chain_split(
		)


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_AMBI)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
		def test_ambisonics_external_split(test_info, in_fmt, render_config, trajectory):
		@@ -81,7 +81,7 @@ def test_ambisonics_external_split(test_info, in_fmt, render_config, trajectory)
		""" Multichannel """


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MC)
		@pytest.mark.parametrize("bitrate", IVAS_BITRATES_MC)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC[2:])
		@@ -103,7 +103,7 @@ def test_multichannel_full_chain_split(
		)


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MC)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC[2:])
		def test_multichannel_external_split(test_info, in_fmt, render_config, trajectory):
		@@ -124,7 +124,7 @@ def test_multichannel_external_split(test_info, in_fmt, render_config, trajector
		""" ISM """


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_ISM)
		@pytest.mark.parametrize("bitrate", IVAS_BITRATES_ISM)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)
		@@ -144,7 +144,7 @@ def test_ism_full_chain_split(test_info, in_fmt, bitrate, render_config, traject
		)


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_ISM)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)
		def test_ism_external_split(test_info, in_fmt, render_config, trajectory):
		@@ -165,7 +165,7 @@ def test_ism_external_split(test_info, in_fmt, render_config, trajectory):
		""" MASA """


		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MASA)
		@pytest.mark.parametrize("bitrate", IVAS_BITRATES_MASA)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA)
		@@ -189,7 +189,7 @@ def test_masa_full_chain_split(test_info, in_fmt, bitrate, render_config, trajec


		@pytest.mark.parametrize("error_pattern", PLC_ERROR_PATTERNS)
		@pytest.mark.parametrize("trajectory", HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
		@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_PLC)
		@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI[-1:])
		def test_post_rend_plc(test_info, in_fmt, render_config, trajectory, error_pattern):