Commit 5ae85e52 authored by Anika Treffehn's avatar Anika Treffehn
Browse files

mostly formatting

parent 8e647446

examples/TEMPLATE.yml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
### REQUIRED: Input path or file

input_path: ".../ivas/items/HOA3"

### REQUIRED: Output path or file

output_path: ".../tmp_output"

output_path: ".../temp_output"

### Metadata path or file(s)

### If input format is ISM{1-4} a path for the metadata files can be specified;

### default = null (for ISM search for item_name.{wav, raw, pcm}.{0-3}.csv in input folder, otherise ignored)

ivas_processing_scripts/processing/chains.py

+3 −1
Original line number Diff line number Diff line
@@ -39,7 +39,9 @@ from ivas_processing_scripts.processing.ivas import IVAS, validate_sba_fmt 
from ivas_processing_scripts.processing.postprocessing import Postprocessing

from ivas_processing_scripts.processing.preprocessing import Preprocessing

from ivas_processing_scripts.processing.preprocessing_2 import Preprocessing2

from ivas_processing_scripts.processing.processing_splitting_scaling import Processing_splitting_scaling

from ivas_processing_scripts.processing.processing_splitting_scaling import (

    Processing_splitting_scaling,

)

from ivas_processing_scripts.utils import get_abs_path, list_audio

ivas_processing_scripts/processing/evs.py

+12 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import platform 
from itertools import repeat

from pathlib import Path

from shutil import copyfile

from typing import Optional, Union, Tuple

from typing import Optional, Tuple, Union



from ivas_processing_scripts.audiotools import audio

from ivas_processing_scripts.audiotools.audiofile import (
@@ -205,7 +205,9 @@ class EVS(Processing): 
        # run processing

        split_chan_bs = [f.with_suffix(".192") for f in split_chan_files]

        split_chan_out = [f.with_suffix(".pcm") for f in split_chan_files]

        split_chan_out_noerror = [f.with_suffix(".noerror.pcm") for f in split_chan_files]

        split_chan_out_noerror = [

            f.with_suffix(".noerror.pcm") for f in split_chan_files

        ]



        # run all encoders

        logger.debug(f"Running EVS encoders for {out_file.stem.split('.')[0]}")
@@ -257,7 +259,12 @@ class EVS(Processing): 
            combine(split_chan_out, out_file, in_fs=self.out_fs, is_planar=is_planar)

            if split_chan_bs_unprocessed != split_chan_bs and self.tx_condition:

                out_file_unprocessed = f"{Path(out_file.parent).joinpath(Path(out_file.name).with_suffix(''))}.noerror{out_file.suffix}"

                combine(split_chan_out_noerror, out_file_unprocessed, in_fs=self.out_fs, is_planar=is_planar)

                combine(

                    split_chan_out_noerror,

                    out_file_unprocessed,

                    in_fs=self.out_fs,

                    is_planar=is_planar,

                )

            # copy ISM metadata for ISM pass-through

            if in_meta:

                for idx in range(len(in_meta)):

ivas_processing_scripts/processing/ivas.py

+9 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import logging 
import os.path

import platform

from pathlib import Path

from typing import Optional, Union, Tuple

from typing import Optional, Tuple, Union



from ivas_processing_scripts.audiotools import audio

from ivas_processing_scripts.audiotools.audiofile import parse_wave_header, read
@@ -132,7 +132,9 @@ class IVAS(Processing): 
        # decode twice with and without bitstream errors

        self.dec(bitstream, out_file, voip=voip, logger=logger)

        if bitstream_noerror != bitstream and self.tx_condition:

            out_file_unprocessed = Path(f"{out_file.parent.joinpath(out_file.stem)}.noerror{out_file.suffix}")

            out_file_unprocessed = Path(

                f"{out_file.parent.joinpath(out_file.stem)}.noerror{out_file.suffix}"

            )

            self.dec(bitstream_noerror, out_file_unprocessed, voip=False, logger=logger)



    def enc(
@@ -269,7 +271,11 @@ class IVAS(Processing): 
            return bitstream, False



    def dec(

        self, bitstream: Path, out_file: Path, voip=False, logger: Optional[logging.Logger] = None

        self,

        bitstream: Path,

        out_file: Path,

        voip=False,

        logger: Optional[logging.Logger] = None,

    ) -> None:

        logger.debug(f"IVAS decoder {bitstream} -> {out_file}")

ivas_processing_scripts/processing/postprocessing.py

+5 −1
Original line number Diff line number Diff line
@@ -66,5 +66,9 @@ class Postprocessing(Processing): 
            else:

                in_meta_noerror = None

            convert.convert_file(

                in_file_no_error, out_file_no_error, logger=logger, in_meta=in_meta_noerror, **self.__dict__

                in_file_no_error,

                out_file_no_error,

                logger=logger,

                in_meta=in_meta_noerror,

                **self.__dict__,

            )