From edd8d5cbbca0ca1a85c657fdf9361e2706d1981d Mon Sep 17 00:00:00 2001 From: Lauros Pajunen Date: Mon, 12 Jun 2023 10:22:43 +0300 Subject: [PATCH] Add masa ext renderer BE tests --- tests/renderer/test_renderer.py | 14 +------------- tests/renderer/test_renderer_be_comparison.py | 9 ++++++++- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py index 38b7bbf9e7..0db27448d1 100644 --- a/tests/renderer/test_renderer.py +++ b/tests/renderer/test_renderer.py @@ -365,24 +365,12 @@ def test_ism_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt): """ MASA """ -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS[2:]) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA) def test_masa(test_info, in_fmt, out_fmt): run_renderer(in_fmt, out_fmt, in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt]) -# MASA inputs not supported yet -# @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) -# @pytest.mark.parametrize("in_fmt", METADATA_SCENES_TO_TEST_NO_BE) -# def test_metadata_masa(test_info, in_fmt, out_fmt): -# # TODO: unify with test_metadata once Python supports MASA -# cut, cut_fs = run_renderer( -# "META", -# out_fmt, -# metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}.txt"), -# ) - - """ Custom loudspeaker layouts """ diff --git a/tests/renderer/test_renderer_be_comparison.py b/tests/renderer/test_renderer_be_comparison.py index 460ded4250..ee6d79ba3e 100644 --- a/tests/renderer/test_renderer_be_comparison.py +++ b/tests/renderer/test_renderer_be_comparison.py @@ -137,7 +137,14 @@ def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): """ MASA """ -# TODO: MASA inputs not supported yet + +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA) +def test_masa(test_info, in_fmt, out_fmt): + compare_renderer_vs_mergetarget( + test_info, in_fmt, out_fmt, in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt] + ) + """ Custom loudspeaker layouts """ -- GitLab