Commit eea25d7b authored by multrus's avatar multrus
Browse files

Merge branch '9-add-support-for-20kbp-filter' into 'main' 

Resolve "Add support for 20KBP filter"

See merge request !30
parents a590ba1a 8da50732

README.md

+2 −2
Original line number Diff line number Diff line
@@ -193,8 +193,8 @@ input: 
# preprocessing:

    ### Target format used in rendering from input format; default = null (no rendering)

    # fmt: "7_1_4"

    ### Flag for application of 50Hz high-pass filter; default = false

    # hp50: true

    ### Define mask (HP50 or 20KBP) for input signal filtering; default = null

    # mask: "HP50"

    ### Target sampling rate in Hz for resampling; default = null (no resampling)

    # fs: 16000

    ### Target loudness in LKFS; default = null (no loudness change applied)

examples/TEMPLATE.yml

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ input: 
# preprocessing:

    ### Target format used in rendering from input format; default = null (no rendering)

    # fmt: "7_1_4"

    ### Flag for application of 50Hz high-pass filter; default = false

    # hp50: true

    ### Define mask (HP50 or 20KBP) for input signal filtering; default = null

    # mask: "HP50"

    ### Target sampling rate in Hz for resampling; default = null (no resampling)

    # fs: 16000

    ### Target loudness in LKFS; default = null (no loudness change applied)

ivas_processing_scripts/audiotools/__init__.py

+5 −4
Original line number Diff line number Diff line
@@ -79,10 +79,11 @@ def add_processing_args(group, input=True): 
        default=None,

    )

    group.add_argument(

        f"-{ps}hp",

        f"--{p}_hp50",

        help="Apply 50 Hz high-pass filtering (default = %(default)s)",

        action="store_true",

        f"-{ps}mk",

        f"--{p}_mask",

        type=str,

        help="Apply filtering with mask ((HP50, 20KBP or None; default = %(default)s)",

        default=None,

    )

    group.add_argument(

        f"-{ps}w",

ivas_processing_scripts/audiotools/constants.py

+1 −0
Original line number Diff line number Diff line
@@ -692,6 +692,7 @@ DELAY_COMPENSATION_FOR_FILTERING = { 
        "down": 145,

    },

    "MSIN": 92,

    "20KBP": 200,

    "LP1p5": 322,

    "LP35": 232,

    "LP7": 117,

ivas_processing_scripts/audiotools/convert/__init__.py

+10 −10
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ from ivas_processing_scripts.audiotools.convert.scenebased import convert_sceneb 
from ivas_processing_scripts.audiotools.wrappers.bs1770 import loudness_norm

from ivas_processing_scripts.audiotools.wrappers.esdru import esdru

from ivas_processing_scripts.audiotools.wrappers.filter import (

    hp50filter_itu,

    lpfilter_itu,

    maskfilter_itu,

    resample_itu,

)

from ivas_processing_scripts.audiotools.wrappers.p50fbmnru import p50fbmnru
@@ -133,7 +133,7 @@ def convert( 
    in_delay: Optional[float] = None,

    in_fs: Optional[int] = None,

    in_cutoff: Optional[int] = None,

    in_hp50: Optional[bool] = None,

    in_mask: Optional[str] = None,

    in_window: Optional[list] = None,

    in_loudness: Optional[float] = None,

    in_loudness_fmt: Optional[str] = None,
@@ -142,7 +142,7 @@ def convert( 
    out_delay: Optional[float] = None,

    out_fs: Optional[int] = None,

    out_cutoff: Optional[int] = None,

    out_hp50: Optional[bool] = None,

    out_mask: Optional[str] = None,

    out_window: Optional[list] = None,

    out_loudness: Optional[float] = None,

    out_loudness_fmt: Optional[str] = None,
@@ -162,7 +162,7 @@ def convert( 
        delay=in_delay,

        fs=in_fs,

        fc=in_cutoff,

        hp50=in_hp50,

        mask=in_mask,

        window=in_window,

        loudness=in_loudness,

        loudness_fmt=in_loudness_fmt,
@@ -180,7 +180,7 @@ def convert( 
        delay=out_delay,

        fs=out_fs,

        fc=out_cutoff,

        hp50=out_hp50,

        mask=out_mask,

        window=out_window,

        loudness=out_loudness,

        loudness_fmt=out_loudness_fmt,
@@ -198,7 +198,7 @@ def process_audio( 
    delay: Optional[float] = None,

    fs: Optional[int] = None,

    fc: Optional[int] = None,

    hp50: Optional[bool] = False,

    mask: Optional[str] = None,

    window: Optional[float] = None,

    loudness: Optional[float] = None,

    loudness_fmt: Optional[str] = None,
@@ -232,11 +232,11 @@ def process_audio( 
            logger.debug(f"Windowing audio with {window} ms Hann window")

        x.audio = audioarray.window(x.audio, x.fs, window)



    """high-pass (50 Hz) filtering"""

    if hp50:

    """mask filtering"""

    if mask is not None:

        if logger:

            logger.debug("Applying 50 Hz high-pass filter using ITU STL filter")

        x.audio = hp50filter_itu(x)

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

        x.audio = maskfilter_itu(x, mask)



    """resampling"""

    if x.fs != fs: