Commit 30ade678 authored by Ke Zhao's avatar Ke Zhao
Browse files

Add back MASA external mode tests, and enable MASA BINAURAL_SPLIT_PCM test

parent c58578d7

tests/split_rendering/test_split_rendering.py

+21 −1
Original line number Diff line number Diff line
@@ -216,6 +216,24 @@ def test_masa_full_chain_split(test_info, in_fmt, bitrate, render_config, trajec 
    )





@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)

@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MASA)

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

def test_masa_external_split(test_info, in_fmt, render_config, trajectory):

    check_xfail(test_info, in_fmt, render_config)



    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")



    run_external_split_rendering(

        in_fmt=in_fmt,

        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        output_path_base=OUTPUT_PATH_CUT,

    )





""" PLC """
@@ -246,9 +264,10 @@ full_chain_split_pcm_params = [ 
    ("HOA3", "96000", "split_renderer_config_1dof_512k_default"),

    ("7_1_4", "512000", "split_renderer_config_3dofhq_512k_lc3plus"),

    ("ISM4", "384000", "split_renderer_config_2dof_768k_default"),

    # ("MASA2", "256000", "split_renderer_config_3dof_384k_lcld"),

    ("MASA2", "256000", "split_renderer_config_3dof_384k_lcld"),

]





@pytest.mark.parametrize("in_fmt,bitrate,render_config", full_chain_split_pcm_params)

def test_full_chain_split_pcm(test_info, in_fmt, bitrate, render_config):

    check_xfail(test_info, in_fmt, render_config, bitrate)
@@ -274,6 +293,7 @@ external_split_pcm_params = [ 
    ("ISM1", "split_renderer_config_3dof_384k_lcld"),

]





@pytest.mark.parametrize("in_fmt,render_config", external_split_pcm_params)

def test_external_split_pcm(test_info, in_fmt, render_config):

    check_xfail(test_info, in_fmt, render_config)

tests/split_rendering/test_split_rendering_be_comparison.py

+20 −0
Original line number Diff line number Diff line
@@ -185,6 +185,24 @@ def test_masa_full_chain_split(test_info, in_fmt, bitrate, render_config, trajec 
    )





@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)

@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MASA)

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

def test_masa_external_split(test_info, in_fmt, render_config, trajectory):

    check_xfail(test_info, in_fmt, render_config)



    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")



    compare_external_split_args(

        test_info,

        in_fmt=in_fmt,

        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

    )





""" OSBA """
@@ -241,6 +259,7 @@ full_chain_split_pcm_params = [ 
    # ("MASA2", "256000", "split_renderer_config_3dof_384k_lcld"),

]





@pytest.mark.parametrize("in_fmt,bitrate,render_config", full_chain_split_pcm_params)

def test_full_chain_split_pcm(test_info, in_fmt, bitrate, render_config):

    check_xfail(test_info, in_fmt, render_config, bitrate)
@@ -266,6 +285,7 @@ external_split_pcm_params = [ 
    ("ISM1", "split_renderer_config_3dof_384k_lcld"),

]





@pytest.mark.parametrize("in_fmt,render_config", external_split_pcm_params)

def test_external_split_pcm(test_info, in_fmt, render_config):

    check_xfail(test_info, in_fmt, render_config)