Commit b2efcf15 authored by sagnowski's avatar sagnowski
Browse files

Do not vary frame size in non-framing tests

parent a27bf04c

tests/split_rendering/test_split_rendering.py

+12 −36
Original line number Diff line number Diff line
@@ -42,9 +42,8 @@ from tests.split_rendering.utils import * 
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_AMBI)

@pytest.mark.parametrize("bitrate", IVAS_BITRATES_AMBI)

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

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

def test_ambisonics_full_chain_split(

    test_info, in_fmt, bitrate, render_config, trajectory, pre_rend_fr

    test_info, in_fmt, bitrate, render_config, trajectory

):

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -56,15 +55,13 @@ def test_ambisonics_full_chain_split( 
        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        pre_rend_fr=pre_rend_fr,

    )





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

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

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

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

def test_ambisonics_external_split(test_info, in_fmt, render_config, trajectory, pre_rend_fr):

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

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -74,7 +71,6 @@ def test_ambisonics_external_split(test_info, in_fmt, render_config, trajectory, 
        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        pre_rend_fr=pre_rend_fr,

    )
@@ -85,9 +81,8 @@ def test_ambisonics_external_split(test_info, in_fmt, render_config, trajectory, 
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MC)

@pytest.mark.parametrize("bitrate", IVAS_BITRATES_MC)

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

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

def test_multichannel_full_chain_split(

    test_info, in_fmt, bitrate, render_config, trajectory, pre_rend_fr

    test_info, in_fmt, bitrate, render_config, trajectory

):

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -99,15 +94,13 @@ def test_multichannel_full_chain_split( 
        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        pre_rend_fr=pre_rend_fr,

    )





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

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

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

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

def test_multichannel_external_split(test_info, in_fmt, render_config, trajectory, pre_rend_fr):

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

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -117,7 +110,6 @@ def test_multichannel_external_split(test_info, in_fmt, render_config, trajector 
        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        pre_rend_fr=pre_rend_fr,

    )
@@ -128,8 +120,7 @@ def test_multichannel_external_split(test_info, in_fmt, render_config, trajector 
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_ISM)

@pytest.mark.parametrize("bitrate", IVAS_BITRATES_ISM)

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

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

def test_ism_full_chain_split(test_info, in_fmt, bitrate, render_config, trajectory, pre_rend_fr):

def test_ism_full_chain_split(test_info, in_fmt, bitrate, render_config, trajectory):

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -140,15 +131,13 @@ def test_ism_full_chain_split(test_info, in_fmt, bitrate, render_config, traject 
        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        pre_rend_fr=pre_rend_fr,

    )





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

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

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

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

def test_ism_external_split(test_info, in_fmt, render_config, trajectory, pre_rend_fr):

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

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -158,7 +147,6 @@ def test_ism_external_split(test_info, in_fmt, render_config, trajectory, pre_re 
        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        pre_rend_fr=pre_rend_fr,

    )
@@ -169,8 +157,7 @@ def test_ism_external_split(test_info, in_fmt, render_config, trajectory, pre_re 
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MASA)

@pytest.mark.parametrize("bitrate", IVAS_BITRATES_MASA)

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

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

def test_masa_full_chain_split(test_info, in_fmt, bitrate, render_config, trajectory, pre_rend_fr):

def test_masa_full_chain_split(test_info, in_fmt, bitrate, render_config, trajectory):

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -181,15 +168,13 @@ def test_masa_full_chain_split(test_info, in_fmt, bitrate, render_config, trajec 
        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        pre_rend_fr=pre_rend_fr,

    )





@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)

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

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

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

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -199,7 +184,6 @@ def test_masa_external_split(test_info, in_fmt, render_config, trajectory, pre_r 
        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        pre_rend_fr=pre_rend_fr,

    )
@@ -231,8 +215,7 @@ def test_omasa_full_chain_split(test_info, in_fmt, bitrate, render_config, traje 
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_OSBA)

@pytest.mark.parametrize("bitrate", IVAS_BITRATES_OSBA)

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

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

def test_osba_full_chain_split(test_info, in_fmt, bitrate, render_config, trajectory, pre_rend_fr):

def test_osba_full_chain_split(test_info, in_fmt, bitrate, render_config, trajectory):

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -243,7 +226,6 @@ def test_osba_full_chain_split(test_info, in_fmt, bitrate, render_config, trajec 
        render_config=RENDER_CFG_DIR.joinpath(f"{render_config}.txt"),

        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        pre_rend_fr=pre_rend_fr,

    )
@@ -254,8 +236,7 @@ def test_osba_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_PLC)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI_SPLIT_REND[-1:])

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

def test_post_rend_plc(test_info, in_fmt, render_config, trajectory, error_pattern, pre_rend_fr):

def test_post_rend_plc(test_info, in_fmt, render_config, trajectory, error_pattern):

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -266,7 +247,6 @@ def test_post_rend_plc(test_info, in_fmt, render_config, trajectory, error_patte 
        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        plc_error_pattern=ERROR_PATTERNS_DIR.joinpath(f"{error_pattern}.ep"),

        pre_rend_fr=pre_rend_fr,

    )
@@ -283,8 +263,7 @@ full_chain_split_pcm_params = [ 




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

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

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

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

    trajectory = SPLIT_REND_HR_TRAJECTORIES_TO_TEST[0]

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -297,7 +276,6 @@ def test_full_chain_split_pcm(test_info, in_fmt, bitrate, render_config, pre_ren 
        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        renderer_fmt="BINAURAL_SPLIT_PCM",

        pre_rend_fr=pre_rend_fr,

    )
@@ -309,8 +287,7 @@ external_split_pcm_params = [ 




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

@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)

def test_external_split_pcm(test_info, in_fmt, render_config, pre_rend_fr):

def test_external_split_pcm(test_info, in_fmt, render_config):

    trajectory = SPLIT_REND_HR_TRAJECTORIES_TO_TEST[0]

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

    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -322,7 +299,6 @@ def test_external_split_pcm(test_info, in_fmt, render_config, pre_rend_fr): 
        pre_trajectory=pre_trajectory,

        post_trajectory=post_trajectory,

        renderer_fmt="BINAURAL_SPLIT_PCM",

        pre_rend_fr=pre_rend_fr,

    )



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