diff --git a/README.md b/README.md index c0bebb30c795dcc0a8d7afc8c8e075ec677a65b4..fc4c0347969d3d316ddf5bcab3a3829017aff790 100755 --- a/README.md +++ b/README.md @@ -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 diff --git a/examples/TEMPLATE.yml b/examples/TEMPLATE.yml index fe7e1ec2e5d1a031b0a600722473be6256be7e25..37509a8b4995a6d691ef5099bcce474aab9d6f32 100755 --- a/examples/TEMPLATE.yml +++ b/examples/TEMPLATE.yml @@ -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" diff --git a/experiments/characterization/BS1534-19/config/BS1534-19.yml b/experiments/characterization/BS1534-19/config/BS1534-19.yml index ef3bebb9ed6b18547c1c218427c4e0fe094e198a..ba2d574c602c533659aff61f5dd6f3ab0c2243d9 100644 --- a/experiments/characterization/BS1534-19/config/BS1534-19.yml +++ b/experiments/characterization/BS1534-19/config/BS1534-19.yml @@ -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 diff --git a/ivas_processing_scripts/audiotools/convert/__init__.py b/ivas_processing_scripts/audiotools/convert/__init__.py index 953742d39eb0e300af54b9a79f482804a5f47572..c24394d61f8848f55765886791bcd322c3d48658 100755 --- a/ivas_processing_scripts/audiotools/convert/__init__.py +++ b/ivas_processing_scripts/audiotools/convert/__init__.py @@ -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""" diff --git a/ivas_processing_scripts/audiotools/wrappers/filter.py b/ivas_processing_scripts/audiotools/wrappers/filter.py index 5d79fc001733542d90626e6bd3cc5f25127351c5..180155913d294ead40df92d09517033761cdfcca 100755 --- a/ivas_processing_scripts/audiotools/wrappers/filter.py +++ b/ivas_processing_scripts/audiotools/wrappers/filter.py @@ -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