Commit 9d7ffa4f authored by Anika Treffehn's avatar Anika Treffehn
Browse files

added loudness format info to logger and adjusted template and readme

parent 49ca60ae

README.md

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ input: 
    ### Target loudness in LKFS; default = null (no loudness change applied)

    # loudness: -26

    ### Spatial audio format in which loudness is adjusted (only used if preprocessing loudness is not null);

    ### default = null (uses preprocessing fmt if possible)

    ### default = null (uses postprocessing fmt)

    # loudness_fmt: "BINAURAL"

    ### Pre-/post-trim individual signal(s) (ms) (negative values pad silence); default = 0

    # trim:

examples/TEMPLATE.yml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ input: 
    ### Target loudness in LKFS; default = null (no loudness change applied)

    # loudness: -26

    ### Spatial audio format in which loudness is adjusted (only used if preprocessing loudness is not null);

    ### default = null (uses preprocessing fmt if possible)

    ### default = null (uses postprocessing fmt)

    # loudness_fmt: "BINAURAL"

    ### Pre-/post-trim individual signal(s) (ms) (negative values pad silence); default = 0

    # trim:

ivas_processing_scripts/audiotools/wrappers/bs1770.py

+9 −6
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ def get_loudness( 
    target_loudness: Optional[float] = -26,

    loudness_format: Optional[str] = None,

    rms: Optional[bool] = False,

) -> Tuple[float, float]:

) -> Tuple[float, float, str]:

    """

    Loudness measurement using ITU-R BS.1770-4
@@ -185,6 +185,8 @@ def get_loudness( 
        Measured loudness (after conversion to loudness_format if specified)

    scale_factor: float

        Scale factor to acheive desired loudness

    loudness_format: str

        Used loudness format

    """



    if target_loudness > 0:
@@ -212,7 +214,8 @@ def get_loudness( 
        convert.format_conversion(input, tmp)

    else:

        tmp.audio = input.audio

    return bs1770demo(tmp, target_loudness, rms)

    measured_loudness, scale_factor = bs1770demo(tmp, target_loudness, rms)

    return measured_loudness, scale_factor, loudness_format





def loudness_norm(
@@ -254,7 +257,7 @@ def loudness_norm( 
    scaled_input = copy.deepcopy(input)



    # save loudness before and after scaling for the logger info

    loudness_before, scale_factor_new = get_loudness(

    loudness_before, scale_factor_new, loundness_fmt_used = get_loudness(

        scaled_input, target_loudness, loudness_format, rms

    )
@@ -264,7 +267,7 @@ def loudness_norm( 
        scaled_input.audio *= scale_factor_new



        # measure loudness and get scaling factor

        measured_loudness, scale_factor_new = get_loudness(

        measured_loudness, scale_factor_new, _ = get_loudness(

            scaled_input, target_loudness, loudness_format, rms

        )
@@ -276,11 +279,11 @@ def loudness_norm( 
    if logger:

        if file_name_logging:

            logger.debug(

                f"File {file_name_logging} loudness; before: {loudness_before}, after: {loudness_after}"

                f"File {file_name_logging} loudness; before: {loudness_before}, after: {loudness_after}, measured in format {loundness_fmt_used}"

            )

        else:

            logger.debug(

                f"Loudness; before: {loudness_before}, after: {loudness_after}"

                f"Loudness; before: {loudness_before}, after: {loudness_after}, measured in format {loundness_fmt_used}"

            )



    if num_iter >= 10:

ivas_processing_scripts/generation/process_ism_items.py

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ def generate_ism_items( 
            x.audio = x.audio[: N_frames * frame_len]



            # adjust the level of the source file

            _, scale_factor = get_loudness(x, cfg.loudness, "MONO")

            _, scale_factor, _ = get_loudness(x, cfg.loudness, "MONO")

            x.audio *= scale_factor



            # read azimuth information and create array

ivas_processing_scripts/generation/process_stereo_items.py

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ def generate_stereo_items( 
            x = reverb_stereo(x, IR)



            # adjust the level of the stereo signal

            _, scale_factor = get_loudness(x, cfg.loudness, "STEREO")

            _, scale_factor, _ = get_loudness(x, cfg.loudness, "STEREO")

            x.audio *= scale_factor



            # shift the second (and all other) source files (positive shift creates overlap, negative shift creates a gap)