Commit 1f721b18 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

cleanup renderer tests, and try to use long testvectors for MR BE comparison

parent 05ae79c8
Loading
Loading
Loading
Loading
Loading
+25 −8
Original line number Diff line number Diff line
@@ -104,16 +104,33 @@ FORMAT_TO_FILE = {
    "MASA2": TESTV_DIR.joinpath("stv_IVASMASA_2dir2TC.pcm"),
    "META": TEST_VECTOR_DIR.joinpath("mixed_scene.txt"),
    "16ch_8+4+4": NCHAN_TO_FILE[16],
    "4d0": NCHAN_TO_FILE[4],
    "4d4": NCHAN_TO_FILE[8],
    "cicp1": NCHAN_TO_FILE[1],
    "cicp20": NCHAN_TO_FILE[15],
    "cicp2": NCHAN_TO_FILE[2],
    "custom1": NCHAN_TO_FILE[11],
    "itu_4+5+1": NCHAN_TO_FILE[11],
    "t_design_4": NCHAN_TO_FILE[12],
}

FORMAT_TO_FILE_LTV = {
    "MONO": TESTV_DIR.joinpath("test_mono.wav"),
    "STEREO": TESTV_DIR.joinpath("test_stereo.wav"),
    "5_1": TESTV_DIR.joinpath("test_MC51.wav"),
    "7_1": TESTV_DIR.joinpath("test_MC71.wav"),
    "5_1_2": TESTV_DIR.joinpath("test_MC51p2.wav"),
    "5_1_4": TESTV_DIR.joinpath("test_MC51p4.wav"),
    "7_1_4": TESTV_DIR.joinpath("test_MC71p4.wav"),
    "FOA": TESTV_DIR.joinpath("test_FOA.wav"),
    "HOA2": TESTV_DIR.joinpath("test_HOA2.wav"),
    "HOA3": TESTV_DIR.joinpath("test_HOA3.wav"),
    "ISM1": TESTV_DIR.joinpath("test_ISM_1obj.wav"),
    "ISM2": TESTV_DIR.joinpath("test_ISM_2obj.wav"),
    "ISM3": TESTV_DIR.joinpath("test_ISM_3obj.wav"),
    "ISM4": TESTV_DIR.joinpath("test_ISM_4obj.wav"),
    "MASA1": TESTV_DIR.joinpath("stv_IVASMASA_1dir1TC.pcm"),
    "MASA2": TESTV_DIR.joinpath("stv_IVASMASA_2dir2TC.pcm"),
    "META": TEST_VECTOR_DIR.joinpath("mixed_scene.txt"),
    "16ch_8+4+4": TESTV_DIR.joinpath("test_HOA3.wav"),
    "4d4": TESTV_DIR.joinpath("test_MC71.wav"),
    "t_design_4": TESTV_DIR.joinpath("test_MC71p4.wav"),
}

FORMAT_TO_METADATA_FILES = {
    "ISM1": [str(TESTV_DIR.joinpath("stvISM1.csv"))],
    "ISM2": [
@@ -162,7 +179,6 @@ OUTPUT_FORMATS = [
CUSTOM_LS_TO_TEST = [
    "t_design_4",
    "4d4",
    "itu_4+5+1",
    "16ch_8+4+4",
]

@@ -178,7 +194,8 @@ HR_TRAJECTORIES_TO_TEST = [
]

""" Per-testcase xfail SNR thresholds (dB) """
pass_snr = {
pass_snr = dict() # not relevant for tests anymore, should be deprecated soon
_pass_snr = {
    ####################################################################
    #
    # External Renderer vs Standalone and pyaudio3dtools renderers tests
+0 −3
Original line number Diff line number Diff line
@@ -151,9 +151,6 @@ def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file):
@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS[2:])
@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA)
def test_masa(test_info, in_fmt, out_fmt):
    # # TODO: implement MASA in Python, compare BE
    # compare_renderer_vs_pyscripts( test_info, in_fmt, out_fmt, in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt]
    # )
    run_renderer(in_fmt, out_fmt, in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt])


+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@
import pytest
from .utils import *

# override to use long test vectors for this test
FORMAT_TO_FILE = FORMAT_TO_FILE_LTV

""" Ambisonics """