Commit defd2836 authored by BOHMRR's avatar BOHMRR
Browse files

adjusted test vectors for SBA system tests

parent 46859eea

scripts/ivas_pytests/self_test_b.py

+3 −3
Original line number Diff line number Diff line
@@ -202,10 +202,10 @@ def main(argv): 
        my_env["TESTVECTOR_PATH_REL_GROUPB"] = "testv/"

        my_env["TESTVECTOR_PATH_REL_TRUNK"] = "/scripts/ivas_pytests/testv/"  # leading "/" is important

        my_env["CREND_UNIT_TEST_BIN"] = CREND_UNITTEST_REF

        print("pytest command line to be executed from trunk folder:")

        print("pytest command line to be executed from project root folder:")

        print(" ".join(base_cmd + ["-m", "create_ref", "-n", args.numprocesses]))

        subprocess.run(base_cmd + ["-m", "create_ref", "-n", args.numprocesses], check=False, env=my_env)

        print("pytest command line to be executed from trunk folder:")

        print("pytest command line to be executed from project root folder:")

        print(" ".join(base_cmd + ["-m", "create_ref_serial"]))

        subprocess.run(base_cmd + ["-m", "create_ref_serial"], check=False, env=my_env)
@@ -234,7 +234,7 @@ def main(argv): 
        decdut_path,

    ]

    # print pytest commandline

    print("pytest command line to be executed from trunk folder:")

    print("pytest command line to be executed from project root folder:")

    print(" ".join(cmd))

    result = subprocess.run(cmd, check=False)

    return result.returncode

scripts/ivas_pytests/tests/system_tests/test_spar_foa_bs_dec.py

+4 −4
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ from cmp_custom import cmp_custom 
from conftest import DecoderFrontend



#params

tag_list = ['stv_FOA', 'WYZX_Talker_Moving_15s_22s']

tag_list_bw_force = ['stv_FOA']

tag_list = ['stvFOA']

tag_list_bw_force = ['stvFOA']

dtx_set = ['0', '1']

dict_fsample_bw = {'48':'3', '32':'2', '16':'1'}

dict_bw_idx = {'FB':'3', 'SWB':'2', 'WB':'1'}
@@ -82,7 +82,7 @@ def test_spar_foa_dec_system( 
    tag,

    fs

):

    tag = tag + '_' + fs + 'k'

    tag = tag + fs + 'c'

    bw = "FB"



    #dec
