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

next attempt to fix SBA tests...

parent 290762b7
Loading
Loading
Loading
Loading
Loading
+13 −20
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ ivas_br_HOA2 = ["256000", "384000", "512000"]
ivas_br_HOA3 = ["256000", "384000", "512000"]
SID_list = [0, 1]
sample_rate_list = ["48", "32", "16"]
pca_list = [False, True]
gain_list = [0, 1]

sample_rate_bw_idx_list = [("48", "SWB"), ("48", "WB"), ("32", "WB")]
@@ -89,7 +88,6 @@ def check_and_makedir(dir_path):
@pytest.mark.create_ref
@pytest.mark.parametrize("tag", tag_list)
@pytest.mark.parametrize("fs", sample_rate_list)
@pytest.mark.parametrize("pca", pca_list)
def test_pca_enc(
    dut_encoder_frontend: EncoderFrontend,
    dut_decoder_frontend: DecoderFrontend,
@@ -102,11 +100,8 @@ def test_pca_enc(
    keep_files,
    tag,
    fs,
    pca,
):
    if update_ref == 1 and not pca:
        pytest.skip()

    pca = True
    tag = tag + fs + "c"
    ivas_br = "256000"
    dtx = "0"
@@ -466,7 +461,7 @@ def sba_enc(
    cut_gain="1.0",
    create_dutenc=False,
    cut_testv=False,
    pca=None,
    pca=False,
):
    # ------------  run cmd  ------------
    dut_out_dir = f"{dut_base_path}/sba_bs/pkt"
@@ -487,17 +482,16 @@ def sba_enc(
    if ivas_br == "sw_24k4_256k.bin":
        ivas_br = f"{br_switch_file_path}/sw_24k4_256k.bin"
    short_tag_ext = ""
    if gain_flag == 1:
    if gain_flag != -1:
        short_tag_ext += f"_Gain{gain_flag}"
    if SID == 1:
        short_tag_ext += f"_SID"
    if pca is not None:
    if pca:
        short_tag_ext += f"_pca"
    # to avoid conflicting names in case of parallel test execution, differentiate all cases
    if gain_flag == 1:
        long_tag_ext = f"_Gain{gain_flag}"
    else:
        long_tag_ext = f"_pca"
    long_tag_ext = ""
    if gain_flag != -1:
        long_tag_ext += f"_Gain{gain_flag}"
    if SID == 1:
        long_tag_ext += f"_SID"
    dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.pkt"
@@ -604,7 +598,7 @@ def sba_dec(
    update_ref,
    gain_flag,
    keep_files,
    pca=None,
    pca=False,
):
    # --------  run cmd  ------------
    # sampling rate to BW mapping
@@ -615,17 +609,16 @@ def sba_dec(
    tag_out = f"{tag}_ivasbr{ivas_br[:-3]}k_DTX{dtx}"

    short_tag_ext = ""
    if gain_flag == 1:
    if gain_flag != -1:
        short_tag_ext += f"_Gain{gain_flag}"
    if pca is not None:
    if pca:
        short_tag_ext += f"_pca"
    if SID == 1:
        short_tag_ext += f"_SID_cut"
    # to avoid conflicting names in case of parallel test execution, differentiate all cases
    if gain_flag == 1:
        long_tag_ext = f"_Gain{gain_flag}"
    else:
        long_tag_ext = f"_pca"
    long_tag_ext = ""
    if gain_flag != -1:
        long_tag_ext += f"_Gain{gain_flag}"
    if SID == 1:
        long_tag_ext += f"_SID_cut"
    dut_out_dir = f"{dut_base_path}/sba_bs/raw"