Commit 74f3cf68 authored by norvell's avatar norvell
Browse files

Fix in test_renderer.py. Smoke tests without MLD.

parent 7f4569ec

tests/renderer/test_renderer.py

+18 −9
Original line number Diff line number Diff line
@@ -449,12 +449,13 @@ def test_non_diegetic_pan_ism_static(record_property, test_info, in_fmt, out_fmt 
@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)

def test_ambisonics_binaural_headrotation_refrotzero(

    test_info, in_fmt, out_fmt, trj_file

    record_property, test_info, in_fmt, out_fmt, trj_file, get_mld, get_mld_lim

):

    if test_info.config.option.create_ref or test_info.config.option.create_cut:

        pytest.skip("OTR tests only run for smoke test")



    compare_renderer_args(

        record_property,    

        test_info,

        in_fmt,

        out_fmt,
@@ -476,11 +477,12 @@ def test_ambisonics_binaural_headrotation_refrotzero( 
# Note that reference rotation is supplied per 4 subframes; head rotation per subframe.

@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)

def test_ambisonics_binaural_headrotation_refrotequal(test_info, in_fmt, out_fmt):

def test_ambisonics_binaural_headrotation_refrotequal(record_property, test_info, in_fmt, out_fmt, get_mld, get_mld_lim):

    if test_info.config.option.create_ref or test_info.config.option.create_cut:

        pytest.skip("OTR tests only run for smoke test")



    compare_renderer_args(

        record_property,    

        test_info,

        in_fmt,

        out_fmt,
@@ -508,12 +510,13 @@ def test_ambisonics_binaural_headrotation_refrotequal(test_info, in_fmt, out_fmt 
@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)

def test_ambisonics_binaural_headrotation_refveczero(

    test_info, in_fmt, out_fmt, trj_file

    record_property, test_info, in_fmt, out_fmt, trj_file, get_mld, get_mld_lim

):

    if test_info.config.option.create_ref or test_info.config.option.create_cut:

        pytest.skip("OTR tests only run for smoke test")



    compare_renderer_args(

        record_property,    

        test_info,

        in_fmt,

        out_fmt,
@@ -536,7 +539,7 @@ def test_ambisonics_binaural_headrotation_refveczero( 
#        looking-direction of the head rotation and therefore compensates it (OTR=REF_VEC)

@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)

def test_ambisonics_binaural_headrotation_refvecequal(test_info, in_fmt, out_fmt):

def test_ambisonics_binaural_headrotation_refvecequal(record_property, test_info, in_fmt, out_fmt, get_mld, get_mld_lim):

    if test_info.config.option.create_ref or test_info.config.option.create_cut:

        pytest.skip("OTR tests only run for smoke test")
@@ -545,6 +548,7 @@ def test_ambisonics_binaural_headrotation_refvecequal(test_info, in_fmt, out_fmt 
        pytest.xfail("WIP : minor differences to be resolved")

    else:

        compare_renderer_args(

            record_property,        

            test_info,

            in_fmt,

            out_fmt,
@@ -570,7 +574,7 @@ def test_ambisonics_binaural_headrotation_refvecequal(test_info, in_fmt, out_fmt 
#        in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC)

@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)

def test_ambisonics_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt):

def test_ambisonics_binaural_headrotation_refvec_rotating(record_property, test_info, in_fmt, out_fmt, get_mld, get_mld_lim):

    if test_info.config.option.create_ref or test_info.config.option.create_cut:

        pytest.skip("OTR tests only run for smoke test")
@@ -579,6 +583,7 @@ def test_ambisonics_binaural_headrotation_refvec_rotating(test_info, in_fmt, out 
        pytest.xfail("WIP : minor differences to be resolved")

    else:

        compare_renderer_args(

            record_property,        

            test_info,

            in_fmt,

            out_fmt,
@@ -608,12 +613,13 @@ def test_ambisonics_binaural_headrotation_refvec_rotating(test_info, in_fmt, out 
@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)

def test_ambisonics_binaural_headrotation_refvec_rotating_fixed_pos_offset(

    test_info, in_fmt, out_fmt

    record_property, test_info, in_fmt, out_fmt, get_mld, get_mld_lim

):

    if test_info.config.option.create_ref or test_info.config.option.create_cut:

        pytest.skip("OTR tests only run for smoke test")



    compare_renderer_args(

        record_property,    

        test_info,

        in_fmt,

        out_fmt,
@@ -642,12 +648,13 @@ def test_ambisonics_binaural_headrotation_refvec_rotating_fixed_pos_offset( 
@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)

def test_ambisonics_binaural_headrotation_refveclev_vs_refvec(

    test_info, in_fmt, out_fmt

    record_property, test_info, in_fmt, out_fmt, get_mld, get_mld_lim

):

    if test_info.config.option.create_ref or test_info.config.option.create_cut:

        pytest.skip("OTR tests only run for smoke test")



    compare_renderer_args(

        record_property,    

        test_info,

        in_fmt,

        out_fmt,
@@ -673,7 +680,7 @@ def test_ambisonics_binaural_headrotation_refveclev_vs_refvec( 
#        in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC)

@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC)

def test_multichannel_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt):

def test_multichannel_binaural_headrotation_refvec_rotating(record_property, test_info, in_fmt, out_fmt, get_mld, get_mld_lim):

    if test_info.config.option.create_ref or test_info.config.option.create_cut:

        pytest.skip("OTR tests only run for smoke test")
@@ -681,6 +688,7 @@ def test_multichannel_binaural_headrotation_refvec_rotating(test_info, in_fmt, o 
        pytest.skip("MONO or STEREO to Binaural rendering unsupported")



    compare_renderer_args(

        record_property,

        test_info,

        in_fmt,

        out_fmt,
@@ -707,7 +715,7 @@ def test_multichannel_binaural_headrotation_refvec_rotating(test_info, in_fmt, o 
#        in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC)

@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)

def test_ism_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt):

def test_ism_binaural_headrotation_refvec_rotating(record_property, test_info, in_fmt, out_fmt, get_mld, get_mld_lim):

    if test_info.config.option.create_ref or test_info.config.option.create_cut:

        pytest.skip("OTR tests only run for smoke test")
@@ -717,6 +725,7 @@ def test_ism_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt): 
        in_meta_files = None



    compare_renderer_args(

        record_property, 

        test_info,

        in_fmt,

        out_fmt,

tests/renderer/utils.py

+3 −1
Original line number Diff line number Diff line
@@ -260,9 +260,10 @@ def run_renderer( 




def compare_renderer_args(

    test_info, in_fmt, out_fmt, ref_kwargs: Dict, cut_kwargs: Dict

    record_property, test_info, in_fmt, out_fmt, ref_kwargs: Dict, cut_kwargs: Dict

):

    out_file_ref = run_renderer(

        record_property, 

        test_info,

        in_fmt,

        out_fmt,
@@ -270,6 +271,7 @@ def compare_renderer_args( 
    )

    ref, ref_fs = readfile(out_file_ref)

    out_file_cut = run_renderer(

        record_property,     

        test_info,

        in_fmt,

        out_fmt,