@@ -105,7 +105,7 @@ def test_spar_foa_dec_BWforce_system( 


    fs = sample_rate_bw_idx[0]

    bw = sample_rate_bw_idx[1]

    tag = tag + '_' + fs + 'k'

    tag = tag + fs + 'c'



    #dec

    spar_foa_dec(dut_decoder_frontend, reference_path, dut_base_path, tag, ch_count_foa, fs, ivas_br, dtx, bw)

scripts/ivas_pytests/tests/system_tests/test_spar_foa_bs_dec_plc.py

+11 −8
Original line number Diff line number Diff line
@@ -41,13 +41,16 @@ from cmp_custom import cmp_custom 
from conftest import EncoderFrontend, DecoderFrontend



#params

tag_list = ['stv_FOA', 'WYZX_Talker_Moving_7_12s']

tag_list = ['stvFOA']

plc_patterns = ['PLperc12mblen5', 'PLperc40mblen50', 'PLperc42mblen2']

dtx_set = ['0', '1']

ivas_br_list = ['32000', '64000', '96000', '256000']

sampling_rate_list = ['48', '32', '16']



agc_tag_list = ['stv_FOA_24dB']

# we need signals amplified by 24dB - until those are available, use existing 'stvFOA'

agc_tag_list = ['stvFOA']

# TODO: create and use new 24dB signals

# agc_tag_list = ['stvFOA_24dB_']



ch_count_foa = 4

AbsTol = '3'
@@ -82,7 +85,7 @@ def test_spar_foa_plc_system( 
    plc_pattern,

    fs

):

    tag = tag + '_' + fs + 'k'

    tag = tag + fs + 'c'

    agc = 0



    if update_ref == 1 and plc_pattern == plc_patterns[0] and ref_encoder_path:
@@ -113,7 +116,7 @@ def test_spar_foa_agc_plc_system( 
    plc_pattern,

    fs

):

    tag = tag + '_' + fs + 'k'

    tag = tag + fs + 'c'

    agc = 1



    if update_ref == 1 and plc_pattern == plc_patterns[0] and ref_encoder_path:
@@ -128,7 +131,7 @@ def test_spar_foa_agc_plc_system( 
############ test function ##############################

def spar_foa_ref_enc(

    ref_encoder_path,

    data_system_tests_path,

    test_vector_path,

    reference_path,

    tag,

    sampling_rate,
@@ -145,7 +148,7 @@ def spar_foa_ref_enc( 
    if agc == 1:

        tag_out += '_AGC1'



    input_path = f"{data_system_tests_path}/spar_foa_bs/enc/in/{tag}/in.raw"

    input_path = f"{test_vector_path}/{tag}.pcm"



    ref_pkt_file = f"{ref_out_dir}/{tag_out}.pkt"
@@ -167,7 +170,7 @@ def spar_foa_ref_enc( 


def spar_foa_dec_plc(

    decoder_frontend,

    data_system_tests_path,

    test_vector_path,

    reference_path,

    dut_base_path,

    ref_decoder_path,
@@ -194,7 +197,7 @@ def spar_foa_dec_plc( 
    check_and_makedir(dut_out_dir)

    check_and_makedir(ref_out_dir)



    plc_file = f"{data_system_tests_path}/spar_foa_bs/dec/plc_file/{plc_pattern}.g192"

    plc_file = f"{test_vector_path}/{plc_pattern}.g192"

    ref_in_pkt = f"{reference_path}/spar_foa_bs/pkt/{tag_out}.pkt"



    if ref_decoder_path:

scripts/ivas_pytests/tests/system_tests/test_spar_foa_bs_enc.py

+22 −16
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ from conftest import EncoderFrontend, DecoderFrontend 
# disable SPAR HOA tests until SPAR_HOA macro is enabled

SPAR_HOA_TEST = 1

#params

tag_list = ['stv_FOA', 'WYZX_Talker_Moving_15s_22s']

tag_list_HOA2 = ['stv_HOA2']

tag_list_HOA3 = ['stv_HOA3']

tag_list = ['stvFOA']

tag_list_HOA2 = ['test_HOA2_v3']

tag_list_HOA3 = ['test_HOA3_v3']



tag_list_bw_force = ['stv_FOA']

tag_list_bw_force = ['stvFOA']

dtx_set = ['0', '1']

dict_fsample_bw = {'48':'3', '32':'2', '16':'1'}

dict_bw_idx = {'FB':'3', 'SWB':'2', 'WB':'1'}
@@ -64,7 +64,10 @@ ivas_br_HOA3 = ['256000', '384000', '512000'] 
sample_rate_list = ['48', '32', '16']

bypass_list = [1, 2]



agc_tag_list = ['stv_FOA_24dB']

# we need signals amplified by 24dB - until those are available, use existing 'stvFOA'

agc_tag_list = ['stvFOA']

# TODO: create and use new 24dB signals

# agc_tag_list = ['stvFOA_24dB_']

agc_list = [-1, 0, 1]



sample_rate_bw_idx_list = [('48', 'SWB'), ('48', 'WB'), ('32', 'WB')]
@@ -102,7 +105,7 @@ def test_bypass_enc( 
    if update_ref == 1 and bypass == 1:

        pytest.skip()



    tag = tag + '_' + fs + 'k'

    tag = tag + fs + 'c'

    ivas_br = '256000'

    dtx = '0'

    max_bw = "FB"
@@ -174,7 +177,7 @@ def test_spar_foa_enc_system( 
    if update_ref == 1 and agc >= 0:

        pytest.skip()



    tag = tag + '_' + fs + 'k'

    tag = tag + fs + 'c'

    max_bw = "FB"

    bypass = -1

    use_agc_ref = 0
@@ -242,7 +245,7 @@ def test_spar_hoa2_enc_system( 
    dtx = '0'

    agc = -1



    tag = tag + '_' + fs + 'k'

#    tag = tag + '_' + fs + 'k'

    max_bw = "FB"

    bypass = -1

    use_agc_ref = 0
@@ -265,7 +268,8 @@ def test_spar_hoa2_enc_system( 
        agc,

        use_agc_ref,

        sba_order,

        update_ref

        update_ref,

        '.wav'

    )



    # dec
@@ -310,7 +314,7 @@ def test_spar_hoa3_enc_system( 
    dtx = '0'

    agc = -1



    tag = tag + '_' + fs + 'k'

#    tag = tag + '_' + fs + 'k'

    max_bw = "FB"

    bypass = -1

    use_agc_ref = 0
@@ -333,7 +337,8 @@ def test_spar_hoa3_enc_system( 
        agc,

        use_agc_ref,

        sba_order,

        update_ref

        update_ref,

        '.wav'

    )



    # dec
@@ -376,7 +381,7 @@ def test_spar_foa_enc_BWforce_system( 
):

    fs = sample_rate_bw_idx[0]

    bw = sample_rate_bw_idx[1]

    tag = tag + '_' + fs + 'k'

    tag = tag + fs + 'c'

    bypass = -1

    agc = 0

    use_agc_ref = 0
@@ -441,7 +446,7 @@ def test_spar_foa_enc_agc_system( 
    tag,

    fs

):

    tag = tag + '_' + fs + 'k'

    tag = tag + fs + 'c'

    max_bw = "FB"

    bypass = -1

    agc = 1
@@ -492,7 +497,7 @@ def test_spar_foa_enc_agc_system( 
############ test function ##############################

def spar_foa_enc(

    encoder_frontend,

    data_system_tests_path,

    test_vector_path,

    ref_encoder_path,

    reference_path,

    dut_base_path,
@@ -505,7 +510,8 @@ def spar_foa_enc( 
    agc,

    use_agc_ref,

    sba_order,

    update_ref

    update_ref,

    in_extension = '.pcm'

):



    #########  run cmd   #####################################
@@ -534,7 +540,7 @@ def spar_foa_enc( 
    dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.pkt"

    ref_pkt_file = f"{ref_out_dir}/{tag_out}{short_tag_ext}.pkt"



    input_path = f"{data_system_tests_path}/spar_foa_bs/enc/in/{tag_in}/in.raw"

    input_path = f"{test_vector_path}/{tag_in}{in_extension}"

    agc_op = agc if agc >= 0 else None

    bypass_mode = bypass if bypass >= 0 else None

    dtx_mode = dtx == '1'