Commit a1f3babf authored by Jan Kiene's avatar Jan Kiene
Browse files

fix planar parametrization for exhaustive set

parent e0c5c6e8
Loading
Loading
Loading
Loading
+13 −14
Original line number Diff line number Diff line
@@ -500,23 +500,21 @@ ISM_PARAMS_REDUCED = list()

# dtx only allowed at low bitrates, PCA only at FOA 256kbps
SBA_LOW_BITRATES_PARAMS = list(
    (
    product(
        INPUT_FORMATS_SCENE_BASED,
        BITRATES_ALL[:7],
        [DTX_OFF, DTX_ON],
        [SBA_FOA_PCA_OFF],
        )
        [SBA_IS_NONPLANAR, SBA_IS_PLANAR],
    )
)
SBA_HIGH_BITRATES_PARAMS = list(
    (
    product(
        INPUT_FORMATS_SCENE_BASED,
        BITRATES_ALL[7:],
        [DTX_OFF],
        [SBA_FOA_PCA_OFF],
        )
        [SBA_IS_NONPLANAR, SBA_IS_PLANAR],
    )
)
SBA_FOA_PCA_PARAMS = list(
@@ -525,6 +523,7 @@ SBA_FOA_PCA_PARAMS = list(
        [256000],
        [DTX_OFF],
        [SBA_FOA_PCA_ON],
        [SBA_IS_NONPLANAR, SBA_IS_PLANAR],
    )
)
SBA_PARAMS = SBA_LOW_BITRATES_PARAMS + SBA_HIGH_BITRATES_PARAMS + SBA_FOA_PCA_PARAMS
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ def pytest_generate_tests(metafunc):
    reduction_level = metafunc.config.getoption("reduction_level")

    if reduction_level == "exhaustive":
        param_string = "input_format,bitrate,dtx,pca"
        param_string = "input_format,bitrate,dtx,pca,planar"
        param_string_fs_mb = "sampling_rate,max_band"
        fs_mb_params = get_valid_fs_max_band_pairs()
        metafunc.parametrize(param_string_fs_mb, fs_mb_params)