Commit 8eed2cfb authored by Jan Kiene's avatar Jan Kiene
Browse files

remove redundant input_format from parametere lists

parent 95af40bb

tests/codec_be_to_accepted_release/constants.py

+16 −16
Original line number Diff line number Diff line
@@ -341,23 +341,23 @@ OUTPUT_FORMATS_NON_BINAURAL = OUTPUT_FORMATS_ALL[:11] 


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



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

STEREO_PARAMS_ENC = list(product(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"],

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

]



MC_PARAMS_ENC = list(product(INPUT_FORMATS_MC, BITRATES_ALL))

tests/codec_be_to_accepted_release/decoder/test_dec_const_br_stereo.py

+3 −3
Original line number Diff line number Diff line
@@ -38,18 +38,17 @@ def pytest_generate_tests(metafunc): 
    reduction_level = metafunc.config.getoption("reduction_level")



    if reduction_level == "exhaustive":

        param_string = "input_format,bitrate,dtx,output_format,output_sampling_rate,bitstream_processing"

        param_string = "bitrate,dtx,output_format,output_sampling_rate,bitstream_processing"

        param_string_fs_mb = "input_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_DEC)

    elif reduction_level == "reduced":

        param_string = "input_format,bitrate,dtx,input_sampling_rate,max_band,output_format,output_sampling_rate,bitstream_processing"

        param_string = "bitrate,dtx,input_sampling_rate,max_band,output_format,output_sampling_rate,bitstream_processing"

        metafunc.parametrize(param_string, STEREO_PARAMS_DEC_REDUCED)





def test_dec_const_br_stereo(

    input_format,

    bitrate,

    input_sampling_rate,

    max_band,
@@ -60,6 +59,7 @@ def test_dec_const_br_stereo( 
    dut_decoder_frontend,

    update_ref,

):

    input_format = "STEREO"

    testv_name = get_testv_path(input_format, input_sampling_rate).stem

    with get_bitstream_and_options(

        testv_name,

tests/codec_be_to_accepted_release/encoder/test_enc_const_br_stereo.py

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ from .. import get_testv_path, get_valid_fs_max_band_pairs 




def pytest_generate_tests(metafunc):

    param_string = "input_format,bitrate,dtx"

    param_string = "bitrate,dtx"

    param_string_fs_mb = "sampling_rate,max_band"

    reduction_level = metafunc.config.getoption("reduction_level")
@@ -54,7 +54,6 @@ def pytest_generate_tests(metafunc): 




def test_enc_const_br_stereo(

    input_format,

    bitrate,

    sampling_rate,

    max_band,
@@ -62,6 +61,7 @@ def test_enc_const_br_stereo( 
    dut_encoder_frontend,

    update_ref,

):

    input_format = "STEREO"

    testv = get_testv_path(input_format, sampling_rate)

    options = get_options(input_format, max_band=max_band)

    run_check(