Commit 2b612218 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

remove ISAR enc commands

parent d8e3f5b7

.gitlab-ci.yml

+0 −4
Original line number Diff line number Diff line
@@ -1346,7 +1346,6 @@ ivas-conformance: 
    - cp Readme_IVAS_enc.txt testvec

    - cp Readme_IVAS_rend.txt testvec

    - cp Readme_IVAS_JBM_dec.txt testvec

    - cp Readme_IVAS_ISAR_enc.txt testvec

    - cp Readme_IVAS_ISAR_dec.txt testvec

    - cp Readme_IVAS_ISAR_post_rend.txt testvec

    - cp IVAS_cod.exe testvec/bin
@@ -1372,7 +1371,6 @@ ivas-conformance: 
      - Readme_IVAS_enc.txt

      - Readme_IVAS_rend.txt

      - Readme_IVAS_JBM_dec.txt

      - Readme_IVAS_ISAR_enc.txt

      - Readme_IVAS_ISAR_dec.txt

      - Readme_IVAS_ISAR_post_rend.txt

    expose_as: "Draft IVAS conformance"
@@ -1439,7 +1437,6 @@ ivas-conformance-linux: 
    - cp Readme_IVAS_enc.txt testvec

    - cp Readme_IVAS_rend.txt testvec

    - cp Readme_IVAS_JBM_dec.txt testvec

    - cp Readme_IVAS_ISAR_enc.txt testvec

    - cp Readme_IVAS_ISAR_dec.txt testvec

    - cp Readme_IVAS_ISAR_post_rend.txt testvec
@@ -1478,7 +1475,6 @@ ivas-conformance-linux: 
      - Readme_IVAS_enc.txt

      - Readme_IVAS_rend.txt

      - Readme_IVAS_JBM_dec.txt

      - Readme_IVAS_ISAR_enc.txt

      - Readme_IVAS_ISAR_dec.txt

      - Readme_IVAS_ISAR_post_rend.txt

      - $COVERAGE_OUTPUT_FILE

scripts/cleanup_26252.py

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ from pathlib import Path 
import os

import glob



files = ['Readme_IVAS_JBM_dec.txt','Readme_IVAS_dec.txt','Readme_IVAS_enc.txt','Readme_IVAS_rend.txt', 'Readme_IVAS_ISAR_enc.txt', 'Readme_IVAS_ISAR_dec.txt', 'Readme_IVAS_ISAR_post_rend.txt'];

files = ['Readme_IVAS_JBM_dec.txt','Readme_IVAS_dec.txt','Readme_IVAS_enc.txt','Readme_IVAS_rend.txt', 'Readme_IVAS_ISAR_dec.txt', 'Readme_IVAS_ISAR_post_rend.txt'];



used_files = []

kept = 0

scripts/enc_isar_header.txt

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
#!/usr/bin/env bash



if [ "$#" -ne 1 ]; then

    echo "Usage: $0 <CUT_ENC_BIN>"

    exit -1

fi



CUT_ENC_BIN=$1

DIFF_BIN="diff"



TESTV_PATH="."

REF_PATH="./testv"

CUT_PATH="./TMP_ENC_ISAR"

LOG_FILE=Readme_IVAS_ISAR_enc_log.txt



rm -rf tmp

rm -rf $CUT_PATH

mkdir -p $CUT_PATH

mkdir -p $CUT_PATH/split_rendering/ref

scripts/parse_commands.py

+1 −32
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ if __name__ == '__main__': 
    cmds_enc=[]

    cmds_dec=[]

    cmds_rend=[]

    cmds_isar_enc=[]

    cmds_isar_post_rend=[]



    all_args = set()
