Commit c861ca0a authored by Jan Kiene's avatar Jan Kiene
Browse files

apply formatting diff from pipeline

parent e49676ee

ivas_processing_scripts/audiotools/binaural_datasets/binaural_dataset.py

+16 −4
Original line number Diff line number Diff line
@@ -142,15 +142,27 @@ def load_ir( 
            if in_fmt == "SBA1" or in_fmt == "FOA":

                dataset_suffix = "SBA1"

                # Use truncated SBA3 dataset if no SBA1 or 2 dataset exists

                if not (Path(__file__).parent.joinpath(f"{dataset_prefix}_{dataset}_{dataset_suffix}.mat")).is_file():

                if not (

                    Path(__file__).parent.joinpath(

                        f"{dataset_prefix}_{dataset}_{dataset_suffix}.mat"

                    )

                ).is_file():

                    dataset_suffix = "SBA3"

                    warnings.warn(f"No SBA1 dataset found -> use truncated SBA3 dataset")

                    warnings.warn(

                        f"No SBA1 dataset found -> use truncated SBA3 dataset"

                    )

            elif in_fmt.endswith("2"):

                dataset_suffix = "SBA2"

                # Use truncated SBA3 dataset if no SBA1 or 2 dataset exists

                if not (Path(__file__).parent.joinpath(f"{dataset_prefix}_{dataset}_{dataset_suffix}.mat")).is_file():

                if not (

                    Path(__file__).parent.joinpath(

                        f"{dataset_prefix}_{dataset}_{dataset_suffix}.mat"

                    )

                ).is_file():

                    dataset_suffix = "SBA3"

                    warnings.warn(f"No SBA2 dataset found -> use truncated SBA3 dataset")

                    warnings.warn(

                        f"No SBA2 dataset found -> use truncated SBA3 dataset"

                    )

            else:

                dataset_suffix = "SBA3"

ivas_processing_scripts/audiotools/convert/__init__.py

+4 −2
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ from ivas_processing_scripts.audiotools.convert.masa import convert_masa 
from ivas_processing_scripts.audiotools.convert.objectbased import convert_objectbased

from ivas_processing_scripts.audiotools.convert.scenebased import convert_scenebased

from ivas_processing_scripts.audiotools.wrappers.bs1770 import loudness_norm

from ivas_processing_scripts.audiotools.wrappers.esdru import esdru

from ivas_processing_scripts.audiotools.wrappers.filter import (

    hp50filter_itu,

    lpfilter_itu,

    resample_itu,

)

from ivas_processing_scripts.audiotools.wrappers.esdru import esdru

from ivas_processing_scripts.audiotools.wrappers.p50fbmnru import p50fbmnru



from ..metadata import write_ISM_metadata_in_file
@@ -294,7 +294,9 @@ def format_conversion( 
    if logger:

        logger.debug(f"Format conversion: {input.name} -> {output.name}")



    if input.name == output.name or (input.name.startswith("BINAURAL") and output.name.startswith("BINAURAL")):

    if input.name == output.name or (

        input.name.startswith("BINAURAL") and output.name.startswith("BINAURAL")

    ):

        output.audio = input.audio

    else:

        if isinstance(input, audio.BinauralAudio):

ivas_processing_scripts/audiotools/convert/channelbased.py

+0 −2
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ def render_cba_to_binaural( 
def render_cba_to_cba(

    cba_in: audio.ChannelBasedAudio, cba_out: audio.ChannelBasedAudio

) -> None:



    # Stereo to Mono

    if cba_in.name == "STEREO" and cba_out.name == "MONO":

        render_mtx = np.vstack([[0.5], [0.5]])
@@ -244,7 +243,6 @@ def render_cba_to_cba( 




def render_cba_to_sba(cba: audio.ChannelBasedAudio, sba: audio.SceneBasedAudio) -> None:



    if cba.name == "MONO":

        raise ValueError(f"Rendering from MONO to {sba.name} is not supported.")

ivas_processing_scripts/audiotools/metadata.py

+6 −1
Original line number Diff line number Diff line
@@ -412,7 +412,12 @@ def split_meta_in_file( 
            # remove preamble

            if preamble:

                preamble_frames = int(preamble / IVAS_FRAME_LEN_MS)

                y = trim(audio_object.object_pos[obj], audio_object.fs, (preamble_frames, 0), samples=True)

                y = trim(

                    audio_object.object_pos[obj],

                    audio_object.fs,

                    (preamble_frames, 0),

                    samples=True,

                )

            else:

                y = audio_object.object_pos[obj]

ivas_processing_scripts/constants.py

+10 −1
Original line number Diff line number Diff line
@@ -40,7 +40,16 @@ LOGGER_FORMAT = ( 
)

LOGGER_DATEFMT = "%m-%d %H:%M:%S"



SUPPORTED_CONDITIONS = {"ref", "lp3k5", "lp7k", "mnru", "esdru", "evs", "ivas", "mono_dmx"}

SUPPORTED_CONDITIONS = {

    "ref",

    "lp3k5",

    "lp7k",

    "mnru",

    "esdru",

    "evs",

    "ivas",

    "mono_dmx",

}



DEFAULT_CONFIG = {

    # general options