Commit 11f9ea97 authored by Jan Kiene's avatar Jan Kiene
Browse files

adjust script for new modes

parent 85f3e014
Loading
Loading
Loading
Loading
Loading
+20 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ EP_FILE = "ep_015.g192"
GENPATT_CMD = f"gen-patt -tailstat -fer -g192 -gamma 0 -rate 0.15 -tol 0.001 -reset -n {int(DURATION) * 50} {EP_FILE}"
EIDXOR_CMD = "eid-xor -vbr -fer {bitstream} {ep_file} {out_file}"
MC_MODES = ["5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]
AMBISONICS_MODES = ["HOA3", "HOA2", "FOA", "PlanarHOA3", "PlanarHOA2", "PlanarFOA"]

SCRIPT_DIR = pathlib.Path("./scripts").resolve()

@@ -72,10 +73,22 @@ def main(args):

def get_modes(in_format: str) -> list:

    in_format_for_script = in_format
    if in_format in MC_MODES:
        in_format_for_script = "MC"
    elif "-" in in_format:
        # hyphen indicates combined format
        scene_format, object_format = in_format.split('-')
        if scene_format in AMBISONICS_MODES:
            in_format_for_script = "OSBA"
        else:
            assert(scene_format == "MASA")
            in_format_for_script = "OMASA"

    cmd = [
        SCRIPT_DIR.joinpath("runIvasCodec.py"),
        "-C",
        "MC" if in_format in MC_MODES else in_format,
        "MC" if in_format_for_script in MC_MODES else in_format_for_script,
        "-l",
    ]
    list_process = subprocess.run(cmd, capture_output=True)
@@ -87,6 +100,9 @@ def get_modes(in_format: str) -> list:
    if in_format in MC_MODES:
        in_format = "MC_" + in_format + "_b"
        mode_list = [m for m in mode_list if in_format in m]
    elif in_format_for_script != in_format:
        # indicates combined format
        mode_list = [m for m in mode_list if object_format in m and scene_format in m]

    return mode_list

@@ -108,6 +124,9 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr
    modes = get_modes(in_format)
    md_file_command = get_md_file_command(in_format)

    if len(modes) == 0:
        return 0

    ### always run encoder and decoder with no frameloss
    cmd_no_fec = [
        str(SCRIPT_DIR.joinpath("IvasBuildAndRunChecks.py")),