Commit 253d2250 authored by norvell's avatar norvell
Browse files

Move DuT encoding out of reference creation. Put fer pattern in BS name to... 

Move DuT encoding out of reference creation. Put fer pattern in BS name to avoid conflict during parallel processing
parent a8ee727e

tests/codec_be_on_mr_nonselection/test_sba.py

+14 −8
Original line number Diff line number Diff line
@@ -670,8 +670,9 @@ def test_sba_plc_system( 
        gain_flag,

        keep_files,

        cut_gain=cut_gain,

        create_dutenc=True,

        create_dutenc=False,

        cut_testv=cut_testv,

        plc_pattern=plc_pattern,

    )



    # dec
@@ -725,6 +726,7 @@ def sba_enc( 
    create_dutenc=False,

    cut_testv=False,

    pca=False,

    plc_pattern=None,

):

    # ------------  run cmd  ------------

    dut_out_dir = f"{dut_base_path}/sba_bs/pkt"
@@ -757,12 +759,14 @@ def sba_enc( 
        long_tag_ext += f"_Gain{gain_flag}"

    if SID == 1:

        long_tag_ext += "_SID"

    if plc_pattern is not None:

        long_tag_ext += "_SID" + "_" + plc_pattern

    dut_pkt_file = f"{dut_out_dir}/{tag_out}{long_tag_ext}.192"

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

    ref_pkt_file = f"{ref_out_dir}/{tag_out}{long_tag_ext}.192"

    ref_pkt_file_dutenc = f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc.192"

    if SID == 1:

        dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}{long_tag_ext}_cut.192"

        ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}{short_tag_ext}_cut.192"

        ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}{long_tag_ext}_cut.192"

        ref_pkt_file_dutenc_cut = (

            f"{ref_out_dir}/{tag_out}{short_tag_ext}_dutenc_cut.192"

        )
@@ -883,11 +887,13 @@ def sba_dec( 
        long_tag_ext += f"_Gain{gain_flag}"

    if SID == 1:

        long_tag_ext += "_SID_cut"

    if plc_pattern is not None:

        long_tag_ext += "_SID" + "_" + plc_pattern        

    dut_out_dir = f"{dut_base_path}/sba_bs/raw"

    ref_out_dir = f"{reference_path}/sba_bs/raw"



    dut_in_pkt = f"{dut_base_path}/sba_bs/pkt/{tag_out}{long_tag_ext}.192"

    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}{short_tag_ext}.192"

    ref_in_pkt = f"{reference_path}/sba_bs/pkt/{tag_out}{long_tag_ext}.192"

    ref_in_pkt_dutenc = (

        f"{reference_path}/sba_bs/pkt/{tag_out}{short_tag_ext}_dutenc.192"

    )
@@ -902,11 +908,11 @@ def sba_dec( 
    plc_file = None

    if plc_pattern is not None:

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

        long_tag_ext = f"{long_tag_ext}_{plc_pattern}"

        short_tag_ext = f"{short_tag_ext}_{plc_pattern}"

    #     long_tag_ext = f"{long_tag_ext}_{plc_pattern}"

    #     short_tag_ext = f"{short_tag_ext}_{plc_pattern}"



    dut_out_raw = f"{dut_out_dir}/{tag_out}{long_tag_ext}.wav"

    ref_out_raw = f"{ref_out_dir}/{tag_out}{short_tag_ext}.wav"

    ref_out_raw = f"{ref_out_dir}/{tag_out}{long_tag_ext}.wav"



    check_and_makedir(dut_out_dir)

    check_and_makedir(ref_out_dir)
@@ -923,7 +929,7 @@ def sba_dec( 


    if update_ref == 0:

        if plc_file is not None:

            dut_in_pkt = ref_in_pkt_dutenc

            dut_in_pkt = dut_in_pkt

        elif decoder_only:

            dut_in_pkt = ref_in_pkt

tests/conftest.py

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ class DecoderFrontend: 


            eid_command = [eid_path]

            eid_command.extend(["-fer", "-vbr", "-bs", "g192", "-ep", "g192"])

            eid_output_suffix = "." + os.path.basename(plc_file) + ".fer"

            eid_output_suffix = ".fer"

            eid_command += [

                str(input_bitstream_path),

                str(plc_file),