Commit 5bff4cd2 authored by Jan Kiene's avatar Jan Kiene
Browse files

use only pytest_generate_tests for encoder parametrization

parent 3ff95680
Loading
Loading
Loading
Loading
+22 −10
Original line number Diff line number Diff line
@@ -45,16 +45,35 @@ from . import get_options, run_check
from .. import get_testv_path, get_valid_fs_max_band_pairs


TEST_PARAMS = {
    "test_encoder_const_br_channel_based_and_masa_modes": (
        "input_format,bitrate,dtx",
        ENCODER_CHANNEL_BASED_AND_MASA_PARAMS,
    ),
    "test_encoder_const_br_object_based_modes": (
        "input_format,bitrate,dtx,md_type",
        ISM_PARAMS,
    ),
    "test_encoder_const_br_scenebased": ("input_format,bitrate,dtx,pca", SBA_PARAMS),
    "test_encoder_const_br_stereo_dmx_evs": ("bitrate,dtx", STEREO_DMX_EVS_PARAMS),
    "test_encoder_const_br_combined_formats": (
        "input_format_ism,input_format_other,bitrate,md_type",
        COMBINED_FORMATS_PARAMS,
    ),
}


def pytest_generate_tests(metafunc):
    # NOTE: this excludes narrow-band modes for stereo_dmx_evs as those are not really IVAS but EVS and implementation is complicated...
    fs_mb_params = get_valid_fs_max_band_pairs()
    metafunc.parametrize("sampling_rate,max_band", fs_mb_params)

    func_name = metafunc.function.__name__
    param_string, params = TEST_PARAMS[func_name]
    metafunc.parametrize(param_string, params)


# channel-based modes + MASA
@pytest.mark.parametrize(
    "input_format,bitrate,dtx", ENCODER_CHANNEL_BASED_AND_MASA_PARAMS
)
def test_encoder_const_br_channel_based_and_masa_modes(
    input_format,
    bitrate,
@@ -78,7 +97,6 @@ def test_encoder_const_br_channel_based_and_masa_modes(
    )


@pytest.mark.parametrize("input_format,bitrate,dtx,md_type", ISM_PARAMS)
def test_encoder_const_br_object_based_modes(
    input_format,
    bitrate,
@@ -109,7 +127,6 @@ def test_encoder_const_br_object_based_modes(
    )


@pytest.mark.parametrize("input_format,bitrate,dtx,pca", SBA_PARAMS)
def test_encoder_const_br_scenebased(
    input_format,
    bitrate,
@@ -139,7 +156,6 @@ def test_encoder_const_br_scenebased(
    )


@pytest.mark.parametrize("bitrate,dtx", STEREO_DMX_EVS_PARAMS)
def test_encoder_const_br_stereo_dmx_evs(
    bitrate, sampling_rate, max_band, dtx, dut_encoder_frontend, update_ref
):
@@ -158,10 +174,6 @@ def test_encoder_const_br_stereo_dmx_evs(
    )


@pytest.mark.parametrize(
    "input_format_ism,input_format_other,bitrate,md_type",
    COMBINED_FORMATS_PARAMS,
)
def test_encoder_const_br_combined_formats(
    input_format_ism,
    input_format_other,