@@ -40,18 +39,16 @@ if __name__ == '__main__': 
                    cmds_enc.extend(re.findall(r"REF encoder command:\\n\\t(.*?)\\n", line))

                    cmds_dec.extend(re.findall(r"REF decoder command:\\n\\t(.*?)\\n", line))

                    cmds_rend.extend(re.findall(r"Running command\\n(.*?)\\n", line))

                    cmds_isar_enc.extend(re.findall(r"Running IVAS ISAR encoder command\\n(.*?)\\n", line))

                    cmds_isar_post_rend.extend(re.findall(r"Running ISAR post renderer command\\n(.*?)\\n", line))

                    cmds_isar_post_rend.extend(re.findall(r"Running ISAR EXT REND command\\n(.*?)\\n", line))



    # If pytest-html < v4 is used, the parsing will fail and render empty lists. This is a work-around in case that happens.

    if all(not x for x in [cmds_enc, cmds_dec, cmds_rend, cmds_isar_enc, cmds_isar_post_rend]):

    if all(not x for x in [cmds_enc, cmds_dec, cmds_rend, cmds_isar_post_rend]):

        for html_report in input:

            with open(html_report,'r') as infile:

                enc_cmd = False

                dec_cmd = False

                rend_cmd = False

                isar_enc_cmd = False

                isar_post_rend_cmd = False

                for line in infile.readlines():

                    line_trim = line.split("<br/>")[0] # Remove trailing html tags
@@ -64,9 +61,6 @@ if __name__ == '__main__': 
                    elif rend_cmd:

                        cmds_rend.append(line_trim)

                        rend_cmd = False                         

                    elif isar_enc_cmd:

                        cmds_isar_enc.append(line)

                        isar_enc_cmd = False                         

                    elif isar_post_rend_cmd:

                        cmds_isar_post_rend.append(line_trim)

                        isar_post_rend_cmd = False
@@ -77,8 +71,6 @@ if __name__ == '__main__': 
                            dec_cmd = True

                        elif "Running command" in line:

                            rend_cmd = True                             

                        elif "Running IVAS ISAR encoder command" in line:

                            isar_enc_cmd = True                            

                        elif "Running ISAR post renderer command" in line:

                            isar_post_rend_cmd = True                            

                        elif "Running ISAR EXT REND command" in line:
@@ -88,7 +80,6 @@ if __name__ == '__main__': 
    cmds_enc.sort()

    cmds_dec.sort()

    cmds_rend.sort()

    cmds_isar_enc.sort()

    cmds_isar_post_rend.sort()



    # Remove duplicates from cmds_enc -- some decoder tests use same encoder options
@@ -125,28 +116,6 @@ if __name__ == '__main__': 
        with open('scripts/script_footer.txt','r') as footer:

            outfile.write(footer.read())                        



    with open(txt_file.replace('.','_ISAR_enc.'),'w', newline='\n') as outfile:

        with open('scripts/enc_isar_header.txt','r') as header:

            outfile.write(header.read())

        for cmd in cmds_isar_enc:

            args = []

            for arg in cmd.split():

                # Adjust file arguments, pass other arguments as they are

                if path.exists(arg):

                    arg = path.relpath(arg).replace('\\','/')

                    arg = re.sub('IVAS_cod(.exe)?', '$CUT_ENC_BIN', arg)

                    arg = re.sub('scripts', TESTV_PATH, arg)

                    arg = re.sub('tests', CUT_PATH, arg)

                args.append(arg)

            cmd = ' '.join(args)

            outfile.write(cmd+'\n')

            bts = re.search(r"\s(([\S]+)(.bts|.192|.pkt|.fer))$", cmd)

            if bts:

                outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'/dut',REF_PATH + r'/ref')+' '+bts.group(1)+' >> $LOG_FILE 2>&1\n')

            outfile.write('\n')

        with open('scripts/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_dec.'),'w', newline='\n') as outfile_jbm, open(txt_file.replace('.','_ISAR_dec.'),'w', newline='\n') as outfile_isar:

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

            outfile_dec.write(header.read())

tests/conformance-test/test_26252.py

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


test_dict = {}

TEST_DIR = "."

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

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



for s in scripts:

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