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

first reduced sba set

parent 8eed2cfb

tests/codec_be_to_accepted_release/constants.py

+30 −1
Original line number Diff line number Diff line
@@ -171,6 +171,9 @@ ISM_MD_NULL = "MDnull" 
SBA_FOA_PCA_ON = "PCAon"

SBA_FOA_PCA_OFF = "PCAoff"



SBA_IS_PLANAR = "Planar"

SBA_IS_NONPLANAR = "NonPlanar"



TESTVECTOR_FOR_INPUT_FORMAT = {

    "STEREO": "ltv{fs}_STEREO.wav",

    "MC_5_1": "ltv{fs}_MC51.wav",
@@ -525,7 +528,33 @@ SBA_FOA_PCA_PARAMS = list( 
    )

)

SBA_PARAMS = SBA_LOW_BITRATES_PARAMS + SBA_HIGH_BITRATES_PARAMS + SBA_FOA_PCA_PARAMS

SBA_PARAMS_REDUCED = list()

SBA_PARAMS_REDUCED = [

    [13200, 16, 'WB', SBA_IS_NONPLANAR, 'FOA', DTX_ON, SBA_FOA_PCA_OFF],

    [16400, 32, 'SWB', SBA_IS_PLANAR, 'HOA3', DTX_ON, SBA_FOA_PCA_OFF],

    [24400, 32, 'WB', SBA_IS_NONPLANAR, 'HOA2', DTX_ON, SBA_FOA_PCA_OFF],

    [32000, 48, 'FB', SBA_IS_PLANAR, 'HOA2', DTX_ON, SBA_FOA_PCA_OFF],



    [48000, 32, 'SWB', SBA_IS_PLANAR, 'FOA', DTX_ON, SBA_FOA_PCA_OFF],

    [64000, 16, 'WB', SBA_IS_NONPLANAR, 'HOA2', DTX_ON, SBA_FOA_PCA_OFF],

    [80000, 48, 'FB', SBA_IS_NONPLANAR, 'HOA3', DTX_ON, SBA_FOA_PCA_OFF],



    [96000, 48, 'FB', SBA_IS_PLANAR, 'HOA2', DTX_OFF, SBA_FOA_PCA_OFF],

    [128000, 16, 'WB', SBA_IS_NONPLANAR, 'FOA', DTX_OFF, SBA_FOA_PCA_OFF],

    [160000, 32, 'SWB', SBA_IS_NONPLANAR, 'HOA3', DTX_OFF, SBA_FOA_PCA_OFF],



    [256000, 32, 'WB', SBA_IS_NONPLANAR, 'FOA', DTX_OFF, SBA_FOA_PCA_ON],

    [256000, 48, 'SWB', SBA_IS_NONPLANAR, 'HOA3', DTX_OFF, SBA_FOA_PCA_OFF],

    [256000, 16, 'WB', SBA_IS_PLANAR, 'HOA2', DTX_OFF, SBA_FOA_PCA_OFF],



    [384000, 16, 'WB', SBA_IS_NONPLANAR, 'HOA3', DTX_OFF, SBA_FOA_PCA_OFF],

    [384000, 32, 'WB', SBA_IS_NONPLANAR, 'HOA2', DTX_OFF, SBA_FOA_PCA_OFF],

    [384000, 16, 'WB', SBA_IS_PLANAR, 'HOA2', DTX_OFF, SBA_FOA_PCA_OFF],

    [384000, 48, 'FB', SBA_IS_NONPLANAR, 'FOA', DTX_OFF, SBA_FOA_PCA_OFF],



    [512000, 16, 'WB', SBA_IS_PLANAR, 'HOA3', DTX_OFF, SBA_FOA_PCA_OFF],

    [512000, 32, 'SWB', SBA_IS_NONPLANAR, 'HOA2', DTX_OFF, SBA_FOA_PCA_OFF],

    [512000, 48, 'WB', SBA_IS_NONPLANAR, 'FOA', DTX_OFF, SBA_FOA_PCA_OFF],

]





# All EVS bitrates, 5900 VBR always needs -dtx

tests/codec_be_to_accepted_release/encoder/test_enc_const_br_sba.py

+8 −3
Original line number Diff line number Diff line
@@ -38,16 +38,17 @@ from .. import get_testv_path, get_valid_fs_max_band_pairs 




def pytest_generate_tests(metafunc):

    param_string = "input_format,bitrate,dtx,pca"

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



    if reduction_level == "exhaustive":

        param_string = "input_format,bitrate,dtx,pca"

        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, SBA_PARAMS)

    elif reduction_level == "reduced":

        raise NotImplementedError()

        param_string = "bitrate,sampling_rate,max_band,is_planar,input_format,dtx,pca"

        metafunc.parametrize(param_string, SBA_PARAMS_REDUCED)





def test_enc_const_br_sba(
@@ -57,14 +58,18 @@ def test_enc_const_br_sba( 
    max_band,

    dtx,

    pca,

    is_planar,

    dut_encoder_frontend,

    update_ref,

):

    # hacky for now, but maybe no need to do this cleanly

    if is_planar:

        input_format = f"Planar{input_format}"

    testv = get_testv_path(input_format, sampling_rate)

    options = get_options(input_format, max_band=max_band)

    bitstream_suffix = ""

    if pca == SBA_FOA_PCA_ON:

        options.extend(["-bypass", "2"])

        options.extend(["-pca"])

        bitstream_suffix += "-pca"

    run_check(

        input_format,