Commit 335a466d authored by Ke Zhao's avatar Ke Zhao
Browse files

Reduce the number of split rendering tests

parent e4b6d048

tests/split_rendering/constants.py

+5 −4
Original line number Diff line number Diff line
@@ -53,10 +53,6 @@ from tests.renderer.constants import ( 
    FORMAT_TO_FILE_COMPARETEST,

    FORMAT_TO_FILE_SMOKETEST,

    FORMAT_TO_METADATA_FILES,

    INPUT_FORMATS_AMBI,

    INPUT_FORMATS_ISM,

    INPUT_FORMATS_MASA,

    INPUT_FORMATS_MC,

    METADATA_SCENES_TO_TEST,

)
@@ -132,6 +128,11 @@ FORMAT_TO_NCHAN = { 
    "MASA2": 2,

}



INPUT_FORMATS_AMBI_SPLIT_REND = ["FOA", "HOA3"]

INPUT_FORMATS_MC_SPLIT_REND = ["5_1", "7_1_4"]

INPUT_FORMATS_ISM_SPLIT_REND = ["ISM4"]

INPUT_FORMATS_MASA_SPLIT_REND = ["MASA2"]



IVAS_BITRATES_AMBI = ["80000", "512000"]

IVAS_BITRATES_MC = ["128000", "160000", "384000"]

IVAS_BITRATES_ISM = ["128000"]

tests/split_rendering/test_split_rendering.py

+11 −11
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ def check_xfail(test_info, in_fmt, render_config, bitrate=None): 
        and "0dof" in render_config

        and (

            "lc3plus" in render_config

            or (in_fmt in INPUT_FORMATS_ISM or in_fmt in INPUT_FORMATS_MC)

            or (in_fmt in INPUT_FORMATS_ISM_SPLIT_REND or in_fmt in INPUT_FORMATS_MC_SPLIT_REND)

            or (

                "external_split" in test_info.node.name and in_fmt in INPUT_FORMATS_AMBI

                "external_split" in test_info.node.name and in_fmt in INPUT_FORMATS_AMBI_SPLIT_REND

            )  # CREND for external renderer ambisonics rendering uses LC3plus by default

        )

    ):
@@ -56,7 +56,7 @@ def check_xfail(test_info, in_fmt, render_config, bitrate=None): 


    if (

        bitrate

        and (in_fmt in INPUT_FORMATS_ISM)

        and (in_fmt in INPUT_FORMATS_ISM_SPLIT_REND)

        and (int(bitrate) > int(IVAS_MAX_ISM_BITRATE[in_fmt[-1]]))

    ):

        pytest.skip(f"Unsupported configuration with {in_fmt} at {bitrate}bps")
@@ -68,7 +68,7 @@ def check_xfail(test_info, in_fmt, render_config, bitrate=None): 
@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)

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

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

def test_ambisonics_full_chain_split(

    test_info, in_fmt, bitrate, render_config, trajectory

):
@@ -89,7 +89,7 @@ def test_ambisonics_full_chain_split( 


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

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

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

    check_xfail(test_info, in_fmt, render_config)
@@ -111,7 +111,7 @@ def test_ambisonics_external_split(test_info, in_fmt, render_config, trajectory) 
@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)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC[2:])

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

def test_multichannel_full_chain_split(

    test_info, in_fmt, bitrate, render_config, trajectory

):
@@ -132,7 +132,7 @@ def test_multichannel_full_chain_split( 


@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[2:])

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

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

    check_xfail(test_info, in_fmt, render_config)
@@ -154,7 +154,7 @@ def test_multichannel_external_split(test_info, in_fmt, render_config, trajector 
@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)

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

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

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

    check_xfail(test_info, in_fmt, render_config, bitrate)
@@ -173,7 +173,7 @@ def test_ism_full_chain_split(test_info, in_fmt, bitrate, render_config, traject 


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

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

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

    check_xfail(test_info, in_fmt, render_config)
@@ -195,7 +195,7 @@ def test_ism_external_split(test_info, in_fmt, render_config, trajectory): 
@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)

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

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

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

    check_xfail(test_info, in_fmt, render_config, bitrate)
@@ -218,7 +218,7 @@ def test_masa_full_chain_split(test_info, in_fmt, bitrate, render_config, trajec 
@pytest.mark.parametrize("error_pattern", PLC_ERROR_PATTERNS)

@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[-1:])

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

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

    check_xfail(test_info, in_fmt, render_config)

tests/split_rendering/test_split_rendering_be_comparison.py

+8 −8
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ from tests.split_rendering.utils import * 
@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)

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

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

def test_ambisonics_full_chain_split(

    test_info, in_fmt, bitrate, render_config, trajectory

):
@@ -62,7 +62,7 @@ def test_ambisonics_full_chain_split( 


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

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

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

    check_xfail(test_info, in_fmt, render_config)
@@ -84,7 +84,7 @@ def test_ambisonics_external_split(test_info, in_fmt, render_config, trajectory) 
@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)

@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC[2:])

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

def test_multichannel_full_chain_split(

    test_info, in_fmt, bitrate, render_config, trajectory

):
@@ -105,7 +105,7 @@ def test_multichannel_full_chain_split( 


@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[2:])

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

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

    check_xfail(test_info, in_fmt, render_config)
@@ -127,7 +127,7 @@ def test_multichannel_external_split(test_info, in_fmt, render_config, trajector 
@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)

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

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

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

    check_xfail(test_info, in_fmt, render_config, bitrate)
@@ -146,7 +146,7 @@ def test_ism_full_chain_split(test_info, in_fmt, bitrate, render_config, traject 


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

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

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

    check_xfail(test_info, in_fmt, render_config)
@@ -168,7 +168,7 @@ def test_ism_external_split(test_info, in_fmt, render_config, trajectory): 
@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)

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

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

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

    check_xfail(test_info, in_fmt, render_config, bitrate)
@@ -191,7 +191,7 @@ def test_masa_full_chain_split(test_info, in_fmt, bitrate, render_config, trajec 
@pytest.mark.parametrize("error_pattern", PLC_ERROR_PATTERNS)

@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[-1:])

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

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

    check_xfail(test_info, in_fmt, render_config)