From 74c0664c6c1871e1be6db9e09be4e73ca230024e Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Wed, 21 Jun 2023 14:06:43 +0300 Subject: [PATCH 1/3] Add binaural outputs to renderer MASA tests --- tests/renderer/test_renderer_be_comparison.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/renderer/test_renderer_be_comparison.py b/tests/renderer/test_renderer_be_comparison.py index ee6d79ba3e..d3e0d5f89d 100644 --- a/tests/renderer/test_renderer_be_comparison.py +++ b/tests/renderer/test_renderer_be_comparison.py @@ -145,6 +145,24 @@ def test_masa(test_info, in_fmt, out_fmt): test_info, in_fmt, out_fmt, in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt] ) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA) +def test_masa_binaural_static(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] + ) + +@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA) +def test_masa_binaural_headrotation(test_info, in_fmt, out_fmt): + compare_renderer_vs_mergetarget( + test_info, + in_fmt, + out_fmt, + trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), + in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt] + ) """ Custom loudspeaker layouts """ -- GitLab From fd6f2fb3323e86210977dbaf5ba2ae30020ada6c Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Wed, 21 Jun 2023 15:39:48 +0300 Subject: [PATCH 2/3] Add missing argument to test function --- tests/renderer/test_renderer_be_comparison.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/renderer/test_renderer_be_comparison.py b/tests/renderer/test_renderer_be_comparison.py index d3e0d5f89d..c345858be8 100644 --- a/tests/renderer/test_renderer_be_comparison.py +++ b/tests/renderer/test_renderer_be_comparison.py @@ -155,7 +155,7 @@ def test_masa_binaural_static(test_info, in_fmt, out_fmt): @pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA) -def test_masa_binaural_headrotation(test_info, in_fmt, out_fmt): +def test_masa_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): compare_renderer_vs_mergetarget( test_info, in_fmt, -- GitLab From be66fa796dc819419bf17fd0cf79890d44597a2f Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Wed, 21 Jun 2023 16:03:32 +0300 Subject: [PATCH 3/3] Skip binaural room outputs for MASA renderer tests. --- tests/renderer/test_renderer_be_comparison.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/renderer/test_renderer_be_comparison.py b/tests/renderer/test_renderer_be_comparison.py index c345858be8..95a5859526 100644 --- a/tests/renderer/test_renderer_be_comparison.py +++ b/tests/renderer/test_renderer_be_comparison.py @@ -148,6 +148,10 @@ def test_masa(test_info, in_fmt, out_fmt): @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA) def test_masa_binaural_static(test_info, in_fmt, out_fmt): + + if out_fmt in ["BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]: + pytest.skip("Skipping binaural room outputs for MASA as unimplemented.") + compare_renderer_vs_mergetarget( test_info, in_fmt, out_fmt, in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt] ) @@ -156,6 +160,10 @@ def test_masa_binaural_static(test_info, in_fmt, out_fmt): @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA) def test_masa_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): + + if out_fmt in ["BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]: + pytest.skip("Skipping binaural room outputs for MASA as unimplemented.") + compare_renderer_vs_mergetarget( test_info, in_fmt, -- GitLab