Commit caefe6ce authored by Anika Treffehn's avatar Anika Treffehn
Browse files

removed loudness adjustment from postprocessing, does not work for ISM yet

parent f95e40de

ivas_processing_scripts/__init__.py

+27 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ from ivas_processing_scripts.processing.processing import ( 
    reverse_process_2,

)

from ivas_processing_scripts.utils import DirManager, apply_func_parallel

from ivas_processing_scripts.audiotools.wrappers.bs1770 import scale_files





def logging_init(args, cfg):
@@ -174,9 +175,35 @@ def main(args): 
                "mp" if cfg.multiprocessing else None,

            )



        # remove preamble and split signals

        if hasattr(cfg, "preprocessing_2"):

            reverse_process_2(cfg, logger)



        # scale individual files

        # TODO: create new function for that part

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

            if hasattr(cfg, "preprocessing_2"):

                out_paths_splits = cfg.pre2.out_paths_splits

                out_meta_splits = cfg.pre2.out_meta_splits

            else:

                out_paths_splits = []

                for out_dir in cfg.out_dirs:

                    condition_list = []

                    for item in cfg.items_list:

                        condition_list.append(out_dir.joinpath(item.name))

                    out_paths_splits.append(condition_list)



            # TODO: get out_meta_splits and use

            scale_files(

                out_paths_splits,

                cfg.postprocessing["fmt"],

                cfg.postprocessing["loudness"],

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

                cfg.postprocessing["fs"],

                None,

                logger,

            )



        if cfg.condition_in_output_filename:

            rename_generated_conditions(cfg.output_path)

ivas_processing_scripts/processing/chains.py

+0 −21
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ def get_processing_chain( 


    # get pre and post processing configurations

    pre_cfg = getattr(cfg, "preprocessing", {})

    pre2_cfg = getattr(cfg, "preprocessing_2", {})

    post_cfg = cfg.postprocessing



    # default to input values if preprocessing was not requested
@@ -243,18 +242,8 @@ def get_processing_chain( 
                {

                    "in_fs": tmp_in_fs,

                    "in_fmt": tmp_in_fmt,

                    "out_fs": post_cfg.get("fs"),

                    "out_fmt": "MONO",

                    "out_cutoff": tmp_lp_cutoff,

                    "out_loudness": post_cfg.get("loudness"),

                    "out_loudness_fmt": post_cfg.get("loudness_fmt"),

                    "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"),

                    "multiprocessing": cfg.multiprocessing,

                    "mnru_q": tmp_mnru_q,

                    "esdru_alpha": tmp_esdru_alpha,

                },

                name="mono_dmx",

            )
@@ -419,14 +408,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"))



    chain["processes"].append(

        Postprocessing(

            {
@@ -435,8 +416,6 @@ def get_processing_chain( 
                "out_fs": post_cfg.get("fs"),

                "out_fmt": post_cfg.get("fmt"),

                "out_cutoff": tmp_lp_cutoff,

                "out_loudness": loudness_postprocessing,

                "out_loudness_fmt": loudness_fmt_postprocessing,

                "bin_dataset": post_cfg.get("bin_dataset"),

                "bin_lfe_gain": post_cfg.get("bin_lfe_gain"),

                "limit": post_cfg.get("limit", True),

ivas_processing_scripts/processing/processing.py

+2 −12
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ from ivas_processing_scripts.audiotools.metadata import ( 
    split_meta_in_file,

    write_ISM_metadata_in_file,

)

from ivas_processing_scripts.audiotools.wrappers.bs1770 import scale_files

from ivas_processing_scripts.constants import LOGGER_DATEFMT, LOGGER_FORMAT

from ivas_processing_scripts.processing.config import TestConfig

from ivas_processing_scripts.utils import apply_func_parallel, list_audio, pairwise
@@ -350,17 +349,8 @@ def reverse_process_2(cfg, logger): 
        else:

            out_meta_splits = None



    # scale individual files

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

        scale_files(

            out_paths_splits,

            cfg.postprocessing["fmt"],

            cfg.postprocessing["loudness"],

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

            cfg.postprocessing["fs"],

            out_meta_splits,

            logger,

        )

    cfg.pre2.out_paths_splits = out_paths_splits

    cfg.pre2.out_meta_splits = out_meta_splits

    return