Commit 1ec16ded authored by Jan Kiene's avatar Jan Kiene
Browse files

run formatter

parent cf66ab0c

tests/codec_be_to_accepted_release/constants.py

+32 −37
Original line number Diff line number Diff line
@@ -529,31 +529,26 @@ SBA_FOA_PCA_PARAMS = list( 
)

SBA_PARAMS = SBA_LOW_BITRATES_PARAMS + SBA_HIGH_BITRATES_PARAMS + SBA_FOA_PCA_PARAMS

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],

    [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],

]
@@ -562,18 +557,18 @@ STEREO_DMX_EVS_PARAMS = list(product(BITRATES_EVS[1:], [DTX_OFF, DTX_ON])) + lis 
    product(BITRATES_EVS[:1], [DTX_ON])

)

STEREO_DMX_EVS_PARAMS_REDUCED = [

    [5900, 16, "NB", 'DTXon'],

    [7200, 16, "WB", 'DTXon'],

    [8000, 16, "NB", 'DTXon'],

    [9600, 16, "WB", 'DTXon'],

    [13200, 32, "NB", 'DTXon'],

    [16400, 48, "NB", 'DTXon'],

    [24400, 16, "WB", 'DTXon'],

    [32000, 32, "WB", 'DTXon'],

    [48000, 48, "SWB", 'DTXon'],

    [64000, 48, "FB", 'DTXon'],

    [96000, 32, "SWB", 'DTXon'],

    [128000, 48, "WB", 'DTXon'],

    [5900, 16, "NB", "DTXon"],

    [7200, 16, "WB", "DTXon"],

    [8000, 16, "NB", "DTXon"],

    [9600, 16, "WB", "DTXon"],

    [13200, 32, "NB", "DTXon"],

    [16400, 48, "NB", "DTXon"],

    [24400, 16, "WB", "DTXon"],

    [32000, 32, "WB", "DTXon"],

    [48000, 48, "SWB", "DTXon"],

    [64000, 48, "FB", "DTXon"],

    [96000, 32, "SWB", "DTXon"],

    [128000, 48, "WB", "DTXon"],

]

tests/codec_be_to_accepted_release/decoder/test_dec_const_br_stereo.py

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



    if reduction_level == "exhaustive":

        param_string = "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)

tests/codec_be_to_accepted_release/encoder/test_enc_const_br_evsdmx.py

+1 −3
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ accordance with the laws of the Federal Republic of Germany excluding its confli 
the United Nations Convention on Contracts on the International Sales of Goods.

"""



from ..constants import (

    STEREO_DMX_EVS_PARAMS, STEREO_DMX_EVS_PARAMS_REDUCED

)

from ..constants import STEREO_DMX_EVS_PARAMS, STEREO_DMX_EVS_PARAMS_REDUCED

from . import get_options, run_check

from .. import get_testv_path, get_valid_fs_max_band_pairs