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

fixed some merge problems

parent a0d5454b

ivas_processing_scripts/processing/chains.py

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ def get_processing_chain( 
            {

                "fs": post_cfg["fs"],

                "in_fmt": post_cfg["fmt"],

                "out_fmt": post_cfg["fmt"],  # no rendering here

                "out_fmt": post_fmt,  # no rendering here

                "concatenate_input": pre2_cfg.get("concatenate_input", False),

                "preamble": pre2_cfg.get("preamble", 0),

                "repeat_signal": pre2_cfg.get("repeat_signal", False),

ivas_processing_scripts/processing/evs.py

+7 −7
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ class EVS(Processing): 
                    is_planar=is_planar,

                )

            # copy ISM metadata for ISM pass-through

            if in_meta:

            if isinstance(self.in_fmt, audio.ObjectBasedAudio):

                for idx in range(len(in_meta)):

                    out_file_meta = (

                        out_file.parent
@@ -277,12 +277,12 @@ class EVS(Processing): 
                md_file_out = out_file.parent / (out_file.name + ".met")

                copyfile(md_file_in, md_file_out)

                # TODO: add next part for MASA

                 #if split_chan_bs_unprocessed != split_chan_bs and self.tx_condition:

                       # out_file_meta_unprocessed = (

                            #out_file.parent

                            #/ f"{out_file.stem.split('.')[0]}.evs.noerror{out_file.suffix}.{idx}.csv"

                        #)

                       # copyfile(in_meta[idx], out_file_meta_unprocessed)

                if split_chan_bs_unprocessed != split_chan_bs and self.tx_condition:

                    out_file_meta_unprocessed = (

                        out_file.parent

                        / f"{out_file.stem.split('.')[0]}.evs.noerror{out_file.suffix}.{idx}.csv"

                    )

                    copyfile(in_meta[idx], out_file_meta_unprocessed)



        elif out_file.suffix == ".txt":

            raise NotImplementedError(".txt file support is WIP")

ivas_processing_scripts/processing/postprocessing.py

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ class Postprocessing(Processing): 
        if self.tx_condition:

            in_file_no_error = Path(f"{in_file.with_suffix('')}.noerror.wav")

            out_file_no_error = Path(f"{out_file.with_suffix('')}.noerror.wav")

            # TODO: also copy MASA metadata

            if in_meta:

                in_meta_noerror = []

                for meta in in_meta:

ivas_processing_scripts/processing/processing.py

+0 −7
Original line number Diff line number Diff line
@@ -169,13 +169,6 @@ def concat_teardown(x, splits, out_fmt, fs, in_fs, meta, logger: logging.Logger) 
    if not splits:

        raise ValueError("Splitting not possible without split marker")



    output_format = cfg.postprocessing["fmt"]

    if isinstance(output_format, list):

        output_format = output_format[-1]



    out_files = []

    out_meta = []



    if logger:

        logger.debug("Split files")