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

adjustments in preprocessing steps

parent 40192caa
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ class Preprocessing2(Processing):
            self.in_fmt, in_file, fs=self.in_fs, in_meta=in_meta
        )

        if isinstance(audio_object, audio.MetadataAssistedSpatialAudio) or isinstance(audio_object, audio.OMASAAudio):
            if self.preamble > 0 or self.background_noise or self.repeat_signal:
                raise ValueError("No preprocessing 2 possible for formats including MASA metadata")

        # modify ISM metadata
        if self.in_fmt.startswith("ISM"):
            if not self.preamble:
+12 −2
Original line number Diff line number Diff line
@@ -123,8 +123,18 @@ def concat_setup(cfg: TestConfig, chain, logger: logging.Logger):

    logger.info(f"Concatenating input files in directory {cfg.input_path}")

    # derive input format to preprocessing 2 (either input or preprocessing format)
    try:
        input_format = cfg.preprocessing.get("fmt", cfg.input["fmt"])
    except AttributeError:
        input_format = cfg.input["fmt"]

    # concatenation of met files not possible -> do not concatenate MASA and OMASA
    if "MASA" in input_format:
        raise ValueError("Concatenation of formats including MASA metadata not possible")

    # concatenate ISM metadata
    if cfg.input["fmt"].startswith("ISM"):
    if input_format.startswith("ISM"):
        cfg.concat_meta = []
        for obj_idx in range(len(cfg.metadata_path[0])):
            cfg.concat_meta.append(
@@ -136,7 +146,7 @@ def concat_setup(cfg: TestConfig, chain, logger: logging.Logger):
            cfg.items_list,
            cfg.metadata_path,
            cfg.concat_meta,
            cfg.input["fmt"],
            input_format,
        )

        # set input to the concatenated file we have just written to the output dir