Commit 1b771d88 authored by sagnowski's avatar sagnowski
Browse files

Revert "[tmp] Remove new test cases in test_split_rendering.py"

This reverts commit 69eb1fe9.
parent 69eb1fe9
Loading
Loading
Loading
Loading
Loading
+25 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ from tests.split_rendering.utils import *
""" Ambisonics """


@pytest.mark.parametrize("delay_profile", DELAY_PROFILES)
@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_AMBI)
@pytest.mark.parametrize("bitrate", IVAS_BITRATES_AMBI)
@@ -54,6 +55,7 @@ def test_ambisonics_full_chain_split(
    bitrate,
    render_config,
    trajectory,
    delay_profile,
):
    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")
    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -73,6 +75,7 @@ def test_ambisonics_full_chain_split(
        get_ssnr=get_ssnr,
        get_odg=get_odg,
        get_odg_bin=get_odg_bin,
        delay_profile=SCRIPTS_DIR / "dly_error_profiles" / f"{delay_profile}.dat" if delay_profile else None,
    )


@@ -114,6 +117,7 @@ def test_ambisonics_external_split(
""" Multichannel """


@pytest.mark.parametrize("delay_profile", DELAY_PROFILES)
@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MC)
@pytest.mark.parametrize("bitrate", IVAS_BITRATES_MC)
@@ -131,6 +135,7 @@ def test_multichannel_full_chain_split(
    bitrate,
    render_config,
    trajectory,
    delay_profile,
):
    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")
    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -150,6 +155,7 @@ def test_multichannel_full_chain_split(
        get_ssnr=get_ssnr,
        get_odg=get_odg,
        get_odg_bin=get_odg_bin,
        delay_profile=SCRIPTS_DIR / "dly_error_profiles" / f"{delay_profile}.dat" if delay_profile else None,
    )


@@ -191,6 +197,7 @@ def test_multichannel_external_split(
""" ISM """


@pytest.mark.parametrize("delay_profile", DELAY_PROFILES)
@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_ISM)
@pytest.mark.parametrize("bitrate", IVAS_BITRATES_ISM)
@@ -208,6 +215,7 @@ def test_ism_full_chain_split(
    bitrate,
    render_config,
    trajectory,
    delay_profile,
):
    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")
    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -227,6 +235,7 @@ def test_ism_full_chain_split(
        get_ssnr=get_ssnr,
        get_odg=get_odg,
        get_odg_bin=get_odg_bin,
        delay_profile=SCRIPTS_DIR / "dly_error_profiles" / f"{delay_profile}.dat" if delay_profile else None,
    )


@@ -268,6 +277,7 @@ def test_ism_external_split(
""" MASA """


@pytest.mark.parametrize("delay_profile", DELAY_PROFILES)
@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_MASA)
@pytest.mark.parametrize("bitrate", IVAS_BITRATES_MASA)
@@ -285,6 +295,7 @@ def test_masa_full_chain_split(
    bitrate,
    render_config,
    trajectory,
    delay_profile,
):
    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")
    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -304,6 +315,7 @@ def test_masa_full_chain_split(
        get_ssnr=get_ssnr,
        get_odg=get_odg,
        get_odg_bin=get_odg_bin,
        delay_profile=SCRIPTS_DIR / "dly_error_profiles" / f"{delay_profile}.dat" if delay_profile else None,
    )


@@ -345,6 +357,7 @@ def test_masa_external_split(
""" OMASA """


# @pytest.mark.parametrize("delay_profile", DELAY_PROFILES) # Waiting for issue #1343 to be resolved
@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_OMASA)
@pytest.mark.parametrize("bitrate", IVAS_BITRATES_OMASA)
@@ -362,6 +375,7 @@ def test_omasa_full_chain_split(
    bitrate,
    render_config,
    trajectory,
    delay_profile=None,
):
    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")
    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -381,6 +395,7 @@ def test_omasa_full_chain_split(
        get_ssnr=get_ssnr,
        get_odg=get_odg,
        get_odg_bin=get_odg_bin,
        delay_profile=SCRIPTS_DIR / "dly_error_profiles" / f"{delay_profile}.dat" if delay_profile else None,
    )


@@ -422,6 +437,7 @@ def test_omasa_external_split(
""" OSBA """


# @pytest.mark.parametrize("delay_profile", DELAY_PROFILES) # Waiting for issue #1343 to be resolved
@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_TO_TEST_OSBA)
@pytest.mark.parametrize("bitrate", IVAS_BITRATES_OSBA)
@@ -439,6 +455,7 @@ def test_osba_full_chain_split(
    bitrate,
    render_config,
    trajectory,
    delay_profile=None,
):
    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")
    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -458,6 +475,7 @@ def test_osba_full_chain_split(
        get_ssnr=get_ssnr,
        get_odg=get_odg,
        get_odg_bin=get_odg_bin,
        delay_profile=SCRIPTS_DIR / "dly_error_profiles" / f"{delay_profile}.dat" if delay_profile else None,
    )


@@ -549,6 +567,7 @@ full_chain_split_pcm_params = [
]


@pytest.mark.parametrize("delay_profile", DELAY_PROFILES)
@pytest.mark.parametrize("in_fmt,bitrate,render_config", full_chain_split_pcm_params)
def test_full_chain_split_pcm(
    record_property,
@@ -562,6 +581,7 @@ def test_full_chain_split_pcm(
    in_fmt,
    bitrate,
    render_config,
    delay_profile,
):
    trajectory = SPLIT_REND_HR_TRAJECTORIES_TO_TEST[0]
    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")
@@ -583,6 +603,7 @@ def test_full_chain_split_pcm(
        get_ssnr=get_ssnr,
        get_odg=get_odg,
        get_odg_bin=get_odg_bin,
        delay_profile=SCRIPTS_DIR / "dly_error_profiles" / f"{delay_profile}.dat" if delay_profile else None,
    )


@@ -668,9 +689,10 @@ def test_framing_combinations_external_split(
    )


@pytest.mark.parametrize("delay_profile", DELAY_PROFILES)
@pytest.mark.parametrize("trajectory", SPLIT_REND_HR_TRAJECTORIES_TO_TEST)
@pytest.mark.parametrize("render_config", RENDERER_CONFIGS_FRAMING)
@pytest.mark.parametrize("in_fmt", ["5_1"])
@pytest.mark.parametrize("in_fmt", ["5_1", "FOA"])
@pytest.mark.parametrize("pre_rend_fr", SPLIT_RENDERER_PRE_FRAMINGS)
@pytest.mark.parametrize("post_rend_fr", SPLIT_RENDERER_POST_FRAMINGS)
def test_framing_combinations_full_chain_split(
@@ -687,6 +709,7 @@ def test_framing_combinations_full_chain_split(
    trajectory,
    post_rend_fr,
    pre_rend_fr,
    delay_profile,
):
    post_trajectory = HR_TRAJECTORY_DIR.joinpath(f"{trajectory}.csv")
    pre_trajectory = post_trajectory.with_stem(f"{post_trajectory.stem}_delayed")
@@ -708,4 +731,5 @@ def test_framing_combinations_full_chain_split(
        get_ssnr=get_ssnr,
        get_odg=get_odg,
        get_odg_bin=get_odg_bin,
        delay_profile=SCRIPTS_DIR / "dly_error_profiles" / f"{delay_profile}.dat" if delay_profile else None,
    )