From c353d3fc289d4c3dc147dbc56724d89cd466860e Mon Sep 17 00:00:00 2001 From: Treffehn Date: Wed, 10 May 2023 12:12:33 +0200 Subject: [PATCH] replaced individual seeds with one prerun seed in general options --- README.md | 6 ++---- examples/TEMPLATE.yml | 8 +++----- ivas_processing_scripts/constants.py | 1 + ivas_processing_scripts/processing/chains.py | 6 +++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index c8732be1..2a488dde 100755 --- a/README.md +++ b/README.md @@ -133,6 +133,8 @@ postprocessing: # delete_tmp: true ### Master seed for random processes like bitstream error pattern generation; default = 0 # master_seed: 5 +### Additional seed to specify number of preruns (used for background noise delay and FER bitstream processing); default = 0 +# prerun_seed: 2 ### Any relative paths will be interpreted relative to the working directory the script is called from! ### Usage of absolute paths is recommended. @@ -241,8 +243,6 @@ input: # snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) # background_noise_path: ".../noise.wav" - ### Seed for delay offest; default = 0 - # seed_delay: 10 ``` @@ -275,8 +275,6 @@ input: # error_pattern: "path/pattern.192" ### Error rate in percent # error_rate: 5 - ### Additional seed to specify number of preruns; default = 0 - # prerun_seed: 2 ``` diff --git a/examples/TEMPLATE.yml b/examples/TEMPLATE.yml index 83901013..b570718f 100755 --- a/examples/TEMPLATE.yml +++ b/examples/TEMPLATE.yml @@ -16,6 +16,8 @@ # delete_tmp: true ### Master seed for random processes like bitstream error pattern generation; default = 0 # master_seed: 5 +### Additional seed to specify number of preruns (used for background noise delay and FER bitstream processing); default = 0 +# prerun_seed: 2 ### Any relative paths will be interpreted relative to the working directory the script is called from! ### Usage of absolute paths is recommended. @@ -108,8 +110,6 @@ input: # snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) # background_noise_path: ".../noise.wav" - ### Seed for delay offest; default = 0 - # seed_delay: 10 ################################################# ### Bitstream processing @@ -136,8 +136,6 @@ input: # error_pattern: "path/pattern.192" ### Error rate in percent # error_rate: 5 - ### Additional seed to specify number of preruns; default = 0 - # prerun_seed: 2 ################################################ ### Configuration for conditions under test @@ -248,7 +246,7 @@ conditions_to_generate: # - 9600 - [13200, 13200, 8000, 13200, 9600] ### for multi-channel configs, code LFE with 9.6 kbps NB (as mandated by IVAS-3) - evs_lfe_9k6bps_nb: true + # evs_lfe_9k6bps_nb: true ### Encoder options cod: ### Path to encoder binary; default search for EVS_cod in bin folder (primary) and PATH (secondary) diff --git a/ivas_processing_scripts/constants.py b/ivas_processing_scripts/constants.py index f89e8589..8f260bb1 100755 --- a/ivas_processing_scripts/constants.py +++ b/ivas_processing_scripts/constants.py @@ -60,6 +60,7 @@ DEFAULT_CONFIG = { "multiprocessing": True, "delete_tmp": False, "master_seed": 0, + "prerun_seed": 0, "metadata_path": None, # postprocessing "postprocessing": { diff --git a/ivas_processing_scripts/processing/chains.py b/ivas_processing_scripts/processing/chains.py index bfa80451..98276087 100755 --- a/ivas_processing_scripts/processing/chains.py +++ b/ivas_processing_scripts/processing/chains.py @@ -140,7 +140,7 @@ def get_preprocessing_2(cfg: TestConfig) -> dict: "background_noise_path": get_abs_path( background_cfg.get("background_noise_path", None) ), - "seed_delay": background_cfg.get("seed_delay", 0), + "seed_delay": cfg.prerun_seed, "master_seed": cfg.master_seed, "output_fmt": cfg.postprocessing["fmt"], "background_object": None, @@ -262,7 +262,7 @@ def get_processing_chain( ), "error_rate": tx_cfg_tmp.get("error_rate", None), "master_seed": cfg.master_seed, - "prerun_seed": tx_cfg_tmp.get("prerun_seed", 0), + "prerun_seed": cfg.prerun_seed, } elif tx_cfg_tmp.get("type", None) == "JBM": tx_cfg = { @@ -336,7 +336,7 @@ def get_processing_chain( ), "error_rate": tx_cfg_tmp.get("error_rate", None), "master_seed": cfg.master_seed, - "prerun_seed": tx_cfg_tmp.get("prerun_seed", 0), + "prerun_seed": cfg.prerun_seed, } elif tx_cfg_tmp.get("type", None) == "JBM": tx_cfg = { -- GitLab