Commit 32bd4077 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec

parents c570cb89 b75baf17

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -965,6 +965,7 @@ coverage-test-on-main-scheduled: 
  - sed -i "s/IVAS FORMAT/IVAS $in_format to $out_format/g" ${public_dir}/index.html

  # do separately here to avoid overwrite complaints by mv

  - mv -f ci/complexity_measurements/style.css ${public_dir}/

  - ls $public_dir



.complexity-template:

  extends:

ci/collect_artifacts.py

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ def collect_for_sanitizer_test(file): 
    )

    files_to_archive = find_failed_files_for_sanitizer_test(console_log, "logs")



    print("files_to_archive_noPLC:", files_to_archive_noPLC)

    print("files_to_archive:", files_to_archive)



    log_folder = pathlib.Path("./LOGS_PLC")

    log_folder.mkdir()

    for test in files_to_archive.keys():

ci/run_scheduled_sanitizer_test.py

+9 −5
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) 
        )

    )



    with open(CONSOLE_OUT_FILE, "a") as f:

    with open(CONSOLE_OUT_FILE, "w") as f:

        proc = subprocess.Popen(

            cmd_no_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE

        )
@@ -174,9 +174,13 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) 
        )

    )



    proc = subprocess.Popen(cmd_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

    with open(CONSOLE_OUT_FILE, "a") as f:

        proc = subprocess.Popen(

            cmd_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE

        )

        for c in iter(lambda: proc.stdout.read(1), b""):

            sys.stdout.buffer.write(c)

            f.write(c.decode("utf8"))

        proc.wait()



    returncode_fec = proc.returncode

lib_util/cmdl_tools.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ bool is_number( char *str ) 
    i = 0;

    while ( str[i] != 0 )

    {

        if ( ( str[i] < '0' || str[i] > '9' ) && str[i] != '.' && str[i] != '-' && str[i] != '\n' )

        if ( ( str[i] < '0' || str[i] > '9' ) && str[i] != '.' && str[i] != '-' && str[i] != '\n' && str[i] != '\r' )

        {

            return false;

        }

scripts/pyivastest/IvasScriptsCommon.py

+17 −4
Original line number Diff line number Diff line
@@ -544,12 +544,18 @@ def runner_setup(runner, args): 
        runner.limit_duration = True

        runner.max_duration = args["limit_duration"]



    if "fer_file" in args.keys() or "ber_file" in args.keys():

        # assert that the eid-xor tool is there

        eid_xor_path = os.path.join(runner.config["utilPath"], "eid-xor")

        if not os.path.isfile(eid_xor_path):

            raise FileNotFoundError(f"Could not find {eid_xor_path} (needed for error pattern insertion)")



    if args["fer_file"]:

        fer_suffix = "fer_{}".format(

            "_".join(os.path.basename(args["fer_file"]).split("."))

        )

        fer_cmd = [

            os.path.join(runner.config["utilPath"], "eid-xor"),

            eid_xor_path,

            "-vbr",

            "-fer",

            "{in_file}",
@@ -564,7 +570,7 @@ def runner_setup(runner, args): 
            "_".join(os.path.basename(args["ber_file"]).split("."))

        )

        ber_cmd = [

            os.path.join(runner.config["utilPath"], "eid-xor"),

            eid_xor_path,

            "-vbr",

            "-ber",

            "{in_file}",
@@ -634,12 +640,19 @@ def runner_setup(runner, args): 


def analyzer_setup(analyzer, args):

    bs_proc_chain = {}



    if "fer_file" in args.keys() or "ber_file" in args.keys():

        # assert that the eid-xor tool is there

        eid_xor_path = os.path.join(analyzer.config["utilPath"], "eid-xor")

        if not os.path.isfile(eid_xor_path):

            raise FileNotFoundError(f"Could not find {eid_xor_path} (needed for error pattern insertion)")



    if args["fer_file"]:

        fer_suffix = "fer_{}".format(

            "_".join(os.path.basename(args["fer_file"]).split("."))

        )

        fer_cmd = [

            os.path.join(analyzer.config["utilPath"], "eid-xor"),

            eid_xor_path,

            "-vbr",

            "-fer",

            "{in_file}",
@@ -654,7 +667,7 @@ def analyzer_setup(analyzer, args): 
            "_".join(os.path.basename(args["ber_file"]).split("."))

        )

        ber_cmd = [

            os.path.join(analyzer.config["utilPath"], "eid-xor"),

            eid_xor_path,

            "-vbr",

            "-ber",

            "{in_file}",