From 2902408e555f2df89c873012d42fea15aad7762b Mon Sep 17 00:00:00 2001 From: Treffehn Date: Fri, 19 May 2023 17:03:04 +0200 Subject: [PATCH] fixed bug ISM metadata for concatenation but without preamble --- .../audiotools/metadata.py | 4 +-- .../processing/preprocessing_2.py | 34 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ivas_processing_scripts/audiotools/metadata.py b/ivas_processing_scripts/audiotools/metadata.py index 6c6466ec..436dc633 100755 --- a/ivas_processing_scripts/audiotools/metadata.py +++ b/ivas_processing_scripts/audiotools/metadata.py @@ -490,10 +490,10 @@ def check_ISM_metadata( except KeyError: current_item = in_meta[f"item{item_idx + 1}"] - if len(current_item) == 1: + if not isinstance(current_item, list): # automatic search in folder list_item = metadata_search( - current_item[0], [item_names[item_idx]], num_objects + current_item, [item_names[item_idx]], num_objects ) elif len(current_item) == num_objects: diff --git a/ivas_processing_scripts/processing/preprocessing_2.py b/ivas_processing_scripts/processing/preprocessing_2.py index 828218f0..0e84c447 100644 --- a/ivas_processing_scripts/processing/preprocessing_2.py +++ b/ivas_processing_scripts/processing/preprocessing_2.py @@ -66,23 +66,29 @@ class Preprocessing2(Processing): ) # add preamble - if self.preamble: - logger.debug(f"Add preamble of length {self.preamble}ms") - # also apply preamble to ISM metadata - if self.in_fmt.startswith("ISM"): - # read out old - metadata = [] - for meta in in_meta: - metadata.append(np.genfromtxt(meta, delimiter=",")) - # modify metadata - metadata = add_remove_preamble(metadata, self.preamble) - meta_files = write_ISM_metadata_in_file(metadata, [out_file], True) + # also apply preamble to ISM metadata + if self.in_fmt.startswith("ISM"): + if not self.preamble: + preamble = 0 + else: + preamble = self.preamble + + # read out old + metadata = [] + for meta in in_meta: + metadata.append(np.genfromtxt(meta, delimiter=",")) - # modify audio object - audio_object.metadata_files = meta_files - audio_object.obect_pos = metadata + # modify metadata + metadata = add_remove_preamble(metadata, preamble) + meta_files = write_ISM_metadata_in_file(metadata, [out_file], True) + # modify audio object + audio_object.metadata_files = meta_files + audio_object.obect_pos = metadata + + if self.preamble: + logger.debug(f"Add preamble of length {self.preamble}ms") # add preamble to actual signal audio_object.audio = trim( audio_object.audio, -- GitLab