Commit 7150b926 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch... 

Merge branch '119-characterization-bs1534-19-for-conditions-c07-c08-pcm-at-evs_dec-out-mistakenly-interpreted-as' into 'main'

Resolve "[characterization] BS1534-19: For conditions c07/c08, PCM at EVS_dec out mistakenly interpreted as Stereo"

See merge request !226
parents 9c2da4e9 8261c75c

README.md

+7 −0
Original line number Diff line number Diff line
@@ -91,9 +91,15 @@ Notes: 
- This can be somewhat worked around with a shell loop, but please note this can make finding an error more difficult:



```sh

# for POSIX shells

for config in $(ls experiments/characterization/P800-1/config/*.yml); do python3 -m ivas_processing_scripts $config; done

```



```batch

:: for cmd

for %f in (experiments\characterization\P800-1\config\*.yml) do python -m ivas_processing_scripts "%f"

```



## Follow up tasks



After the processing is finished, the outputs will be present in the respective `proc_output` directories.
@@ -525,6 +531,7 @@ conditions_to_generate: 
      ### Encoder input sampling rate in Hz (resampling performed in case of mismatch); default = null (no resampling)

      # fs: 32000

      ### Additional commandline options; default = null

      ### NOTE: if using -stereo_dmx_evs ensure you specify dec:fmt as MONO to avoid errors

      # opts: ["-q", "-dtx", 4]

      ### Extended metadata flag for ISM > 64kbps, ignored otherwise; default = false

      # extended_metadata: true

examples/TEMPLATE.yml

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ conditions_to_generate: 
          ### Encoder input sampling rate in Hz (resampling performed in case of mismatch); default = null (no resampling)

          # fs: 32000

          ### Additional commandline options; default = null

          ### NOTE: if using -stereo_dmx_evs ensure you specify dec:fmt as MONO to avoid errors

          # opts: ["-q", "-dtx", 4]

          ### Input format conversion, if encoding a different format

          # fmt: "FOA"

experiments/characterization/BS1534-19/config/BS1534-19.yml

+3 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ conditions_to_generate: 
    c02:

        type: lp3k5

        ivas_rend:

            fmt: STEREO

            fmt: MONO

    ### Dual EVS + static dmx ###

    c03:

        type: evs
@@ -111,6 +111,7 @@ conditions_to_generate: 
                - -stereo_dmx_evs

        dec:

            bin: ivas_processing_scripts/bin/EVS_dec_fx

            fmt: MONO

    c08:

        type: ivas

        ivas_rend:
@@ -123,6 +124,7 @@ conditions_to_generate: 
                - -stereo_dmx_evs

        dec:

            bin: ivas_processing_scripts/bin/EVS_dec_fx

            fmt: MONO



################################################

### Post-processing

ivas_processing_scripts/audiotools/convert/__init__.py

+7 −3
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ from typing import Optional, Union 
from warnings import warn



from ivas_processing_scripts.audiotools import audio, audioarray, metadata

from ivas_processing_scripts.audiotools.audiofile import write

from ivas_processing_scripts.audiotools.audioarray import lpfilter

from ivas_processing_scripts.audiotools.audiofile import write

from ivas_processing_scripts.audiotools.convert.channelbased import convert_channelbased

from ivas_processing_scripts.audiotools.convert.masa import convert_masa

from ivas_processing_scripts.audiotools.convert.objectbased import convert_objectbased
@@ -344,9 +344,13 @@ def process_audio( 
                )

            x.audio = lpfilter_itu(x, fc)

        except NotImplementedError:

            warn(f"Low-pass filter cutoff {fc}Hz not supported by ITU filter. Falling back to python implementation.")

            warn(

                f"Low-pass filter cutoff {fc}Hz not supported by ITU filter. Falling back to python implementation."

            )

            if logger:

                logger.debug(f" Applying low-pass filter with cutoff {fc}Hz using python")

                logger.debug(

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

                )

            x.audio = lpfilter(x.audio, fc, x.fs)



    """MNRU"""

ivas_processing_scripts/audiotools/wrappers/filter.py

+3 −1
Original line number Diff line number Diff line
@@ -232,7 +232,9 @@ def lpfilter_itu( 
    try:

        flt_type = flt_types[flt_vals.index(fc)]

    except ValueError as e:

        raise NotImplementedError(f"LP cut-off frequency {fc}Hz not supported by ITU filter.") from e

        raise NotImplementedError(

            f"LP cut-off frequency {fc}Hz not supported by ITU filter."

        ) from e



    # resample if samplingrate is not supported

    old_fs = None