Commit 70ac6c44 authored by Anika Treffehn's avatar Anika Treffehn
Browse files

Merge branch 'main' of... 

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts into background_noise
parents e29184a7 0af0e852

ivas_processing_scripts/audiotools/audioarray.py

+6 −6
Original line number Diff line number Diff line
@@ -85,30 +85,30 @@ def trim( 
        pre_trim = limits[0]

        post_trim = limits[1]



    if pre_trim <= 0:

    if pre_trim < 0:

        if pad_noise:

            # pad with uniformly distributed noise between -4 and 4

            np.random.seed(SEED_PADDING)

            noise = np.random.randint(

                low=-4, high=5, size=(np.abs(pre_trim), np.shape(x)[1])

            ).astype("float")

            x = np.concatenate((x, noise), axis=0)

            x = np.concatenate((noise, x), axis=0)

        else:

            x = np.pad(x, [[np.abs(pre_trim), 0], [0, 0]])

    else:

    elif pre_trim > 0:

        x = x[pre_trim:, :]



    if post_trim <= 0:

    if post_trim < 0:

        if pad_noise:

            # pad with uniformly distributed noise between -4 and 4

            np.random.seed(SEED_PADDING)

            noise = np.random.randint(

                low=-4, high=5, size=(np.abs(post_trim), np.shape(x)[1])

            ).astype("float")

            x = np.concatenate((noise, x), axis=0)

            x = np.concatenate((x, noise), axis=0)

        else:

            x = np.pad(x, [[0, np.abs(post_trim)], [0, 0]])

    else:

    elif post_trim > 0:

        x = x[:-post_trim, :]



    return x

ivas_processing_scripts/audiotools/audiofile.py

+2 −1
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ def concat( 
    silence_pre: int,

    silence_post: int,

    in_fs: Optional[int] = 48000,

    num_channels: Optional[int] = None,

    pad_noise: Optional[bool] = False,

    preamble: Optional[int] = None,

    pad_noise_preamble: Optional[bool] = False,
@@ -189,7 +190,7 @@ def concat( 


    # Read input files

    for in_file in in_filenames:

        x, fs = read(in_file, fs=in_fs)

        x, fs = read(in_file, fs=in_fs, nchannels=num_channels)

        if fs_compare and fs_compare != fs:

            raise ValueError("Sampling rates of files to concatenate don't match")

        else:

ivas_processing_scripts/processing/processing.py

+11 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ from shutil import copyfile 
from typing import Iterable, Union

from warnings import warn



from ivas_processing_scripts.audiotools import audio

from ivas_processing_scripts.audiotools.audiofile import concat, split

from ivas_processing_scripts.audiotools.metadata import (

    concat_meta_from_file,
@@ -108,12 +109,21 @@ def concat_setup(cfg: TestConfig, logger: logging.Logger): 
        f"{cfg.input_path.name}_concatenated.wav"

    )



    # determine number of channels for pcm and raw files

    if hasattr(cfg, "preprocessing"):

        tmp_in_fmt = cfg.preprocessing.get("fmt", cfg.input["fmt"])

    else:

        tmp_in_fmt = cfg.input["fmt"]

    tmp_audio = audio.fromtype(tmp_in_fmt)

    tmp_num_chans = tmp_audio.num_channels



    cfg.splits = concat(

        cfg.items_list,

        cfg.concat_file,

        cfg.concat_silence.get("pre", 0),

        cfg.concat_silence.get("post", 0),

        cfg.input.get("fs", 48000),

        in_fs=cfg.input.get("fs", 48000),

        num_channels=tmp_num_chans,

        preamble=cfg.preamble,

        pad_noise_preamble=cfg.pad_noise_preamble,

    )

ivas_processing_scripts/utils.py

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ from pathlib import Path 
from shutil import which

from typing import Callable, Iterable, Optional, Union



ALLOWED_INPUT_EXT = (".wav", ".pcm", ".txt")

ALLOWED_INPUT_EXT = (".wav", ".pcm", ".txt", ".raw")

BIN_DIR = Path(__file__).parent.joinpath("bin")