Commit f4a8bde8 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

try to fix conflicting names of some .192 files

parent 116d27af
Loading
Loading
Loading
Loading
Loading
+35 −29
Original line number Diff line number Diff line
@@ -921,11 +921,15 @@ def sba_enc(
    plc_pattern=None,
    get_enc_stats=False,
):
    dut_out_dir = f"{dut_base_path}/sba_bs/pkt"
    ref_out_dir = f"{reference_path}/sba_bs/pkt"

    check_and_makedir(dut_out_dir)
    check_and_makedir(ref_out_dir)
    input_path = f"{test_vector_path}/{tag}.wav"
    dtx_mode = dtx == "1"

    dut_pkt_dir = f"{dut_base_path}/sba_bs/pkt"
    ref_pkt_dir = f"{reference_path}/sba_bs/pkt"

    check_and_makedir(dut_pkt_dir)
    check_and_makedir(ref_pkt_dir)

    tag_out = tag
    
@@ -947,13 +951,9 @@ def sba_enc(
        tag_out += "_SID"
    if plc_pattern is not None:
        tag_out += "_" + plc_pattern
    dut_pkt_file = f"{dut_out_dir}/{tag_out}.192"
    ref_pkt_file = f"{ref_out_dir}/{tag_out}.192"
    if sid == 1:
        dut_pkt_file_cut = f"{dut_out_dir}/{tag_out}_cut.192"
        ref_pkt_file_cut = f"{ref_out_dir}/{tag_out}_cut.192"
    input_path = f"{test_vector_path}/{tag}.wav"
    dtx_mode = dtx == "1"
        
    dut_pkt_file = f"{dut_pkt_dir}/{tag_out}.192"
    ref_pkt_file = f"{ref_pkt_dir}/{tag_out}.192"        

    if cut_testv:
        # use shortened and potentially gain adjusted input PCM file - create if not present
@@ -966,8 +966,8 @@ def sba_enc(
        input_path = cut_file

    if get_enc_stats:
        ref_stats_file = f"{ref_out_dir}/{tag_out}.stats"
        dut_stats_file = f"{dut_out_dir}/{tag_out}.stats"
        ref_stats_file = f"{ref_pkt_dir}/{tag_out}.stats"
        dut_stats_file = f"{dut_pkt_dir}/{tag_out}.stats"
    else:
        ref_stats_file = None
        dut_stats_file = None
@@ -1001,6 +1001,10 @@ def sba_enc(
        )

    if sid == 1:
        # cut .pkt files such that they start with SID frame 
        dut_pkt_file_cut = f"{dut_pkt_dir}/{tag_out}_cut.192"
        ref_pkt_file_cut = f"{ref_pkt_dir}/{tag_out}_cut.192"
    
        if update_ref == 1:
            with open(ref_pkt_file, "rb") as fp_in:
                with open(ref_pkt_file_cut, "wb") as fp_out:
@@ -1043,9 +1047,10 @@ def sba_dec(
    get_ssnr=False,
    get_odg=False,
):

    dut_out_dir = f"{dut_base_path}/sba_bs/raw"
    ref_out_dir = f"{reference_path}/sba_bs/raw"
    dut_pkt_dir = f"{dut_base_path}/sba_bs/pkt"
    ref_pkt_dir = f"{reference_path}/sba_bs/pkt"
    dut_out_dir = f"{dut_base_path}/sba_bs/syn"
    ref_out_dir = f"{reference_path}/sba_bs/syn"
    
    check_and_makedir(dut_out_dir)
    check_and_makedir(ref_out_dir)
@@ -1069,16 +1074,18 @@ def sba_dec(
        tag_out += "_SID"
    if plc_pattern is not None:
        tag_out += "_" + plc_pattern
    if sid == 1:
        tag_out += "_cut"

    dut_pkt_file = f"{dut_base_path}/sba_bs/pkt/{tag_out}.192"
    ref_pkt_file = f"{reference_path}/sba_bs/pkt/{tag_out}.192"
        
    plc_file = None
    if plc_pattern is not None:
        plc_file = f"{TESTV_DIR}/{plc_pattern}.g192"
        
    if sid == 1:
        dut_pkt_file = f"{dut_pkt_dir}/{tag_out}_cut.192"
        ref_pkt_file = f"{ref_pkt_dir}/{tag_out}_cut.192"  
    else:        
        dut_pkt_file = f"{dut_pkt_dir}/{tag_out}.192"
        ref_pkt_file = f"{ref_pkt_dir}/{tag_out}.192"
 
    dut_out_file = f"{dut_out_dir}/{tag_out}.wav"
    ref_out_file = f"{ref_out_dir}/{tag_out}.wav"      

@@ -1130,9 +1137,8 @@ def sba_dec(
            pytest.fail(text_to_parse)

        # remove DUT output files when test result is OK (to save disk space)
        if not keep_files:
            os.remove(dut_out_file)
            if not decoder_only and plc_file is None:
                os.remove(dut_pkt_file)
        # if not keep_files:
            # os.remove(dut_out_file)
            # os.remove(dut_pkt_file)