Commit 81d8e0c5 authored by Anika Treffehn's avatar Anika Treffehn
Browse files

relative path supported for IVAS and EVS encoder and decoder and head rotation trajectory

parent bc8e76c9
Loading
Loading
Loading
Loading
Loading
+26 −6
Original line number Diff line number Diff line
@@ -283,6 +283,14 @@ def get_processing_chain(
            preamble = cfg.preprocessing_2.get("preamble", 0)
        else:
            preamble = 0
        if cod_cfg.get("bin", None) is not None:
            cod_bin = Path(cod_cfg.get("bin", None)).resolve()
        else:
            cod_bin = None
        if dec_cfg.get("bin", None) is not None:
            dec_bin = Path(dec_cfg.get("bin", None)).resolve()
        else:
            dec_bin = None

        chain["processes"].append(
            EVS(
@@ -291,9 +299,9 @@ def get_processing_chain(
                    "in_fs": tmp_in_fs,
                    "out_fs": dec_cfg.get("fs", tmp_in_fs),
                    "bitrate": bitrate,
                    "cod_bin": cod_cfg.get("bin"),
                    "cod_bin": cod_bin,
                    "cod_opts": cod_cfg.get("opts"),
                    "dec_bin": dec_cfg.get("bin"),
                    "dec_bin": dec_bin,
                    "dec_opts": dec_cfg.get("opts"),
                    "multiprocessing": cfg.multiprocessing,
                    "tx": tx_cfg,
@@ -346,7 +354,14 @@ def get_processing_chain(
            preamble = cfg.preprocessing_2.get("preamble", 0)
        else:
            preamble = 0

        if cod_cfg.get("bin", None) is not None:
            cod_bin = Path(cod_cfg.get("bin", None)).resolve()
        else:
            cod_bin = None
        if dec_cfg.get("bin", None) is not None:
            dec_bin = Path(dec_cfg.get("bin", None)).resolve()
        else:
            dec_bin = None
        chain["processes"].append(
            IVAS(
                {
@@ -355,9 +370,9 @@ def get_processing_chain(
                    "out_fmt": dec_cfg.get("fmt", tmp_out_fmt),
                    "out_fs": dec_cfg.get("fs", tmp_in_fs),
                    "bitrate": bitrate,
                    "cod_bin": cod_cfg.get("bin"),
                    "cod_bin": cod_bin,
                    "cod_opts": cod_cfg.get("opts"),
                    "dec_bin": dec_cfg.get("bin"),
                    "dec_bin": dec_bin,
                    "dec_opts": dec_cfg.get("opts"),
                    "multiprocessing": cfg.multiprocessing,
                    "tx": tx_cfg,
@@ -373,6 +388,11 @@ def get_processing_chain(
        raise SystemExit(f"Unknown condition {condition}!")

    # add postprocessing step based on condition
    if post_cfg.get("trajectory", None) is not None:
        trajectory = Path(post_cfg.get("trajectory", None)).resolve()
    else:
        trajectory = None

    chain["processes"].append(
        Postprocessing(
            {
@@ -386,7 +406,7 @@ def get_processing_chain(
                "bin_dataset": post_cfg.get("bin_dataset"),
                "bin_lfe_gain": post_cfg.get("bin_lfe_gain"),
                "limit": post_cfg.get("limit", True),
                "trajectory": post_cfg.get("trajectory"),
                "trajectory": trajectory,
                "multiprocessing": cfg.multiprocessing,
                "mnru_q": tmp_mnru_q,
                "esdru_alpha": tmp_esdru_alpha,