Commit 89cf3010 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix problem with list for postproc format and loudness

parent 3baef7bf

ivas_processing_scripts/audiotools/wrappers/masaAnalyzer.py

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ def masaAnalyzer( 
        write(tmp_in, tmp_audio, 48000)



        # we need to run in the masaAnalyzer directory to use the .bin files it requires

        print(cmd)

        run(cmd, cwd=binary.resolve().parent)



        fmt = f"MASA{num_tcs}"

ivas_processing_scripts/processing/chains.py

+12 −9
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ def get_preprocessing(cfg: TestConfig) -> dict: 


    pre_cfg = cfg.preprocessing

    post_cfg = cfg.postprocessing

    post_fmt = post_cfg["fmt"]

    if isinstance(post_fmt, list):

        post_fmt = post_fmt[-1]



    chain["processes"].append(

        Preprocessing(
@@ -128,7 +131,7 @@ def get_preprocessing(cfg: TestConfig) -> dict: 
                "in_delay": pre_cfg.get("delay"),

                "in_window": pre_cfg.get("window"),

                "in_loudness": pre_cfg.get("loudness"),

                "in_loudness_fmt": pre_cfg.get("loudness_fmt", post_cfg.get("fmt")),

                "in_loudness_fmt": pre_cfg.get("loudness_fmt", post_fmt),

                "in_mask": pre_cfg.get("mask", None),

                "multiprocessing": cfg.multiprocessing,

            }
@@ -436,14 +439,6 @@ def get_processing_chain( 
        raise SystemExit(f"Unknown condition {condition}!")



    # add postprocessing step based on condition

    # if concatenation and splitting do loudness adjustment only on splitted files

    if pre2_cfg.get("concatenate_input", False):

        loudness_postprocessing = None

        loudness_fmt_postprocessing = None

    else:

        loudness_postprocessing = post_cfg.get("loudness")

        loudness_fmt_postprocessing = post_cfg.get("loudness_fmt", post_cfg.get("fmt"))



    post_fmt = post_cfg.get("fmt")

    if isinstance(post_fmt, list):

        pre_fmts = post_fmt[:-1]
@@ -464,6 +459,14 @@ def get_processing_chain( 
            )

            tmp_in_fmt = fmt_out



    # if concatenation and splitting do loudness adjustment only on splitted files

    if pre2_cfg.get("concatenate_input", False):

        loudness_postprocessing = None

        loudness_fmt_postprocessing = None

    else:

        loudness_postprocessing = post_cfg.get("loudness")

        loudness_fmt_postprocessing = post_cfg.get("loudness_fmt", tmp_in_fmt)



    chain["processes"].append(

        Postprocessing(

            {

ivas_processing_scripts/processing/processing.py

+4 −1
Original line number Diff line number Diff line
@@ -358,11 +358,14 @@ def reverse_process_2(cfg, logger): 


    # scale individual files

    if cfg.postprocessing.get("loudness", False):

        post_fmt = cfg.postprocessing["fmt"]

        if isinstance(post_fmt, list):

            post_fmt = post_fmt[-1]

        scale_files(

            out_paths_splits,

            fmt,

            cfg.postprocessing["loudness"],

            cfg.postprocessing.get("loudness_fmt", cfg.postprocessing["fmt"]),

            cfg.postprocessing.get("loudness_fmt", post_fmt),

            cfg.postprocessing["fs"],

            out_meta_splits,

            logger,