Commit a262b1f2 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'add-missing-logging' into 'main' 

Pass down logger handle to run() calls in places where it is missing

See merge request !237
parents 823a56f8 70d44d64

ivas_processing_scripts/audiotools/audio.py

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ from typing import Optional, Union 
from warnings import warn



import numpy as np



from ivas_processing_scripts.audiotools.audiofile import read

from ivas_processing_scripts.audiotools.constants import (

    BINAURAL_AUDIO_FORMATS,

ivas_processing_scripts/audiotools/binaural_datasets/binaural_dataset.py

+1 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ from typing import Optional, Tuple, Union 
from warnings import warn



import numpy as np

from scipy.io import loadmat



from ivas_processing_scripts.audiotools.audio import fromtype

from ivas_processing_scripts.audiotools.constants import (

    CHANNEL_BASED_AUDIO_FORMATS,
@@ -44,6 +42,7 @@ from ivas_processing_scripts.audiotools.constants import ( 
    SCENE_BASED_AUDIO_FORMATS,

)

from ivas_processing_scripts.audiotools.EFAP import wrap_angles

from scipy.io import loadmat





def load_hrtf(

ivas_processing_scripts/audiotools/binauralobjectrenderer.py

+2 −3
Original line number Diff line number Diff line
@@ -35,14 +35,13 @@ from itertools import repeat 
from typing import Optional, Tuple



import numpy as np

from scipy.signal import convolve



from ivas_processing_scripts.audiotools.binaural_datasets.binaural_dataset import (

    find_ir,

)

from ivas_processing_scripts.audiotools.constants import IVAS_FRAME_LEN_MS

from ivas_processing_scripts.audiotools.EFAP import wrap_angles

from ivas_processing_scripts.utils import apply_func_parallel

from scipy.signal import convolve





def barycentric_weights(

ivas_processing_scripts/audiotools/convert/__init__.py

+5 −5
Original line number Diff line number Diff line
@@ -326,13 +326,13 @@ def process_audio( 
    if mask is not None:

        if logger:

            logger.debug("Applying mask filter using ITU STL filter")

        x.audio = maskfilter_itu(x, mask)

        x.audio = maskfilter_itu(x, mask, logger=logger)



    """resampling"""

    if x.fs != fs:

        if logger:

            logger.debug(f"Resampling from {x.fs} to {fs} using ITU STL filter")

        x.audio = resample_itu(x, fs)

        x.audio = resample_itu(x, fs, logger=logger)

        x.fs = fs



    """low-pass filtering"""
@@ -342,7 +342,7 @@ def process_audio( 
                logger.debug(

                    f"Applying low-pass filter with cutoff {fc}Hz using ITU STL filter"

                )

            x.audio = lpfilter_itu(x, fc)

            x.audio = lpfilter_itu(x, fc, logger=logger)

        except NotImplementedError:

            warn(

                f"Low-pass filter cutoff {fc}Hz not supported by ITU filter. Falling back to python implementation."
@@ -357,13 +357,13 @@ def process_audio( 
    if mnru_q is not None:

        if logger:

            logger.debug("Applying P.50 Fullband MNRU")

        x.audio = p50fbmnru(x, mnru_q)

        x.audio = p50fbmnru(x, mnru_q, logger=logger)



    """ESDRU"""

    if esdru_alpha is not None:

        if logger:

            logger.debug("Applying ESDRU Recommendation ITU-T P.811")

        x.audio = esdru(x, esdru_alpha)

        x.audio = esdru(x, esdru_alpha, logger=logger)



    """Spatial distortion"""

    if (

ivas_processing_scripts/audiotools/convert/channelbased.py

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ from pathlib import Path 
from typing import Optional, Tuple, Union



import numpy as np



from ivas_processing_scripts.audiotools import audio

from ivas_processing_scripts.audiotools.audioarray import delay, framewise_io

from ivas_processing_scripts.audiotools.binaural_datasets.binaural_dataset import (