Commit cf7e06db authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

use IVAS_rend for MASA reference generation

parent f67fb7ca

examples/TEMPLATE.yml

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ conditions_to_generate: 
      type: ref

      ### optional low-pass cut-off frequency in Hz; default = null

      # out_fc: 22500

      ### optional use of IVAS_rend (can be used in all conditions)

      ### optional use of IVAS_rend for post rendering (can be used in all conditions)

      # ivas_rend:

        ### Path to renderer binary; default search for IVAS_rend in bin folder (primary) and PATH (secondary)

        # bin: ~/git/ivas-codec/IVAS_rend
@@ -232,7 +232,7 @@ conditions_to_generate: 
          # fs: 48000

          ### Additional commandline options; default = null

          # opts: ["-q", "-no_delay_cmp"]

      ### optional use of IVAS_rend (can be used in all conditions)

      ### optional use of IVAS_rend for post rendering (can be used in all conditions)

      # ivas_rend:

        ### Path to renderer binary; default search for IVAS_rend in bin folder (primary) and PATH (secondary)

        # bin: ~/git/ivas-codec/IVAS_rend

experiments/selection_isar/BS1534-2a/config/BS1534-2a.yml

+5 −1
Original line number Diff line number Diff line
@@ -45,9 +45,13 @@ conditions_to_generate: 
    c01:

        type: ref

        fmt: "MASA2DIR1"

        ivas_rend:

            fmt: "BINAURAL"

    c02:

        type: lp7k

        fmt: "MASA2DIR1"

        ivas_rend:

            fmt: "BINAURAL"



    ### IVAS condition ###############################

    c03:

ivas_processing_scripts/processing/chains.py

+18 −19
Original line number Diff line number Diff line
@@ -692,25 +692,6 @@ def get_processing_chain( 
    else:

        raise SystemExit(f"Unknown condition {condition}!")



    # add optional IVAS_rend rendering step after each condition

    if cond_cfg.get("ivas_rend", -1) != -1:

        rend_cfg = cond_cfg["ivas_rend"]

        chain["processes"].append(

            IVAS_rend(

                {

                    "in_fmt": tmp_in_fmt,

                    "in_fs": tmp_in_fs,

                    "out_fmt": rend_cfg.get("fmt", tmp_out_fmt),

                    "bin": get_abs_path(rend_cfg.get("bin", None)),

                    "opts": rend_cfg.get("opts"),

                    "use_windows_codec_binaries": cfg.use_windows_codec_binaries,

                }

            )

        )

        # update values to reflect renderer output

        tmp_in_fs = rend_cfg.get("fs", tmp_in_fs)

        tmp_in_fmt = rend_cfg.get("fmt", tmp_out_fmt)



    # add postprocessing step based on condition

    post_fmt = post_cfg.get("fmt")

    if isinstance(post_fmt, list) or len(cond_fmt) > 0:
@@ -743,6 +724,24 @@ def get_processing_chain( 
    if cond_cfg.get("out_fc") is not None:

        tmp_lp_cutoff = cond_cfg.get("out_fc")



    # add optional IVAS_rend rendering step after each condition

    if rend_cfg := cond_cfg.get("ivas_rend"):

        chain["processes"].append(

            IVAS_rend(

                {

                    "in_fmt": tmp_in_fmt,

                    "in_fs": tmp_in_fs,

                    "out_fmt": rend_cfg.get("fmt", tmp_out_fmt),

                    "bin": get_abs_path(rend_cfg.get("bin")),

                    "opts": rend_cfg.get("opts"),

                    "use_windows_codec_binaries": cfg.use_windows_codec_binaries,

                }

            )

        )

        # update values to reflect renderer output

        tmp_in_fs = rend_cfg.get("fs", tmp_in_fs)

        tmp_in_fmt = rend_cfg.get("fmt", tmp_out_fmt)



    chain["processes"].append(

        Postprocessing(

            {