Commit 0d40fc88 authored by multrus's avatar multrus
Browse files

if no loudness_fmt given, default to output format (postprocessing.fmt)

parent 13c50168

ivas_processing_scripts/processing/chains.py

+3 −2
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ def get_preprocessing(cfg: TestConfig) -> dict: 
    }



    pre_cfg = cfg.preprocessing

    post_cfg = cfg.postprocessing



    chain["processes"].append(

        Preprocessing(
@@ -127,7 +128,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"),

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

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

                "multiprocessing": cfg.multiprocessing,

            }
@@ -409,7 +410,7 @@ def get_processing_chain( 
        loudness_fmt_postprocessing = None

    else:

        loudness_postprocessing = post_cfg.get("loudness")

        loudness_fmt_postprocessing = post_cfg.get("loudness_fmt")

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



    chain["processes"].append(

        Postprocessing(

ivas_processing_scripts/processing/preprocessing_2.py

+2 −1
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ class Preprocessing2(Processing): 


            # measure loudness of audio signal based on output format

            tmp_object = audio.fromtype(self.out_fmt)



            if (

                isinstance(tmp_object, audio.ObjectBasedAudio)

                or isinstance(tmp_object, audio.SceneBasedAudio)
@@ -147,7 +148,7 @@ class Preprocessing2(Processing): 
                out_format = self.out_fmt



            loudness_signal, _ = get_loudness(audio_object, loudness_format=out_format)

            logger.debug(f"Loudness of audio signal: {loudness_signal}LKFS")

            logger.debug(f"Loudness of audio signal: {loudness_signal}LKFS ({out_format})")



            # compute desired loudness of background noise

            loudness_noise = loudness_signal - self.background_noise["snr"]

ivas_processing_scripts/processing/processing.py

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ def reverse_process_2(cfg, logger): 
            out_paths_splits,

            cfg.postprocessing["fmt"],

            cfg.postprocessing["loudness"],

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

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

            cfg.postprocessing["fs"],

            out_meta_splits,

            logger,