Commit c76a512a authored by norvell's avatar norvell
Browse files

Fix for metadata files for test_renderer.py

parent db3a2561

tests/renderer/constants.py

+70 −0
Original line number Diff line number Diff line
@@ -298,6 +298,76 @@ FORMAT_TO_METADATA_FILES = { 
    ],

}



FORMAT_TO_METADATA_FILES_LTV = {

    "ISM1": [str(TESTV_DIR.joinpath("ltvISM1.csv"))],

    "ISM2": [

        str(TESTV_DIR.joinpath("ltvISM1.csv")),

        str(TESTV_DIR.joinpath("ltvISM2.csv")),

    ],

    "ISM3": [

        str(TESTV_DIR.joinpath("ltvISM1.csv")),

        str(TESTV_DIR.joinpath("ltvISM2.csv")),

        str(TESTV_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")),

    ],

    "NDP_ISM4": [ # Should not be needed, because it is included in all ISM metadata files.

        str(TESTV_DIR.joinpath("ltvISM1.csv")),

        str(TESTV_DIR.joinpath("ltvISM2.csv")),

        str(TESTV_DIR.joinpath("ltvISM3.csv")),

        str(TESTV_DIR.joinpath("ltvISM4.csv")),

    ],

    "MASA1": [str(TESTV_DIR.joinpath("ltv48_MASA1TC.met"))],

    "MASA2": [str(TESTV_DIR.joinpath("ltv48_MASA2TC.met"))],

    "OMASA_1_1": [

        str(TESTV_DIR.joinpath("ltvISM1.csv")),

        str(TESTV_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 ")),

    ],

    "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")),

    ],

    "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")),

    ],

    "OMASA_2_1": [

        str(TESTV_DIR.joinpath("ltvISM1.csv")),

        str(TESTV_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")),

    ],

    "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")),

    ],

    "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")),

    ],

}



""" Input formats """

INPUT_FORMATS_AMBI = ["FOA", "HOA2", "HOA3"]

tests/renderer/test_renderer.py

+0 −23
Original line number Diff line number Diff line
@@ -42,7 +42,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,
@@ -383,7 +382,6 @@ def test_ism( 
        test_info,

        in_fmt,

        out_fmt,

        in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],

        binary_suffix=EXE_SUFFIX,

        frame_size=frame_size,

        get_mld=get_mld,
@@ -411,18 +409,12 @@ def test_ism_binaural_static( 
    get_odg,

    get_odg_bin,

):

    try:

        in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]

    except KeyError:

        in_meta_files = None



    run_renderer(

        record_property,

        props_to_record,

        test_info,

        in_fmt,

        out_fmt,

        in_meta_files=in_meta_files,

        binary_suffix=EXE_SUFFIX,

        frame_size=frame_size,

        get_mld=get_mld,
@@ -452,11 +444,6 @@ def test_ism_binaural_headrotation( 
    get_odg,

    get_odg_bin,

):

    try:

        in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]

    except KeyError:

        in_meta_files = None



    run_renderer(

        record_property,

        props_to_record,
@@ -464,7 +451,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,
@@ -501,7 +487,6 @@ def test_masa( 
        test_info,

        in_fmt,

        out_fmt,

        in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],

        binary_suffix=EXE_SUFFIX,

        frame_size=frame_size,

        get_mld=get_mld,
@@ -538,7 +523,6 @@ def test_masa_binaural_static( 
        test_info,

        in_fmt,

        out_fmt,

        in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],

        binary_suffix=EXE_SUFFIX,

        frame_size=frame_size,

        get_mld=get_mld,
@@ -578,7 +562,6 @@ def test_masa_binaural_headrotation( 
        in_fmt,

        out_fmt,

        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),

        in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt],

        binary_suffix=EXE_SUFFIX,

        frame_size=frame_size,

        get_mld=get_mld,
@@ -1206,11 +1189,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[in_fmt]

    except KeyError:

        in_meta_files = None



    compare_renderer_args(

        record_property,

        props_to_record,
@@ -1222,7 +1200,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={

tests/renderer/utils.py

+11 −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,
@@ -237,12 +239,18 @@ def run_renderer( 
    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:
@@ -255,6 +263,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))