Commit a3f1207c authored by norvell's avatar norvell
Browse files

Ensure keep_files is used, unify .192 as bitstream and .wav as output

parent 9836339b

.gitlab-ci.yml

+1 −50
Original line number Diff line number Diff line
@@ -1231,8 +1231,7 @@ ivas-conformance: 
    - *print-common-info

    # Prepare reference exec, use tests and scripts from reference

    - source_branch_commit_sha=$(git rev-parse HEAD)

    - git checkout 20230817_Final_Upd02_SA4#125_delivery

    - sed -i".bak" "s/\(#define DEBUGGING\)/\/\/\1/" lib_com/options.h

    - git checkout main # This should be set to a relevant reference

    - make -j

    - cp IVAS_cod IVAS_cod_ref

    - cp IVAS_dec IVAS_dec_ref
@@ -1240,54 +1239,6 @@ ivas-conformance: 
    - git restore .

    - git checkout $source_branch_commit_sha

    

    # remove unsupported testcases, in reverse row order 

    - sed -i '1657,1659d' scripts/config/self_test.prm

    - sed -i '1644,1655d' scripts/config/self_test.prm

    - sed -i '1623,1625d' scripts/config/self_test.prm

    - sed -i '1350,1353d' scripts/config/self_test.prm

    - sed -i '1307,1321d' scripts/config/self_test.prm

    - sed -i '1205,1213d' scripts/config/self_test.prm

    - sed -i '849,851d' scripts/config/self_test.prm

    - sed -i '805,807d' scripts/config/self_test.prm

    - sed -i '684,686d' scripts/config/self_test.prm

    - sed -i '524,532d' scripts/config/self_test.prm

    - sed -i '505,508d' scripts/config/self_test.prm

    - sed -i '420,422d' scripts/config/self_test.prm

    - sed -i '377,383d' scripts/config/self_test.prm

    - sed -i '321,329d' scripts/config/self_test.prm

    # Remove -fr option

    - sed -i '206,207d' tests/renderer/utils.py 

    # Revert to -tf option used in old IVAS_rend

    - sed -i '187s/-T/-tf/' tests/renderer/utils.py 

    # Exclude MASA1

    - sed -i '195s/"MASA1", //' tests/renderer/constants.py 

    # Change -pca to -bypass 2

    - sed -i '258s/-pca/-bypass 2/' tests/conftest.py 

    # Remove tests/renderer/test_renderer::test_masa_prerend

    - sed -i '239,246d' tests/renderer/test_renderer.py

    # Remove test_sba_pca

    - sed -i '88,153d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py

    # Disable removal of output bitstreams

    - sed -i 's/os.remove/#os.remove/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py

    - sed -i 's/os.remove/print()#os.remove/g' tests/codec_be_on_mr_nonselection/test_param_file.py

    - sed -i '605,608d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py

    # Remove binaural renderer tests

    - sed -i '276,301d' tests/renderer/test_renderer.py

    - sed -i '205,236d' tests/renderer/test_renderer.py

    - sed -i '151,186d' tests/renderer/test_renderer.py

    - sed -i '101,132d' tests/renderer/test_renderer.py

    - sed -i '58,83d' tests/renderer/test_renderer.py

    # Remove random tag in FER cases    

    - sed -i '438s/next(tempfile._get_candidate_names())/os.path.basename(plc_file)/' tests/conftest.py

    # Unify to use .192 as bitstream suffix

    - sed -i 's/\.pkt/\.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py

    - sed -i 's/\.pkt/\.192/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py

    - sed -i 's/\.bts/\.192/g' tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py

    # Unify to use .wav as output suffix

    - sed -i 's/\.raw/\.wav/g' tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py

    - sed -i 's/\.raw/\.wav/g' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py



    

    # Reference creation

    - non_be_flag=0

    - exit_code=0

tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py

+2 −2
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ def test_masa_enc_dec( 
    check_and_makedir(out_dir_dec_output_dut)



    # To avoid conflicting names in case of parallel test execution, differentiate all cases

    output_bitstream_ref = f"{out_dir_bs_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.bts"

    output_bitstream_dut = f"{out_dir_bs_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.bts"

    output_bitstream_ref = f"{out_dir_bs_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.192"

    output_bitstream_dut = f"{out_dir_bs_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.192"

    dec_output_ref = f"{out_dir_dec_output_ref}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.wav"

    dec_output_dut = f"{out_dir_dec_output_dut}/masa{masa_channel_count}_ndirs{n_directions}_outputmode{output_mode}_ivasbr{ivas_br}k_DTX{dtx}.wav"

    if output_mode == "EXT":

tests/codec_be_on_mr_nonselection/test_param_file.py

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ def test_param_file_tests( 
        enc_split,

        update_ref,

    )

    if sba_br_switching_dtx == 1:

    if sba_br_switching_dtx == 1 and not keep_files:

        is_exist = os.path.exists(cut_file)

        if is_exist:

            os.remove(cut_file)

tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py

+6 −6
Original line number Diff line number Diff line
@@ -163,14 +163,14 @@ def sba_dec_plc( 
    check_and_makedir(ref_out_dir)



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

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

    ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_dutenc.pkt"

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

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

    if SID == 1:

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

        ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_dutenc_cut.pkt"

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

        ref_in_pkt_dutenc = f"{reference_path}/sba_bs/pkt/{tag_out}_SID_dutenc_cut.192"



    dut_out_raw = f"{dut_out_dir}/{plc_tag_out}.raw"

    ref_out_raw = f"{ref_out_dir}/{plc_tag_out}.raw"

    dut_out_raw = f"{dut_out_dir}/{plc_tag_out}.wav"

    ref_out_raw = f"{ref_out_dir}/{plc_tag_out}.wav"



    output_config = "FOA"

    if ref_decoder_path:

tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py

+15 −13
Original line number Diff line number Diff line
@@ -524,14 +524,14 @@ def sba_enc( 
        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"

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

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

    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_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.pkt"

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

        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_dutenc_cut = (

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

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

        )

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

    dtx_mode = dtx == "1"
@@ -604,12 +604,14 @@ def sba_enc( 
            with open(ref_pkt_file_dutenc, "rb") as fp_in:

                with open(ref_pkt_file_dutenc_cut, "wb") as fp_out:

                    fr_cnt, cut_cnt = cut_from_start(fp_in, fp_out, 0, True)

            if not keep_files:

                os.remove(ref_pkt_file)

                os.remove(ref_pkt_file_dutenc)

        if update_ref == 0:

            with open(dut_pkt_file, "rb") as fp_in:

                with open(dut_pkt_file_cut, "wb") as fp_out:

                    fr_cnt, cut_cnt = cut_from_start(fp_in, fp_out, 0, True)

            if not keep_files:                    

                os.remove(dut_pkt_file)
@@ -657,11 +659,11 @@ def sba_dec( 
    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}.pkt"

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

    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"



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

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

    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"



    check_and_makedir(dut_out_dir)

    check_and_makedir(ref_out_dir)