Commit 55be30e0 authored by janssontoftg's avatar janssontoftg
Browse files

Revert "Revert "Fixes in parse_commands.py"" 

This reverts commit 31d4ac31
parent 2a5ffa69

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ ivas-conformance: 
    - cp -r tests/renderer/data testvec/testv/renderer/data

    - cp -r tests/renderer/cut testvec/testv/renderer/ref

    - cp -r conformance-test testvec/

    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_jbm.txt testvec

    - cp Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt testvec

    - cp IVAS_cod IVAS_dec IVAS_rend testvec/bin

    

    # Test run generated scripts in testvec
@@ -1312,6 +1312,7 @@ ivas-conformance: 
      - Readme_IVAS_dec.txt  

      - Readme_IVAS_enc.txt  

      - Readme_IVAS_rend.txt

      - Readme_IVAS_JBM_dec.txt

    expose_as: "Draft IVAS conformance"

    reports:

      junit: report-junit.xml

conformance-test/test_26252.py

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ def replace_paths(instr, testv_path, ref_path, cut_path): 


test_dict = {}

TEST_DIR = "."

scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt", "Readme_IVAS_jbm.txt"]

scripts=["Readme_IVAS_enc.txt", "Readme_IVAS_dec.txt", "Readme_IVAS_rend.txt", "Readme_IVAS_JBM_dec.txt"]



for s in scripts:

    with open(os.path.join(TEST_DIR, s), "r", encoding="UTF-8") as fp:

parse_commands.py

+6 −6
Original line number Diff line number Diff line
@@ -57,25 +57,25 @@ if __name__ == '__main__': 
        with open('script_footer.txt','r') as footer:

            outfile.write(footer.read())                        



    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_jbm.'),'w', newline='\n') as outfile_jbm:

    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_JBM_dec.'),'w', newline='\n') as outfile_jbm:

        with open('dec_header.txt','r') as header:

            outfile_dec.write(header.read())

        with open('jbm_header.txt','r') as header:            

            outfile_jbm.write(header.read())

        for cmd in cmds_dec:

            absolute_out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)

            absolute_out = re.search(r"\s(([\S]+)(.wav))$", cmd)

            arg1 = cmd.split()[0]

            root_folder = arg1[0:arg1.find("ivas-codec/")+10]

            cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')

            cmd = cmd.replace(r'\\', '/')

            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)

            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths            

            inputs = cmd.count(root_folder) - 1

            if ".fer " in cmd:

                cmd = cmd.replace(root_folder + r'/tests/ref', REF_PATH + r'ref', 1)

            else:

                cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', inputs)

            cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)

            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)

            cmd = cmd.replace('scripts/', TESTV_PATH) # To catch relative paths

            

            if 'VOIP' in cmd:

                outfile = outfile_jbm
@@ -84,14 +84,14 @@ if __name__ == '__main__': 
            

            if not "pca" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd and not "stvFOA32c4chn_0.004.wav" in cmd:            

                outfile.write(cmd+'\n')

                out = re.search(r"\s(([\S]+)(.wav|.raw|.pcm))$", cmd)

                out = re.search(r"\s(([\S]+)(.wav))$", cmd)

                if out:

                    diff_cmds=[]

                    for output in glob.glob(absolute_out.group(1) + '*'):

                        output = output.replace(root_folder + r'/tests/', CUT_PATH)

                        diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+output+' >> $LOG_FILE 2>&1')

                    outfile.write(('; ').join(diff_cmds))

                outfile.write('\n')

                outfile.write('\n\n')

        with open('script_footer.txt','r') as footer:

            outfile_dec.write(footer.read())    

            footer.seek(0)