Commit 312aab82 authored by Jan Kiene's avatar Jan Kiene
Browse files

add explicit reduced set of cases for stereo

parent 237c93f4

tests/codec_be_to_accepted_release/constants.py

+29 −13
Original line number Diff line number Diff line
@@ -339,10 +339,24 @@ OUTPUT_FORMATS_NON_BINAURAL = OUTPUT_FORMATS_ALL[:11] 


### -------------- encoder parameter lists --------------



STEREO_PARAMS = list(product(["STEREO"], BITRATES_STEREO, [DTX_OFF, DTX_ON]))

STEREO_PARAMS_REDUCED = list(

    product(["STEREO"], [13200, 32000, 48000, 96000, 256000], [DTX_ON])

)

STEREO_PARAMS_ENC = list(product(["STEREO"], BITRATES_STEREO, [DTX_OFF, DTX_ON]))

STEREO_PARAMS_ENC_REDUCED = [

    ["STEREO", 13200, "DTXon", 16, "WB"],

    ["STEREO", 32000, "DTXon", 32, "SWB"],

    ["STEREO", 48000, "DTXon", 48, "FB"],

    ["STEREO", 96000, "DTXon", 48, "SWB"],

    ["STEREO", 256000, "DTXon", 32, "WB"],

    ["STEREO", 160000, "DTXon", 16, "WB"],

    ["STEREO", 128000, "DTXon", 16, "WB"],

    ["STEREO", 64000, "DTXon", 16, "WB"],

    ["STEREO", 32000, "DTXon", 16, "WB"],

    ["STEREO", 16400, "DTXon", 48, "WB"],

    ["STEREO", 24400, "DTXon", 32, "SWB"],

    ["STEREO", 192000, "DTXon", 48, "SWB"],

    ["STEREO", 32000, "DTXon", 48, "FB"],

    ["STEREO", 48000, "DTXon", 32, "SWB"],

    ["STEREO", 80000, "DTXon", 32, "WB"],

]



MC_PARAMS = list(product(INPUT_FORMATS_MC, BITRATES_ALL))

MC_PARAMS_REDUCED = (
@@ -354,7 +368,6 @@ MC_PARAMS_REDUCED = ( 
)

MASA_PARAMS = list(product(INPUT_FORMATS_MASA, BITRATES_ALL, [DTX_OFF, DTX_ON]))

MASA_PARAMS_REDUCED = list()

ENCODER_CHANNEL_BASED_AND_MASA_PARAMS = STEREO_PARAMS + MC_PARAMS + MASA_PARAMS





# ISM modes with three "flavours" of metadata
@@ -506,15 +519,18 @@ BS_PROC_JBM_DLY_PROF_5 = "JBM_dlyprofile5" 
BITSTREAM_PROCESSING = [BS_PROC_NONE, BS_PROC_FER_15, BS_PROC_JBM_DLY_PROF_5]



# parameters for const bitrate test with non-binaural output

DECODER_CONST_BR_NO_BINAURAL_CHANNELBASED_AND_MASA = (

    collapse_into_list_of_pairs(

DECODER_STEREO_PARAMS = collapse_into_list_of_pairs(

    product(

            STEREO_PARAMS,

        STEREO_PARAMS_ENC,

        OUTPUT_FORMATS_ALL[:7],

        SAMPLING_RATES_ALL,

        BITSTREAM_PROCESSING,

    )

)

DECODER_STEREO_PARAMS_REDUCED = list()



DECODER_CONST_BR_NO_BINAURAL_CHANNELBASED_AND_MASA = (

    DECODER_STEREO_PARAMS

    + collapse_into_list_of_pairs(

        product(

            MC_PARAMS,

tests/codec_be_to_accepted_release/encoder/test_enc_const_br_stereo.py

+7 −8
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ the United Nations Convention on Contracts on the International Sales of Goods. 
"""



from ..constants import (

    STEREO_PARAMS,

    STEREO_PARAMS_REDUCED,

    STEREO_PARAMS_ENC,

    STEREO_PARAMS_ENC_REDUCED,

    SAMPLING_RATES_ALL,

    FS_2_MAXBAND,

)
@@ -40,18 +40,17 @@ from .. import get_testv_path, get_valid_fs_max_band_pairs 


def pytest_generate_tests(metafunc):

    param_string = "input_format,bitrate,dtx"

    param_string_fs_mb = "sampling_rate,max_band"

    reduction_level = metafunc.config.getoption("reduction_level")



    if reduction_level == "exhaustive":

        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)

        metafunc.parametrize(param_string, STEREO_PARAMS)

        metafunc.parametrize(param_string, STEREO_PARAMS_ENC)

    elif reduction_level == "reduced":

        sampling_rates = SAMPLING_RATES_ALL

        max_band = [FS_2_MAXBAND[fs] for fs in sampling_rates]

        metafunc.parametrize("sampling_rate,max_band", zip(sampling_rates, max_band))

        metafunc.parametrize(param_string, STEREO_PARAMS_REDUCED)

        metafunc.parametrize(

            ",".join((param_string, param_string_fs_mb)), STEREO_PARAMS_ENC_REDUCED

        )





def test_enc_const_br_stereo(