Commit 8998f3e0 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

fix Flake8 errors

parent c95ffcec

ivas_processing_scripts/__init__.py

+5 −6
Original line number Diff line number Diff line
@@ -108,8 +108,7 @@ def main(args): 
        # Re-ordering items based on concatenation order

        if hasattr(cfg, "preprocessing_2"):

            if (

                cfg.preprocessing_2.get("concatenate_input")

                and cfg.preprocessing_2.get("concatenation_order", None) is not None

                cfg.preprocessing_2.get("concatenate_input") and cfg.preprocessing_2.get("concatenation_order", None) is not None

            ):

                cfg.items_list = reorder_items_list(

                    cfg.items_list, cfg.preprocessing_2["concatenation_order"]
@@ -169,10 +168,10 @@ def main(args): 
            cfg.pre2 = cfg.proc_chains[0]["processes"][0]

            # preprocess background noise

            if (

                hasattr(cfg, "preprocessing")

                and hasattr(cfg.pre2, "background_noise")

                and cfg.pre2.background_noise is not None

                and cfg.pre2.background_noise.get("background_noise_path")

                hasattr(cfg, "preprocessing") and

                hasattr(cfg.pre2, "background_noise") and

                cfg.pre2.background_noise is not None and

                cfg.pre2.background_noise.get("background_noise_path")

            ):

                preprocess_background_noise(cfg)

            # preprocess 2

ivas_processing_scripts/generation/config.py

+1 −3
Original line number Diff line number Diff line
@@ -30,10 +30,8 @@ 
#  the United Nations Convention on Contracts on the International Sales of Goods.

#



from copy import deepcopy

from pathlib import Path



import yaml

from copy import deepcopy



from ivas_processing_scripts.generation.constants import DEFAULT_CONFIG, REQUIRED_KEYS

ivas_processing_scripts/generation/generate_ambi_items.py

+2 −8
Original line number Diff line number Diff line
@@ -31,20 +31,15 @@ 
#



import logging

import os

from itertools import groupby, repeat

from math import floor

from pathlib import Path



import numpy as np



from ivas_processing_scripts.audiotools import audio, audioarray, audiofile, convert

from ivas_processing_scripts.audiotools.convert.objectbased import convert_objectbased

from ivas_processing_scripts.audiotools import audio, audioarray, audiofile

from ivas_processing_scripts.audiotools.convert.scenebased import convert_scenebased

from ivas_processing_scripts.audiotools.wrappers.bs1770 import (

    get_loudness,

    loudness_norm,

)

from ivas_processing_scripts.audiotools.wrappers.bs1770 import loudness_norm

from ivas_processing_scripts.audiotools.wrappers.reverb import (

    reverb_foa,

    reverb_hoa2,
@@ -275,7 +270,6 @@ def generate_ambi_scene( 


        # get the number of frames (multiple of 20ms)

        frame_len = int(x.fs / 50)

        N_frames = int(len(x.audio) / frame_len)



        # pad with zeros to ensure that the signal length is a multiple of 20ms

        if len(x.audio) % frame_len != 0:

ivas_processing_scripts/generation/generate_osba_items.py

+1 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


import csv

import logging

import os

import sys

from itertools import groupby, repeat

from math import floor
@@ -42,11 +41,7 @@ import numpy as np 


from ivas_processing_scripts.audiotools import audio, audioarray, audiofile

from ivas_processing_scripts.audiotools.convert.osba import convert_osba

from ivas_processing_scripts.audiotools.convert.scenebased import render_sba_to_masa

from ivas_processing_scripts.audiotools.wrappers.bs1770 import (

    get_loudness,

    loudness_norm,

)

from ivas_processing_scripts.audiotools.wrappers.bs1770 import loudness_norm

from ivas_processing_scripts.generation import config

from ivas_processing_scripts.utils import apply_func_parallel
@@ -327,7 +322,6 @@ def generate_OSBA_scene( 
        y.audio += noise



    # generate ISM metadata files

    y_meta = None

    for i in range(1, N_ISMs + 1):

        # parse metadata parameters from the scene description

        source_azi = (

ivas_processing_scripts/generation/generate_stereo_items.py

+1 −5
Original line number Diff line number Diff line
@@ -39,10 +39,7 @@ from pathlib import Path 
import numpy as np



from ivas_processing_scripts.audiotools import audio, audioarray, audiofile

from ivas_processing_scripts.audiotools.wrappers.bs1770 import (

    get_loudness,

    loudness_norm,

)

from ivas_processing_scripts.audiotools.wrappers.bs1770 import loudness_norm

from ivas_processing_scripts.audiotools.wrappers.reverb import reverb_stereo

from ivas_processing_scripts.generation import config

from ivas_processing_scripts.utils import apply_func_parallel
@@ -268,7 +265,6 @@ def generate_stereo_scene( 


        # get the number of frames (multiple of 20ms)

        frame_len = int(x.fs / 50)

        N_frames = int(len(x.audio) / frame_len)



        # pad with zeros to ensure that the signal length is a multiple of 20ms

        if len(x.audio) % frame_len != 0: