From e672ba1a9a4b941452aabc07b6ba99fe3e888b80 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 2 Jun 2023 10:53:20 +0200 Subject: [PATCH 01/33] add script for programmatice config generation --- experiments/__init__.py | 0 experiments/create_experiment_config.py | 71 +++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 experiments/__init__.py create mode 100644 experiments/create_experiment_config.py diff --git a/experiments/__init__.py b/experiments/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py new file mode 100644 index 00000000..c5d489d2 --- /dev/null +++ b/experiments/create_experiment_config.py @@ -0,0 +1,71 @@ +#! /usr/bin/env python3 +import argparse +from pathlib import Path +import re + + +EXPERIMENTS_P800 = [f"P800-{i}" for i in range(1, 10)] +EXPERIMENTS_BS1534 = [f"BS1534-{i}{x}" for i in range(1, 8) for x in ["a", "b"]] +EXPERIMENTS = EXPERIMENTS_P800 + EXPERIMENTS_BS1534 +LABS = ["a", "b", "c", "d"] +HERE = Path(__file__).absolute().resolve() + + +def _get_seed(exp, lab): + return 101 + EXPERIMENTS.index(exp) * 4 + LABS.index(lab) + + +def _patch_value(line: str, value) -> str: + line_split = line.split(':') + line_split[-1] = f" {value}" + return ':'.join(line_split) + + +def create_experiment_setup(experiment, lab): + default_cfg_path = HERE.joinpath(f"selection/{experiment}/config/{experiment}.yml") + + with open(default_cfg_path) as f: + cfg_lines = f.readlines() + + categories = [f"cat{i}" for i in range(1, 7)] if experiment in EXPERIMENTS_P800 else [""] + seed = _get_seed(experiment, lab) + base_path = default_cfg_path.parent.parent + for cat in categories: + input_path = base_path.joinpath("proc_input").joinpath(cat) + output_path = base_path.joinpath("proc_output").joinpath(cat) + bg_noise_path = base_path.joinpath("background_noise").joinpath(f"background_noise_{cat}.wav") + cfg_path = base_path.joinpath("config").joinpath(f"{experiment}{cat}.yml") + + cat_cfg = [] + for line in cfg_lines: + new_line = line + cat_num = int(cat[-1]) + patch_snr = experiment in ["P800-5", "P800-9"] and cat_num >= 3 + + if "name" in line: + new_line = _patch_value(line, f"{experiment}{cat}-lab{lab}") + elif "prerun_seed" in line: + new_line = _patch_value(line, seed) + elif "input_path" in line: + new_line = _patch_value(line, f'"{str(input_path)}"') + elif "output_path" in line: + new_line = _patch_value(line, f'"{str(output_path)}"') + elif "snr" in line and patch_snr: + new_line = _patch_value(line, 15) + elif "background_noise_path" in line: + new_line = _patch_value(line, f'"{str(bg_noise_path)}"') + + cat_cfg.append(new_line) + + with open(cfg_path, "w") as f: + f.write('\n'.join(cat_cfg)) + + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("experiment", type=str, choices=EXPERIMENTS_BS1534+EXPERIMENTS_P800) + parser.add_argument("lab", type=str, choices=LABS) + + args = parser.parse_args() + + create_experiment_setup(args.experiment, args.lab) \ No newline at end of file -- GitLab From a7528f0f5f3f686fece12c2b9250e1037fb4b9b4 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 2 Jun 2023 13:09:13 +0200 Subject: [PATCH 02/33] fix some bugs and add folder creation --- experiments/create_experiment_config.py | 30 +++++++++++++++---------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py index c5d489d2..4b02ec16 100644 --- a/experiments/create_experiment_config.py +++ b/experiments/create_experiment_config.py @@ -8,7 +8,7 @@ EXPERIMENTS_P800 = [f"P800-{i}" for i in range(1, 10)] EXPERIMENTS_BS1534 = [f"BS1534-{i}{x}" for i in range(1, 8) for x in ["a", "b"]] EXPERIMENTS = EXPERIMENTS_P800 + EXPERIMENTS_BS1534 LABS = ["a", "b", "c", "d"] -HERE = Path(__file__).absolute().resolve() +HERE = Path(__file__).parent.absolute().resolve() def _get_seed(exp, lab): @@ -17,7 +17,7 @@ def _get_seed(exp, lab): def _patch_value(line: str, value) -> str: line_split = line.split(':') - line_split[-1] = f" {value}" + line_split[-1] = f" {value}\n" return ':'.join(line_split) @@ -29,12 +29,12 @@ def create_experiment_setup(experiment, lab): categories = [f"cat{i}" for i in range(1, 7)] if experiment in EXPERIMENTS_P800 else [""] seed = _get_seed(experiment, lab) - base_path = default_cfg_path.parent.parent + base_path = Path(HERE.name).joinpath(f"selection/{experiment}") for cat in categories: input_path = base_path.joinpath("proc_input").joinpath(cat) output_path = base_path.joinpath("proc_output").joinpath(cat) bg_noise_path = base_path.joinpath("background_noise").joinpath(f"background_noise_{cat}.wav") - cfg_path = base_path.joinpath("config").joinpath(f"{experiment}{cat}.yml") + cfg_path = default_cfg_path.parent.joinpath(f"{experiment}{cat}-lab_{lab}.yml") cat_cfg = [] for line in cfg_lines: @@ -42,23 +42,29 @@ def create_experiment_setup(experiment, lab): cat_num = int(cat[-1]) patch_snr = experiment in ["P800-5", "P800-9"] and cat_num >= 3 - if "name" in line: - new_line = _patch_value(line, f"{experiment}{cat}-lab{lab}") - elif "prerun_seed" in line: + line_stripped = line.strip() + if line_stripped.startswith("name:"): + new_line = _patch_value(line, f"{experiment}{cat}-lab_{lab}") + elif line_stripped.startswith("prerun_seed"): new_line = _patch_value(line, seed) - elif "input_path" in line: + elif line_stripped.startswith("input_path"): new_line = _patch_value(line, f'"{str(input_path)}"') - elif "output_path" in line: + elif line_stripped.startswith("output_path"): new_line = _patch_value(line, f'"{str(output_path)}"') - elif "snr" in line and patch_snr: + elif line_stripped.startswith("snr") and patch_snr: new_line = _patch_value(line, 15) - elif "background_noise_path" in line: + elif line_stripped.startswith("background_noise_path"): new_line = _patch_value(line, f'"{str(bg_noise_path)}"') cat_cfg.append(new_line) with open(cfg_path, "w") as f: - f.write('\n'.join(cat_cfg)) + f.writelines(cat_cfg) + + # ensure that necessary directories are there + input_path.mkdir(parents=True, exist_ok=True) + output_path.mkdir(parents=True, exist_ok=True) + bg_noise_path.parent.mkdir(parents=True, exist_ok=True) if __name__ == "__main__": -- GitLab From 8b37052b2a4ff9b631e2570bddc42a18f9e138fe Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 2 Jun 2023 13:11:18 +0200 Subject: [PATCH 03/33] remove P800-1 category configs again --- .../selection/P800-1/config/P800-1-cat2.yml | 343 ------------------ .../selection/P800-1/config/P800-1-cat3.yml | 343 ------------------ .../selection/P800-1/config/P800-1-cat4.yml | 343 ------------------ .../selection/P800-1/config/P800-1-cat5.yml | 343 ------------------ .../selection/P800-1/config/P800-1-cat6.yml | 343 ------------------ .../config/{P800-1-cat1.yml => P800-1.yml} | 6 +- 6 files changed, 3 insertions(+), 1718 deletions(-) delete mode 100644 experiments/selection/P800-1/config/P800-1-cat2.yml delete mode 100644 experiments/selection/P800-1/config/P800-1-cat3.yml delete mode 100644 experiments/selection/P800-1/config/P800-1-cat4.yml delete mode 100644 experiments/selection/P800-1/config/P800-1-cat5.yml delete mode 100644 experiments/selection/P800-1/config/P800-1-cat6.yml rename experiments/selection/P800-1/config/{P800-1-cat1.yml => P800-1.yml} (97%) diff --git a/experiments/selection/P800-1/config/P800-1-cat2.yml b/experiments/selection/P800-1/config/P800-1-cat2.yml deleted file mode 100644 index 80704d48..00000000 --- a/experiments/selection/P800-1/config/P800-1-cat2.yml +++ /dev/null @@ -1,343 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-1 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-1/proc_input/cat2" -output_path: "experiments/selection/P800-1/proc_output/cat2" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat2.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 28 - c03: - type: mnru - q: 24 - c04: - type: mnru - q: 20 - c05: - type: mnru - q: 16 - c06: - type: esdru - alpha: 0.7 - c07: - type: esdru - alpha: 0.4 - c08: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - c10: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - c11: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - - c16: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c17: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c23: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c24: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c25: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c26: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - - c30: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - - c35: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c36: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-1/config/P800-1-cat3.yml b/experiments/selection/P800-1/config/P800-1-cat3.yml deleted file mode 100644 index 49602271..00000000 --- a/experiments/selection/P800-1/config/P800-1-cat3.yml +++ /dev/null @@ -1,343 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-1 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-1/proc_input/cat3" -output_path: "experiments/selection/P800-1/proc_output/cat3" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat3.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 28 - c03: - type: mnru - q: 24 - c04: - type: mnru - q: 20 - c05: - type: mnru - q: 16 - c06: - type: esdru - alpha: 0.7 - c07: - type: esdru - alpha: 0.4 - c08: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - c10: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - c11: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - - c16: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c17: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c23: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c24: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c25: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c26: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - - c30: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - - c35: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c36: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-1/config/P800-1-cat4.yml b/experiments/selection/P800-1/config/P800-1-cat4.yml deleted file mode 100644 index 2d3d92b5..00000000 --- a/experiments/selection/P800-1/config/P800-1-cat4.yml +++ /dev/null @@ -1,343 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-1 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-1/proc_input/cat4" -output_path: "experiments/selection/P800-1/proc_output/cat4" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat4.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 28 - c03: - type: mnru - q: 24 - c04: - type: mnru - q: 20 - c05: - type: mnru - q: 16 - c06: - type: esdru - alpha: 0.7 - c07: - type: esdru - alpha: 0.4 - c08: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - c10: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - c11: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - - c16: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c17: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c23: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c24: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c25: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c26: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - - c30: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - - c35: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c36: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-1/config/P800-1-cat5.yml b/experiments/selection/P800-1/config/P800-1-cat5.yml deleted file mode 100644 index 9956da00..00000000 --- a/experiments/selection/P800-1/config/P800-1-cat5.yml +++ /dev/null @@ -1,343 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-1 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-1/proc_input/cat5" -output_path: "experiments/selection/P800-1/proc_output/cat5" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat5.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 28 - c03: - type: mnru - q: 24 - c04: - type: mnru - q: 20 - c05: - type: mnru - q: 16 - c06: - type: esdru - alpha: 0.7 - c07: - type: esdru - alpha: 0.4 - c08: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - c10: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - c11: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - - c16: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c17: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c23: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c24: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c25: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c26: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - - c30: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - - c35: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c36: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-1/config/P800-1-cat6.yml b/experiments/selection/P800-1/config/P800-1-cat6.yml deleted file mode 100644 index bcc7fdd5..00000000 --- a/experiments/selection/P800-1/config/P800-1-cat6.yml +++ /dev/null @@ -1,343 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-1 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-1/proc_input/cat6" -output_path: "experiments/selection/P800-1/proc_output/cat6" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat6.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 28 - c03: - type: mnru - q: 24 - c04: - type: mnru - q: 20 - c05: - type: mnru - q: 16 - c06: - type: esdru - alpha: 0.7 - c07: - type: esdru - alpha: 0.4 - c08: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - c10: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - c11: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - - c16: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c17: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c23: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c24: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c25: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c26: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - - c30: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - - c35: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c36: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-1/config/P800-1-cat1.yml b/experiments/selection/P800-1/config/P800-1.yml similarity index 97% rename from experiments/selection/P800-1/config/P800-1-cat1.yml rename to experiments/selection/P800-1/config/P800-1.yml index 378c9ebb..92ac83b2 100644 --- a/experiments/selection/P800-1/config/P800-1-cat1.yml +++ b/experiments/selection/P800-1/config/P800-1.yml @@ -7,8 +7,8 @@ name: P800-1 master_seed: 5 prerun_seed: 2 -input_path: "experiments/selection/P800-1/proc_input/cat1" -output_path: "experiments/selection/P800-1/proc_output/cat1" +input_path: "experiments/selection/P800-1/proc_input" +output_path: "experiments/selection/P800-1/proc_output" use_windows_codec_binaries: true condition_in_output_filename: true @@ -41,7 +41,7 @@ preprocessing_2: ### REQUIRED: SNR for background noise in dB snr: 45 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat1.wav" + background_noise_path: "experiments/selection/P800-1/background_noise/background_noise.wav" ################################################# ### Bitstream processing -- GitLab From 622b8f42499de977003b1d044e07adacea17e95f Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 2 Jun 2023 13:14:01 +0200 Subject: [PATCH 04/33] remove skeleton folders --- experiments/selection/P800-1/background_noise/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat1/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat2/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat3/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat4/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat5/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat6/.gitkeep | 0 7 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 experiments/selection/P800-1/background_noise/.gitkeep delete mode 100644 experiments/selection/P800-1/proc_input/cat1/.gitkeep delete mode 100644 experiments/selection/P800-1/proc_input/cat2/.gitkeep delete mode 100644 experiments/selection/P800-1/proc_input/cat3/.gitkeep delete mode 100644 experiments/selection/P800-1/proc_input/cat4/.gitkeep delete mode 100644 experiments/selection/P800-1/proc_input/cat5/.gitkeep delete mode 100644 experiments/selection/P800-1/proc_input/cat6/.gitkeep diff --git a/experiments/selection/P800-1/background_noise/.gitkeep b/experiments/selection/P800-1/background_noise/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/experiments/selection/P800-1/proc_input/cat1/.gitkeep b/experiments/selection/P800-1/proc_input/cat1/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/experiments/selection/P800-1/proc_input/cat2/.gitkeep b/experiments/selection/P800-1/proc_input/cat2/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/experiments/selection/P800-1/proc_input/cat3/.gitkeep b/experiments/selection/P800-1/proc_input/cat3/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/experiments/selection/P800-1/proc_input/cat4/.gitkeep b/experiments/selection/P800-1/proc_input/cat4/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/experiments/selection/P800-1/proc_input/cat5/.gitkeep b/experiments/selection/P800-1/proc_input/cat5/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/experiments/selection/P800-1/proc_input/cat6/.gitkeep b/experiments/selection/P800-1/proc_input/cat6/.gitkeep deleted file mode 100644 index e69de29b..00000000 -- GitLab From 89da0f2a9b04ff9ae54eeebde55c3c535680faf6 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 2 Jun 2023 13:24:17 +0200 Subject: [PATCH 05/33] move p800 category-wise processing wrapper script --- .../create_items_p800.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) rename create_items_p800.py => experiments/create_items_p800.py (68%) diff --git a/create_items_p800.py b/experiments/create_items_p800.py similarity index 68% rename from create_items_p800.py rename to experiments/create_items_p800.py index dc4d747b..5402b968 100644 --- a/create_items_p800.py +++ b/experiments/create_items_p800.py @@ -1,11 +1,11 @@ #! /usr/bin/env python3 import argparse from pathlib import Path - from ivas_processing_scripts import main as generate_test from ivas_processing_scripts.utils import apply_func_parallel P800_TESTS = [f"P800-{i}" for i in range(1, 8)] +LABS = ["a", "b", "c", "d"] class Arguments: @@ -16,9 +16,9 @@ class Arguments: self.multiprocessing = False -def create_items(testname): - p800_path = Path(f"experiments/selection/{testname}") - p800_cfgs = p800_path.joinpath("config").glob("P800*cat*.yml") +def create_items(experiment, lab): + p800_path = Path(f"experiments/selection/{experiment}") + p800_cfgs = p800_path.joinpath("config").glob(f"{experiment}cat*-lab_{lab}.yml") args = [Arguments(str(cfg)) for cfg in p800_cfgs] apply_func_parallel(generate_test, zip(args), type="mp") @@ -27,7 +27,8 @@ def create_items(testname): # if is necessary here so that multiprocessing does not crash if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument("testname", choices=P800_TESTS) + parser.add_argument("experiment", choices=P800_TESTS) + parser.add_argument("lab", choices=LABS) args = parser.parse_args() - create_items(args.testname) + create_items(args.experiment, args.lab) -- GitLab From 3fc65783a0777b7131084811ce41f703bcb2fc50 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 2 Jun 2023 13:37:39 +0200 Subject: [PATCH 06/33] add first test for experiment setup --- .gitlab-ci.yml | 18 ++++++++++++++++-- experiments/create_experiment_config.py | 9 ++++++++- tests/test_experiments.py | 10 ++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ffbc264..b7b9c02c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,7 +74,7 @@ test_audiotools_convert: - python3 -m pytest -n auto tests/test_audiotools_convert.py # run the test configs for the selection experiments -experiments: +.experiments: stage: test tags: - linux @@ -89,8 +89,22 @@ experiments: when: on_failure expire_in: 1 week +# test the lab/category-wise config creation +experiment-setup: + stage: test + tags: + - linux + script: + - *print-common-info + - python3 -m pytest tests/test_experiments.py::test_experiment_setup -n auto | tee log.txt + artifacts: + paths: + - log.txt + when: always + expire_in: "1 week" + # run some test configs for item creation -test_processing: +.test_processing: stage: test rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py index 4b02ec16..f0e01178 100644 --- a/experiments/create_experiment_config.py +++ b/experiments/create_experiment_config.py @@ -21,7 +21,7 @@ def _patch_value(line: str, value) -> str: return ':'.join(line_split) -def create_experiment_setup(experiment, lab): +def create_experiment_setup(experiment, lab) -> list[str]: default_cfg_path = HERE.joinpath(f"selection/{experiment}/config/{experiment}.yml") with open(default_cfg_path) as f: @@ -30,6 +30,8 @@ def create_experiment_setup(experiment, lab): categories = [f"cat{i}" for i in range(1, 7)] if experiment in EXPERIMENTS_P800 else [""] seed = _get_seed(experiment, lab) base_path = Path(HERE.name).joinpath(f"selection/{experiment}") + + cfgs = list() for cat in categories: input_path = base_path.joinpath("proc_input").joinpath(cat) output_path = base_path.joinpath("proc_output").joinpath(cat) @@ -66,6 +68,11 @@ def create_experiment_setup(experiment, lab): output_path.mkdir(parents=True, exist_ok=True) bg_noise_path.parent.mkdir(parents=True, exist_ok=True) + cfgs.append(cat_cfg) + + # Return the lsit of configs that were generated. Not strictly necessary, but makes testing easier. + return cfgs + if __name__ == "__main__": parser = argparse.ArgumentParser() diff --git a/tests/test_experiments.py b/tests/test_experiments.py index a022e43d..665038a2 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -49,6 +49,7 @@ from tests.constants import ( NCHAN_TO_FILE, TESTS_DIR, ) +from experiments import create_experiment_config BG_NOISE_NAME = "background_noise_cat.wav" @@ -132,3 +133,12 @@ def test_categories(exp_name): setup_input_files_for_config(config, cat) create_items(exp_name) + + +@pytest.mark.parametrize("exp_name", ["P800-1"]) +@pytest.mark.parametrize("lab_id", ["a", "b", "c", "d"]) +def test_experiment_setup(exp_name, lab_id): + cfgs = create_experiment_config.create_experiment_setup(exp_name, lab_id) + for cfg in cfgs: + # create config for validation of folder structure to be present + config = TestConfig(cfg) \ No newline at end of file -- GitLab From 1329f02a62ef5c2c7e1130a85067ac7ce1e025e8 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 2 Jun 2023 14:05:46 +0200 Subject: [PATCH 07/33] fix test --- experiments/create_experiment_config.py | 8 ++++---- tests/test_experiments.py | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py index f0e01178..d670e389 100644 --- a/experiments/create_experiment_config.py +++ b/experiments/create_experiment_config.py @@ -21,7 +21,7 @@ def _patch_value(line: str, value) -> str: return ':'.join(line_split) -def create_experiment_setup(experiment, lab) -> list[str]: +def create_experiment_setup(experiment, lab) -> list[Path]: default_cfg_path = HERE.joinpath(f"selection/{experiment}/config/{experiment}.yml") with open(default_cfg_path) as f: @@ -68,9 +68,9 @@ def create_experiment_setup(experiment, lab) -> list[str]: output_path.mkdir(parents=True, exist_ok=True) bg_noise_path.parent.mkdir(parents=True, exist_ok=True) - cfgs.append(cat_cfg) + cfgs.append(cfg_path) - # Return the lsit of configs that were generated. Not strictly necessary, but makes testing easier. + # Return the list of configs that were generated. Not strictly necessary, but makes testing easier. return cfgs @@ -81,4 +81,4 @@ if __name__ == "__main__": args = parser.parse_args() - create_experiment_setup(args.experiment, args.lab) \ No newline at end of file + create_experiment_setup(args.experiment, args.lab) diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 665038a2..264e125b 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -36,7 +36,6 @@ from pathlib import Path import pytest from numpy.random import random, seed -from create_items_p800 import create_items from ivas_processing_scripts import main as generate_test from ivas_processing_scripts.audiotools import audio from ivas_processing_scripts.audiotools.audiofile import concat, write @@ -49,7 +48,7 @@ from tests.constants import ( NCHAN_TO_FILE, TESTS_DIR, ) -from experiments import create_experiment_config +from experiments import create_experiment_config, create_items_p800 BG_NOISE_NAME = "background_noise_cat.wav" @@ -132,7 +131,7 @@ def test_categories(exp_name): setup_input_files_for_config(config, cat) - create_items(exp_name) + create_items_p800.create_items(exp_name) @pytest.mark.parametrize("exp_name", ["P800-1"]) @@ -141,4 +140,4 @@ def test_experiment_setup(exp_name, lab_id): cfgs = create_experiment_config.create_experiment_setup(exp_name, lab_id) for cfg in cfgs: # create config for validation of folder structure to be present - config = TestConfig(cfg) \ No newline at end of file + config = TestConfig(cfg) -- GitLab From 1d7dd442f40a94cf7e13c9553d24008d72ae52f7 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 2 Jun 2023 14:49:00 +0200 Subject: [PATCH 08/33] parse config directly instead of patching text --- experiments/create_experiment_config.py | 60 ++++++++------------ ivas_processing_scripts/__init__.py | 3 +- ivas_processing_scripts/processing/config.py | 4 ++ 3 files changed, 30 insertions(+), 37 deletions(-) diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py index d670e389..4dca17d1 100644 --- a/experiments/create_experiment_config.py +++ b/experiments/create_experiment_config.py @@ -1,7 +1,7 @@ #! /usr/bin/env python3 import argparse from pathlib import Path -import re +from ivas_processing_scripts import config EXPERIMENTS_P800 = [f"P800-{i}" for i in range(1, 10)] @@ -9,24 +9,20 @@ EXPERIMENTS_BS1534 = [f"BS1534-{i}{x}" for i in range(1, 8) for x in ["a", "b"]] EXPERIMENTS = EXPERIMENTS_P800 + EXPERIMENTS_BS1534 LABS = ["a", "b", "c", "d"] HERE = Path(__file__).parent.absolute().resolve() +# TODO: this is a placeholder for later, currently everything is FOA +IN_FMT_FOR_MASA_EXPS = { + "P800-8": dict(zip([f"cat{i}" for i in range(1, 7)], ["FOA"] * 6)), + "P800-9": dict(zip([f"cat{i}" for i in range(1, 7)], ["FOA"] * 6)), +} def _get_seed(exp, lab): return 101 + EXPERIMENTS.index(exp) * 4 + LABS.index(lab) -def _patch_value(line: str, value) -> str: - line_split = line.split(':') - line_split[-1] = f" {value}\n" - return ':'.join(line_split) - - def create_experiment_setup(experiment, lab) -> list[Path]: default_cfg_path = HERE.joinpath(f"selection/{experiment}/config/{experiment}.yml") - with open(default_cfg_path) as f: - cfg_lines = f.readlines() - categories = [f"cat{i}" for i in range(1, 7)] if experiment in EXPERIMENTS_P800 else [""] seed = _get_seed(experiment, lab) base_path = Path(HERE.name).joinpath(f"selection/{experiment}") @@ -37,38 +33,32 @@ def create_experiment_setup(experiment, lab) -> list[Path]: output_path = base_path.joinpath("proc_output").joinpath(cat) bg_noise_path = base_path.joinpath("background_noise").joinpath(f"background_noise_{cat}.wav") cfg_path = default_cfg_path.parent.joinpath(f"{experiment}{cat}-lab_{lab}.yml") + cfgs.append(cfg_path) - cat_cfg = [] - for line in cfg_lines: - new_line = line - cat_num = int(cat[-1]) - patch_snr = experiment in ["P800-5", "P800-9"] and cat_num >= 3 - - line_stripped = line.strip() - if line_stripped.startswith("name:"): - new_line = _patch_value(line, f"{experiment}{cat}-lab_{lab}") - elif line_stripped.startswith("prerun_seed"): - new_line = _patch_value(line, seed) - elif line_stripped.startswith("input_path"): - new_line = _patch_value(line, f'"{str(input_path)}"') - elif line_stripped.startswith("output_path"): - new_line = _patch_value(line, f'"{str(output_path)}"') - elif line_stripped.startswith("snr") and patch_snr: - new_line = _patch_value(line, 15) - elif line_stripped.startswith("background_noise_path"): - new_line = _patch_value(line, f'"{str(bg_noise_path)}"') - - cat_cfg.append(new_line) - - with open(cfg_path, "w") as f: - f.writelines(cat_cfg) + # set new lab- and category-dependent values + cfg = config.TestConfig(default_cfg_path) + cfg.name = f"{experiment}{cat}-lab_{lab}" + cfg.prerun_seed = seed + cfg.input_path = str(input_path) + cfg.output_path = str(output_path) + cfg.preprocessing_2["background_noise"]["background_noise_path"] = str(bg_noise_path) + + # bg noise SNR only differs from default config for some experiments + cat_num = int(cat[-1]) + if experiment in ["P800-5", "P800-9"] and cat_num >= 3: + cfg.preprocessing_2["background_noise"]["snr"] = 15 + + # for MASA, the input format can differ between categories + if (fmt_for_category := IN_FMT_FOR_MASA_EXPS.get(experiment, None)) is not None: + cfg.input["fmt"] = fmt_for_category[cat] # ensure that necessary directories are there input_path.mkdir(parents=True, exist_ok=True) output_path.mkdir(parents=True, exist_ok=True) bg_noise_path.parent.mkdir(parents=True, exist_ok=True) - cfgs.append(cfg_path) + # write out config + cfg.to_file(cfg_path) # Return the list of configs that were generated. Not strictly necessary, but makes testing easier. return cfgs diff --git a/ivas_processing_scripts/__init__.py b/ivas_processing_scripts/__init__.py index 29d47f82..60e6dc10 100755 --- a/ivas_processing_scripts/__init__.py +++ b/ivas_processing_scripts/__init__.py @@ -191,5 +191,4 @@ def main(args): rename_generated_conditions(cfg.output_path) # copy configuration to output directory - with open(cfg.output_path.joinpath(f"{cfg.name}.yml"), "w") as f: - yaml.safe_dump(cfg._yaml_dump, f) + cfg.to_file(cfg.output_path.joinpath(f"{cfg.name}.yml")) diff --git a/ivas_processing_scripts/processing/config.py b/ivas_processing_scripts/processing/config.py index 09776a79..24c8808d 100755 --- a/ivas_processing_scripts/processing/config.py +++ b/ivas_processing_scripts/processing/config.py @@ -135,6 +135,10 @@ class TestConfig: return cfg + def to_file(self, outfile: str|Path): + with open(outfile, "w") as f: + yaml.safe_dump(self._yaml_dump, f) + def _validate_file_cfg(self, cfg: dict, use_windows_codec_binaries: bool): """ensure configuration contains required keys""" MISSING_KEYS = [] -- GitLab From 528603ee70aa7641d491053727f74ae15b15194d Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 2 Jun 2023 15:09:38 +0200 Subject: [PATCH 09/33] fix importing of processing scripts package --- experiments/create_experiment_config.py | 4 ++++ experiments/create_items_p800.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py index 4dca17d1..9ec777e7 100644 --- a/experiments/create_experiment_config.py +++ b/experiments/create_experiment_config.py @@ -1,6 +1,10 @@ #! /usr/bin/env python3 import argparse from pathlib import Path + +import sys +HERE = Path(__file__).parent.absolute() +sys.path.append(str(HERE.parent)) from ivas_processing_scripts import config diff --git a/experiments/create_items_p800.py b/experiments/create_items_p800.py index 5402b968..d40599d9 100644 --- a/experiments/create_items_p800.py +++ b/experiments/create_items_p800.py @@ -1,6 +1,10 @@ #! /usr/bin/env python3 import argparse from pathlib import Path + +import sys +HERE = Path(__file__).parent.absolute() +sys.path.append(str(HERE.parent)) from ivas_processing_scripts import main as generate_test from ivas_processing_scripts.utils import apply_func_parallel -- GitLab From 3fec3c30524c1ae7845ef645e7a931ec3367258a Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 2 Jun 2023 15:32:47 +0200 Subject: [PATCH 10/33] write config in current state, not in the initial state --- ivas_processing_scripts/processing/config.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ivas_processing_scripts/processing/config.py b/ivas_processing_scripts/processing/config.py index 24c8808d..00270261 100755 --- a/ivas_processing_scripts/processing/config.py +++ b/ivas_processing_scripts/processing/config.py @@ -108,8 +108,8 @@ class TestConfig: # set attributes from merged dictionary self.__dict__.update(cfg) - # store the merged config for writing to file later - self._yaml_dump = self._dump_yaml(cfg) + # store keys from merged config for later writing to file + self._keys_to_dump = list( cfg.keys() ) # convert to Path self.input_path = Path(self.input_path).resolve().absolute() @@ -136,8 +136,10 @@ class TestConfig: return cfg def to_file(self, outfile: str|Path): + dict_to_dump = { k: v for k, v in self.__dict__.items() if k in self._keys_to_dump } + yaml_dump = self._dump_yaml(dict_to_dump) with open(outfile, "w") as f: - yaml.safe_dump(self._yaml_dump, f) + yaml.safe_dump(yaml_dump, f, sort_keys=False) def _validate_file_cfg(self, cfg: dict, use_windows_codec_binaries: bool): """ensure configuration contains required keys""" -- GitLab From 9be2a1f8df19c8d2f6ce4a613889e7399ad1f423 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 10:46:49 +0200 Subject: [PATCH 11/33] remove category-wise configs for P800 experiments --- experiments/create_experiment_config.py | 11 +- .../selection/P800-2/config/P800-2-cat2.yml | 289 --------------- .../selection/P800-2/config/P800-2-cat3.yml | 289 --------------- .../selection/P800-2/config/P800-2-cat4.yml | 289 --------------- .../selection/P800-2/config/P800-2-cat5.yml | 289 --------------- .../selection/P800-2/config/P800-2-cat6.yml | 289 --------------- .../config/{P800-2-cat1.yml => P800-2.yml} | 6 +- .../selection/P800-3/config/P800-3-cat1.yml | 323 ---------------- .../selection/P800-3/config/P800-3-cat2.yml | 323 ---------------- .../selection/P800-3/config/P800-3-cat3.yml | 323 ---------------- .../selection/P800-3/config/P800-3-cat5.yml | 323 ---------------- .../selection/P800-3/config/P800-3-cat6.yml | 323 ---------------- .../config/{P800-3-cat4.yml => P800-3.yml} | 4 +- .../selection/P800-4/config/P800-4-cat1.yml | 342 ----------------- .../selection/P800-4/config/P800-4-cat2.yml | 342 ----------------- .../selection/P800-4/config/P800-4-cat3.yml | 342 ----------------- .../selection/P800-4/config/P800-4-cat5.yml | 342 ----------------- .../selection/P800-4/config/P800-4-cat6.yml | 342 ----------------- .../config/{P800-4-cat4.yml => P800-4.yml} | 6 +- .../selection/P800-5/config/P800-5-cat2.yml | 308 ---------------- .../selection/P800-5/config/P800-5-cat3.yml | 308 ---------------- .../selection/P800-5/config/P800-5-cat4.yml | 308 ---------------- .../selection/P800-5/config/P800-5-cat5.yml | 308 ---------------- .../selection/P800-5/config/P800-5-cat6.yml | 308 ---------------- .../config/{P800-5-cat1.yml => P800-5.yml} | 6 +- .../selection/P800-6/config/P800-6-cat2.yml | 304 ---------------- .../selection/P800-6/config/P800-6-cat3.yml | 304 ---------------- .../selection/P800-6/config/P800-6-cat4.yml | 304 ---------------- .../selection/P800-6/config/P800-6-cat5.yml | 304 ---------------- .../selection/P800-6/config/P800-6-cat6.yml | 304 ---------------- .../config/{P800-6-cat1.yml => P800-6.yml} | 4 +- .../selection/P800-7/config/P800-7-cat2.yml | 305 ---------------- .../selection/P800-7/config/P800-7-cat3.yml | 305 ---------------- .../selection/P800-7/config/P800-7-cat4.yml | 305 ---------------- .../selection/P800-7/config/P800-7-cat5.yml | 305 ---------------- .../selection/P800-7/config/P800-7-cat6.yml | 305 ---------------- .../config/{P800-7-cat1.yml => P800-7.yml} | 4 +- .../selection/P800-8/config/P800-8-cat2.yml | 344 ------------------ .../selection/P800-8/config/P800-8-cat3.yml | 344 ------------------ .../selection/P800-8/config/P800-8-cat4.yml | 344 ------------------ .../selection/P800-8/config/P800-8-cat5.yml | 344 ------------------ .../selection/P800-8/config/P800-8-cat6.yml | 344 ------------------ .../config/{P800-8-cat1.yml => P800-8.yml} | 6 +- .../selection/P800-9/config/P800-9-cat2.yml | 321 ---------------- .../selection/P800-9/config/P800-9-cat3.yml | 321 ---------------- .../selection/P800-9/config/P800-9-cat4.yml | 321 ---------------- .../selection/P800-9/config/P800-9-cat5.yml | 321 ---------------- .../selection/P800-9/config/P800-9-cat6.yml | 321 ---------------- .../config/{P800-9-cat1.yml => P800-9.yml} | 6 +- tests/test_experiments.py | 4 +- 50 files changed, 29 insertions(+), 12708 deletions(-) delete mode 100644 experiments/selection/P800-2/config/P800-2-cat2.yml delete mode 100644 experiments/selection/P800-2/config/P800-2-cat3.yml delete mode 100644 experiments/selection/P800-2/config/P800-2-cat4.yml delete mode 100644 experiments/selection/P800-2/config/P800-2-cat5.yml delete mode 100644 experiments/selection/P800-2/config/P800-2-cat6.yml rename experiments/selection/P800-2/config/{P800-2-cat1.yml => P800-2.yml} (97%) delete mode 100644 experiments/selection/P800-3/config/P800-3-cat1.yml delete mode 100644 experiments/selection/P800-3/config/P800-3-cat2.yml delete mode 100644 experiments/selection/P800-3/config/P800-3-cat3.yml delete mode 100644 experiments/selection/P800-3/config/P800-3-cat5.yml delete mode 100644 experiments/selection/P800-3/config/P800-3-cat6.yml rename experiments/selection/P800-3/config/{P800-3-cat4.yml => P800-3.yml} (97%) delete mode 100644 experiments/selection/P800-4/config/P800-4-cat1.yml delete mode 100644 experiments/selection/P800-4/config/P800-4-cat2.yml delete mode 100644 experiments/selection/P800-4/config/P800-4-cat3.yml delete mode 100644 experiments/selection/P800-4/config/P800-4-cat5.yml delete mode 100644 experiments/selection/P800-4/config/P800-4-cat6.yml rename experiments/selection/P800-4/config/{P800-4-cat4.yml => P800-4.yml} (97%) delete mode 100644 experiments/selection/P800-5/config/P800-5-cat2.yml delete mode 100644 experiments/selection/P800-5/config/P800-5-cat3.yml delete mode 100644 experiments/selection/P800-5/config/P800-5-cat4.yml delete mode 100644 experiments/selection/P800-5/config/P800-5-cat5.yml delete mode 100644 experiments/selection/P800-5/config/P800-5-cat6.yml rename experiments/selection/P800-5/config/{P800-5-cat1.yml => P800-5.yml} (97%) delete mode 100644 experiments/selection/P800-6/config/P800-6-cat2.yml delete mode 100644 experiments/selection/P800-6/config/P800-6-cat3.yml delete mode 100644 experiments/selection/P800-6/config/P800-6-cat4.yml delete mode 100644 experiments/selection/P800-6/config/P800-6-cat5.yml delete mode 100644 experiments/selection/P800-6/config/P800-6-cat6.yml rename experiments/selection/P800-6/config/{P800-6-cat1.yml => P800-6.yml} (97%) delete mode 100644 experiments/selection/P800-7/config/P800-7-cat2.yml delete mode 100644 experiments/selection/P800-7/config/P800-7-cat3.yml delete mode 100644 experiments/selection/P800-7/config/P800-7-cat4.yml delete mode 100644 experiments/selection/P800-7/config/P800-7-cat5.yml delete mode 100644 experiments/selection/P800-7/config/P800-7-cat6.yml rename experiments/selection/P800-7/config/{P800-7-cat1.yml => P800-7.yml} (97%) delete mode 100644 experiments/selection/P800-8/config/P800-8-cat2.yml delete mode 100644 experiments/selection/P800-8/config/P800-8-cat3.yml delete mode 100644 experiments/selection/P800-8/config/P800-8-cat4.yml delete mode 100644 experiments/selection/P800-8/config/P800-8-cat5.yml delete mode 100644 experiments/selection/P800-8/config/P800-8-cat6.yml rename experiments/selection/P800-8/config/{P800-8-cat1.yml => P800-8.yml} (97%) delete mode 100644 experiments/selection/P800-9/config/P800-9-cat2.yml delete mode 100644 experiments/selection/P800-9/config/P800-9-cat3.yml delete mode 100644 experiments/selection/P800-9/config/P800-9-cat4.yml delete mode 100644 experiments/selection/P800-9/config/P800-9-cat5.yml delete mode 100644 experiments/selection/P800-9/config/P800-9-cat6.yml rename experiments/selection/P800-9/config/{P800-9-cat1.yml => P800-9.yml} (97%) diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py index 4dca17d1..78ba5cf3 100644 --- a/experiments/create_experiment_config.py +++ b/experiments/create_experiment_config.py @@ -41,12 +41,13 @@ def create_experiment_setup(experiment, lab) -> list[Path]: cfg.prerun_seed = seed cfg.input_path = str(input_path) cfg.output_path = str(output_path) - cfg.preprocessing_2["background_noise"]["background_noise_path"] = str(bg_noise_path) + if (bg_noise_pre_proc_2 := cfg.preprocessing_2.get("background_noise", None)) is not None: + bg_noise_pre_proc_2["background_noise_path"] = str(bg_noise_path) - # bg noise SNR only differs from default config for some experiments - cat_num = int(cat[-1]) - if experiment in ["P800-5", "P800-9"] and cat_num >= 3: - cfg.preprocessing_2["background_noise"]["snr"] = 15 + # bg noise SNR only differs from default config for some experiments + cat_num = int(cat[-1]) + if experiment in ["P800-5", "P800-9"] and cat_num >= 3: + bg_noise_pre_proc_2["snr"] = 15 # for MASA, the input format can differ between categories if (fmt_for_category := IN_FMT_FOR_MASA_EXPS.get(experiment, None)) is not None: diff --git a/experiments/selection/P800-2/config/P800-2-cat2.yml b/experiments/selection/P800-2/config/P800-2-cat2.yml deleted file mode 100644 index a5afa146..00000000 --- a/experiments/selection/P800-2/config/P800-2-cat2.yml +++ /dev/null @@ -1,289 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-2 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-2/proc_input/cat2" -output_path: "experiments/selection/P800-2/proc_output/cat2" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - ### Additive background noise - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-2/background_noise/background_noise_cat2.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 27 - c04: - type: mnru - q: 22 - c05: - type: mnru - q: 17 - c06: - type: mnru - q: 12 - c07: - type: esdru - alpha: 0.7 - c08: - type: esdru - alpha: 0.5 - c09: - type: esdru - alpha: 0.3 - c10: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - c12: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - c13: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - c14: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - c15: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - c16: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - c17: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - c18: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - c19: - type: evs - bitrates: - - 7200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c20: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c21: - type: evs - bitrates: - - 9600 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c22: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c23: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c24: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c25: - type: evs - bitrates: - - 32000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - - ### IVAS condition ############################### - c26: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c30: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c31: - type: ivas - bitrates: - - 64000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c32: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c33: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c34: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c35: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c36: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-2/config/P800-2-cat3.yml b/experiments/selection/P800-2/config/P800-2-cat3.yml deleted file mode 100644 index dc1d2c1a..00000000 --- a/experiments/selection/P800-2/config/P800-2-cat3.yml +++ /dev/null @@ -1,289 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-2 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-2/proc_input/cat3" -output_path: "experiments/selection/P800-2/proc_output/cat3" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - ### Additive background noise - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-2/background_noise/background_noise_cat3.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 27 - c04: - type: mnru - q: 22 - c05: - type: mnru - q: 17 - c06: - type: mnru - q: 12 - c07: - type: esdru - alpha: 0.7 - c08: - type: esdru - alpha: 0.5 - c09: - type: esdru - alpha: 0.3 - c10: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - c12: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - c13: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - c14: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - c15: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - c16: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - c17: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - c18: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - c19: - type: evs - bitrates: - - 7200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c20: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c21: - type: evs - bitrates: - - 9600 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c22: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c23: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c24: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c25: - type: evs - bitrates: - - 32000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - - ### IVAS condition ############################### - c26: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c30: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c31: - type: ivas - bitrates: - - 64000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c32: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c33: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c34: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c35: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c36: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-2/config/P800-2-cat4.yml b/experiments/selection/P800-2/config/P800-2-cat4.yml deleted file mode 100644 index da348950..00000000 --- a/experiments/selection/P800-2/config/P800-2-cat4.yml +++ /dev/null @@ -1,289 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-2 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-2/proc_input/cat4" -output_path: "experiments/selection/P800-2/proc_output/cat4" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - ### Additive background noise - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-2/background_noise/background_noise_cat4.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 27 - c04: - type: mnru - q: 22 - c05: - type: mnru - q: 17 - c06: - type: mnru - q: 12 - c07: - type: esdru - alpha: 0.7 - c08: - type: esdru - alpha: 0.5 - c09: - type: esdru - alpha: 0.3 - c10: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - c12: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - c13: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - c14: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - c15: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - c16: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - c17: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - c18: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - c19: - type: evs - bitrates: - - 7200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c20: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c21: - type: evs - bitrates: - - 9600 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c22: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c23: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c24: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c25: - type: evs - bitrates: - - 32000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - - ### IVAS condition ############################### - c26: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c30: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c31: - type: ivas - bitrates: - - 64000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c32: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c33: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c34: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c35: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c36: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-2/config/P800-2-cat5.yml b/experiments/selection/P800-2/config/P800-2-cat5.yml deleted file mode 100644 index fe88b1ac..00000000 --- a/experiments/selection/P800-2/config/P800-2-cat5.yml +++ /dev/null @@ -1,289 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-2 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-2/proc_input/cat5" -output_path: "experiments/selection/P800-2/proc_output/cat5" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - ### Additive background noise - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-2/background_noise/background_noise_cat5.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 27 - c04: - type: mnru - q: 22 - c05: - type: mnru - q: 17 - c06: - type: mnru - q: 12 - c07: - type: esdru - alpha: 0.7 - c08: - type: esdru - alpha: 0.5 - c09: - type: esdru - alpha: 0.3 - c10: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - c12: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - c13: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - c14: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - c15: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - c16: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - c17: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - c18: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - c19: - type: evs - bitrates: - - 7200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c20: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c21: - type: evs - bitrates: - - 9600 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c22: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c23: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c24: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c25: - type: evs - bitrates: - - 32000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - - ### IVAS condition ############################### - c26: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c30: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c31: - type: ivas - bitrates: - - 64000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c32: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c33: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c34: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c35: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c36: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-2/config/P800-2-cat6.yml b/experiments/selection/P800-2/config/P800-2-cat6.yml deleted file mode 100644 index baf1c8df..00000000 --- a/experiments/selection/P800-2/config/P800-2-cat6.yml +++ /dev/null @@ -1,289 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-2 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-2/proc_input/cat6" -output_path: "experiments/selection/P800-2/proc_output/cat6" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - ### Additive background noise - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-2/background_noise/background_noise_cat6.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 27 - c04: - type: mnru - q: 22 - c05: - type: mnru - q: 17 - c06: - type: mnru - q: 12 - c07: - type: esdru - alpha: 0.7 - c08: - type: esdru - alpha: 0.5 - c09: - type: esdru - alpha: 0.3 - c10: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "SWB"] - dec: - c12: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "SWB"] - dec: - c13: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "SWB"] - dec: - c14: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - c15: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - c16: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - c17: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - c18: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - c19: - type: evs - bitrates: - - 7200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c20: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c21: - type: evs - bitrates: - - 9600 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c22: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c23: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c24: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - c25: - type: evs - bitrates: - - 32000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - - ### IVAS condition ############################### - c26: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c30: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c31: - type: ivas - bitrates: - - 64000 - cod: - opts: ["-max_band", "SWB"] - dec: - fmt: "STEREO" - c32: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c33: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c34: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c35: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - c36: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx", "-max_band", "SWB"] - dec: - fmt: "STEREO" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-2/config/P800-2-cat1.yml b/experiments/selection/P800-2/config/P800-2.yml similarity index 97% rename from experiments/selection/P800-2/config/P800-2-cat1.yml rename to experiments/selection/P800-2/config/P800-2.yml index 1b0fdbfb..740eb3b0 100644 --- a/experiments/selection/P800-2/config/P800-2-cat1.yml +++ b/experiments/selection/P800-2/config/P800-2.yml @@ -7,8 +7,8 @@ name: P800-2 master_seed: 5 prerun_seed: 2 -input_path: "experiments/selection/P800-2/proc_input/cat1" -output_path: "experiments/selection/P800-2/proc_output/cat1" +input_path: "experiments/selection/P800-2/proc_input" +output_path: "experiments/selection/P800-2/proc_output" use_windows_codec_binaries: true condition_in_output_filename: true @@ -41,7 +41,7 @@ preprocessing_2: ### REQUIRED: SNR for background noise in dB snr: 15 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-2/background_noise/background_noise_cat1.wav" + background_noise_path: "experiments/selection/P800-2/background_noise/background_noise.wav" repeat_signal: true ################################################# diff --git a/experiments/selection/P800-3/config/P800-3-cat1.yml b/experiments/selection/P800-3/config/P800-3-cat1.yml deleted file mode 100644 index b6b5349c..00000000 --- a/experiments/selection/P800-3/config/P800-3-cat1.yml +++ /dev/null @@ -1,323 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-3 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-3/proc_input/cat1" -output_path: "experiments/selection/P800-3/proc_output/cat1" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "20KBP" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 27 - c03: - type: mnru - q: 22 - c04: - type: mnru - q: 17 - c05: - type: mnru - q: 12 - c06: - type: esdru - alpha: 0.7 - c07: - type: esdru - alpha: 0.4 - c08: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "STEREO" - c25: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "STEREO" - c26: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "STEREO" - - c30: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - - c35: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "STEREO" - - c36: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-3/config/P800-3-cat2.yml b/experiments/selection/P800-3/config/P800-3-cat2.yml deleted file mode 100644 index 73e8abe8..00000000 --- a/experiments/selection/P800-3/config/P800-3-cat2.yml +++ /dev/null @@ -1,323 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-3 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-3/proc_input/cat2" -output_path: "experiments/selection/P800-3/proc_output/cat2" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "20KBP" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 27 - c03: - type: mnru - q: 22 - c04: - type: mnru - q: 17 - c05: - type: mnru - q: 12 - c06: - type: esdru - alpha: 0.7 - c07: - type: esdru - alpha: 0.4 - c08: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "STEREO" - c25: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "STEREO" - c26: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "STEREO" - - c30: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - - c35: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "STEREO" - - c36: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-3/config/P800-3-cat3.yml b/experiments/selection/P800-3/config/P800-3-cat3.yml deleted file mode 100644 index bbfcc3c8..00000000 --- a/experiments/selection/P800-3/config/P800-3-cat3.yml +++ /dev/null @@ -1,323 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-3 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-3/proc_input/cat3" -output_path: "experiments/selection/P800-3/proc_output/cat3" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "20KBP" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 27 - c03: - type: mnru - q: 22 - c04: - type: mnru - q: 17 - c05: - type: mnru - q: 12 - c06: - type: esdru - alpha: 0.7 - c07: - type: esdru - alpha: 0.4 - c08: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "STEREO" - c25: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "STEREO" - c26: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "STEREO" - - c30: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - - c35: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "STEREO" - - c36: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-3/config/P800-3-cat5.yml b/experiments/selection/P800-3/config/P800-3-cat5.yml deleted file mode 100644 index 470d63f7..00000000 --- a/experiments/selection/P800-3/config/P800-3-cat5.yml +++ /dev/null @@ -1,323 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-3 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-3/proc_input/cat5" -output_path: "experiments/selection/P800-3/proc_output/cat5" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "20KBP" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 27 - c03: - type: mnru - q: 22 - c04: - type: mnru - q: 17 - c05: - type: mnru - q: 12 - c06: - type: esdru - alpha: 0.7 - c07: - type: esdru - alpha: 0.4 - c08: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "STEREO" - c25: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "STEREO" - c26: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "STEREO" - - c30: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - - c35: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "STEREO" - - c36: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-3/config/P800-3-cat6.yml b/experiments/selection/P800-3/config/P800-3-cat6.yml deleted file mode 100644 index 19d3792a..00000000 --- a/experiments/selection/P800-3/config/P800-3-cat6.yml +++ /dev/null @@ -1,323 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-3 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-3/proc_input/cat6" -output_path: "experiments/selection/P800-3/proc_output/cat6" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "STEREO" - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "20KBP" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 27 - c03: - type: mnru - q: 22 - c04: - type: mnru - q: 17 - c05: - type: mnru - q: 12 - c06: - type: esdru - alpha: 0.7 - c07: - type: esdru - alpha: 0.4 - c08: - type: esdru - alpha: 0.1 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "STEREO" - c25: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "STEREO" - c26: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "STEREO" - c27: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "STEREO" - c28: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "STEREO" - c29: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "STEREO" - - c30: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - - c35: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "STEREO" - - c36: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx"] - dec: - fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "STEREO" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-3/config/P800-3-cat4.yml b/experiments/selection/P800-3/config/P800-3.yml similarity index 97% rename from experiments/selection/P800-3/config/P800-3-cat4.yml rename to experiments/selection/P800-3/config/P800-3.yml index 6837e7c6..0b454c00 100644 --- a/experiments/selection/P800-3/config/P800-3-cat4.yml +++ b/experiments/selection/P800-3/config/P800-3.yml @@ -7,8 +7,8 @@ name: P800-3 master_seed: 5 prerun_seed: 2 -input_path: "experiments/selection/P800-3/proc_input/cat4" -output_path: "experiments/selection/P800-3/proc_output/cat4" +input_path: "experiments/selection/P800-3/proc_input" +output_path: "experiments/selection/P800-3/proc_output" use_windows_codec_binaries: true condition_in_output_filename: true diff --git a/experiments/selection/P800-4/config/P800-4-cat1.yml b/experiments/selection/P800-4/config/P800-4-cat1.yml deleted file mode 100644 index 4dfb1de7..00000000 --- a/experiments/selection/P800-4/config/P800-4-cat1.yml +++ /dev/null @@ -1,342 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-4 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-4/proc_input/cat1" -output_path: "experiments/selection/P800-4/proc_output/cat1" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - loudness_fmt: "BINAURAL" - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat1.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 28 - c04: - type: mnru - q: 24 - c05: - type: mnru - q: 20 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.675 - c08: - type: esdru - alpha: 0.55 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - c29: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - c30: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - - c31: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c35: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c36: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-4/config/P800-4-cat2.yml b/experiments/selection/P800-4/config/P800-4-cat2.yml deleted file mode 100644 index 6cab5469..00000000 --- a/experiments/selection/P800-4/config/P800-4-cat2.yml +++ /dev/null @@ -1,342 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-4 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-4/proc_input/cat2" -output_path: "experiments/selection/P800-4/proc_output/cat2" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - loudness_fmt: "BINAURAL" - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat2.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 28 - c04: - type: mnru - q: 24 - c05: - type: mnru - q: 20 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.675 - c08: - type: esdru - alpha: 0.55 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - c29: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - c30: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - - c31: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c35: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c36: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-4/config/P800-4-cat3.yml b/experiments/selection/P800-4/config/P800-4-cat3.yml deleted file mode 100644 index fd071f99..00000000 --- a/experiments/selection/P800-4/config/P800-4-cat3.yml +++ /dev/null @@ -1,342 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-4 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-4/proc_input/cat3" -output_path: "experiments/selection/P800-4/proc_output/cat3" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - loudness_fmt: "BINAURAL" - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat3.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 28 - c04: - type: mnru - q: 24 - c05: - type: mnru - q: 20 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.675 - c08: - type: esdru - alpha: 0.55 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - c29: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - c30: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - - c31: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c35: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c36: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-4/config/P800-4-cat5.yml b/experiments/selection/P800-4/config/P800-4-cat5.yml deleted file mode 100644 index 3b3ff2b5..00000000 --- a/experiments/selection/P800-4/config/P800-4-cat5.yml +++ /dev/null @@ -1,342 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-4 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-4/proc_input/cat5" -output_path: "experiments/selection/P800-4/proc_output/cat5" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - loudness_fmt: "BINAURAL" - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat5.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 28 - c04: - type: mnru - q: 24 - c05: - type: mnru - q: 20 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.675 - c08: - type: esdru - alpha: 0.55 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - c29: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - c30: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - - c31: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c35: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c36: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-4/config/P800-4-cat6.yml b/experiments/selection/P800-4/config/P800-4-cat6.yml deleted file mode 100644 index 2d071a37..00000000 --- a/experiments/selection/P800-4/config/P800-4-cat6.yml +++ /dev/null @@ -1,342 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-4 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-4/proc_input/cat6" -output_path: "experiments/selection/P800-4/proc_output/cat6" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - loudness_fmt: "BINAURAL" - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat6.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 28 - c04: - type: mnru - q: 24 - c05: - type: mnru - q: 20 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.675 - c08: - type: esdru - alpha: 0.55 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - c29: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - c30: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - - c31: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c35: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - c36: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-4/config/P800-4-cat4.yml b/experiments/selection/P800-4/config/P800-4.yml similarity index 97% rename from experiments/selection/P800-4/config/P800-4-cat4.yml rename to experiments/selection/P800-4/config/P800-4.yml index a8e69a00..98aa56da 100644 --- a/experiments/selection/P800-4/config/P800-4-cat4.yml +++ b/experiments/selection/P800-4/config/P800-4.yml @@ -7,8 +7,8 @@ name: P800-4 master_seed: 5 prerun_seed: 2 -input_path: "experiments/selection/P800-4/proc_input/cat4" -output_path: "experiments/selection/P800-4/proc_output/cat4" +input_path: "experiments/selection/P800-4/proc_input" +output_path: "experiments/selection/P800-4/proc_output" use_windows_codec_binaries: true condition_in_output_filename: true @@ -42,7 +42,7 @@ preprocessing_2: ### REQUIRED: SNR for background noise in dB snr: 45 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat4.wav" + background_noise_path: "experiments/selection/P800-4/background_noise/background_noise.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-5/config/P800-5-cat2.yml b/experiments/selection/P800-5/config/P800-5-cat2.yml deleted file mode 100644 index 0a487e79..00000000 --- a/experiments/selection/P800-5/config/P800-5-cat2.yml +++ /dev/null @@ -1,308 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-5 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-5/proc_input/cat2" -output_path: "experiments/selection/P800-5/proc_output/cat2" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - loudness_fmt: "BINAURAL" - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 10 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat2.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 29 - c03: - type: mnru - q: 25 - c04: - type: mnru - q: 21 - c05: - type: mnru - q: 17 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c18: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c20: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - c29: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - c30: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - - c31: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c32: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c33: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c34: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c35: - type: ivas - bitrates: - - 64000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c36: - type: ivas - bitrates: - - 80000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-5/config/P800-5-cat3.yml b/experiments/selection/P800-5/config/P800-5-cat3.yml deleted file mode 100644 index b36a6cfb..00000000 --- a/experiments/selection/P800-5/config/P800-5-cat3.yml +++ /dev/null @@ -1,308 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-5 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-5/proc_input/cat3" -output_path: "experiments/selection/P800-5/proc_output/cat3" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - loudness_fmt: "BINAURAL" - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat3.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 29 - c03: - type: mnru - q: 25 - c04: - type: mnru - q: 21 - c05: - type: mnru - q: 17 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c18: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c20: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - c29: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - c30: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - - c31: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c32: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c33: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c34: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c35: - type: ivas - bitrates: - - 64000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c36: - type: ivas - bitrates: - - 80000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-5/config/P800-5-cat4.yml b/experiments/selection/P800-5/config/P800-5-cat4.yml deleted file mode 100644 index 812db776..00000000 --- a/experiments/selection/P800-5/config/P800-5-cat4.yml +++ /dev/null @@ -1,308 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-5 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-5/proc_input/cat4" -output_path: "experiments/selection/P800-5/proc_output/cat4" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - loudness_fmt: "BINAURAL" - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat4.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 29 - c03: - type: mnru - q: 25 - c04: - type: mnru - q: 21 - c05: - type: mnru - q: 17 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c18: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c20: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - c29: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - c30: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - - c31: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c32: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c33: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c34: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c35: - type: ivas - bitrates: - - 64000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c36: - type: ivas - bitrates: - - 80000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-5/config/P800-5-cat5.yml b/experiments/selection/P800-5/config/P800-5-cat5.yml deleted file mode 100644 index 92f8bf5c..00000000 --- a/experiments/selection/P800-5/config/P800-5-cat5.yml +++ /dev/null @@ -1,308 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-5 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-5/proc_input/cat5" -output_path: "experiments/selection/P800-5/proc_output/cat5" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - loudness_fmt: "BINAURAL" - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat5.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 29 - c03: - type: mnru - q: 25 - c04: - type: mnru - q: 21 - c05: - type: mnru - q: 17 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c18: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c20: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - c29: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - c30: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - - c31: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c32: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c33: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c34: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c35: - type: ivas - bitrates: - - 64000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c36: - type: ivas - bitrates: - - 80000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-5/config/P800-5-cat6.yml b/experiments/selection/P800-5/config/P800-5-cat6.yml deleted file mode 100644 index a1db50c7..00000000 --- a/experiments/selection/P800-5/config/P800-5-cat6.yml +++ /dev/null @@ -1,308 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-5 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-5/proc_input/cat6" -output_path: "experiments/selection/P800-5/proc_output/cat6" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - loudness_fmt: "BINAURAL" - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat6.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 29 - c03: - type: mnru - q: 25 - c04: - type: mnru - q: 21 - c05: - type: mnru - q: 17 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 32000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c18: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c20: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 13200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "FOA" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "FOA" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "FOA" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "FOA" - c29: - type: ivas - bitrates: - - 80000 - cod: - dec: - fmt: "FOA" - c30: - type: ivas - bitrates: - - 96000 - cod: - dec: - fmt: "FOA" - - c31: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c32: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c33: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c34: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c35: - type: ivas - bitrates: - - 64000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - c36: - type: ivas - bitrates: - - 80000 - cod: - opts: ["-dtx"] - dec: - fmt: "FOA" - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-5/config/P800-5-cat1.yml b/experiments/selection/P800-5/config/P800-5.yml similarity index 97% rename from experiments/selection/P800-5/config/P800-5-cat1.yml rename to experiments/selection/P800-5/config/P800-5.yml index d886f0d6..d15fc7e0 100644 --- a/experiments/selection/P800-5/config/P800-5-cat1.yml +++ b/experiments/selection/P800-5/config/P800-5.yml @@ -7,8 +7,8 @@ name: P800-5 master_seed: 5 prerun_seed: 2 -input_path: "experiments/selection/P800-5/proc_input/cat1" -output_path: "experiments/selection/P800-5/proc_output/cat1" +input_path: "experiments/selection/P800-5/proc_input" +output_path: "experiments/selection/P800-5/proc_output" use_windows_codec_binaries: true condition_in_output_filename: true @@ -42,7 +42,7 @@ preprocessing_2: ### REQUIRED: SNR for background noise in dB snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat1.wav" + background_noise_path: "experiments/selection/P800-5/background_noise/background_noise.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-6/config/P800-6-cat2.yml b/experiments/selection/P800-6/config/P800-6-cat2.yml deleted file mode 100644 index e4294fdb..00000000 --- a/experiments/selection/P800-6/config/P800-6-cat2.yml +++ /dev/null @@ -1,304 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-6 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-6/proc_input/cat2" -output_path: "experiments/selection/P800-6/proc_output/cat2" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "ISM1" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 15 - c03: - type: mnru - q: 23 - c04: - type: mnru - q: 31 - c05: - type: mnru - q: 39 - c06: - type: mnru - q: 47 - c07: - type: esdru - alpha: 0.1 - c08: - type: esdru - alpha: 0.3 - c09: - type: esdru - alpha: 0.5 - c10: - type: esdru - alpha: 0.7 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 64000 - cod: - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c21: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "ISM1" - c25: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM1" - c26: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM1" - c27: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM1" - c28: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM1" - c29: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "ISM1" - - c30: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - - c34: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - c35: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - c36: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-6/config/P800-6-cat3.yml b/experiments/selection/P800-6/config/P800-6-cat3.yml deleted file mode 100644 index 01800636..00000000 --- a/experiments/selection/P800-6/config/P800-6-cat3.yml +++ /dev/null @@ -1,304 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-6 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-6/proc_input/cat3" -output_path: "experiments/selection/P800-6/proc_output/cat3" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "ISM1" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 15 - c03: - type: mnru - q: 23 - c04: - type: mnru - q: 31 - c05: - type: mnru - q: 39 - c06: - type: mnru - q: 47 - c07: - type: esdru - alpha: 0.1 - c08: - type: esdru - alpha: 0.3 - c09: - type: esdru - alpha: 0.5 - c10: - type: esdru - alpha: 0.7 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 64000 - cod: - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c21: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "ISM1" - c25: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM1" - c26: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM1" - c27: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM1" - c28: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM1" - c29: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "ISM1" - - c30: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - - c34: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - c35: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - c36: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-6/config/P800-6-cat4.yml b/experiments/selection/P800-6/config/P800-6-cat4.yml deleted file mode 100644 index cd729ab0..00000000 --- a/experiments/selection/P800-6/config/P800-6-cat4.yml +++ /dev/null @@ -1,304 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-6 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-6/proc_input/cat4" -output_path: "experiments/selection/P800-6/proc_output/cat4" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "ISM1" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 15 - c03: - type: mnru - q: 23 - c04: - type: mnru - q: 31 - c05: - type: mnru - q: 39 - c06: - type: mnru - q: 47 - c07: - type: esdru - alpha: 0.1 - c08: - type: esdru - alpha: 0.3 - c09: - type: esdru - alpha: 0.5 - c10: - type: esdru - alpha: 0.7 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 64000 - cod: - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c21: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "ISM1" - c25: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM1" - c26: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM1" - c27: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM1" - c28: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM1" - c29: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "ISM1" - - c30: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - - c34: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - c35: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - c36: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-6/config/P800-6-cat5.yml b/experiments/selection/P800-6/config/P800-6-cat5.yml deleted file mode 100644 index 744d9d13..00000000 --- a/experiments/selection/P800-6/config/P800-6-cat5.yml +++ /dev/null @@ -1,304 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-6 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-6/proc_input/cat5" -output_path: "experiments/selection/P800-6/proc_output/cat5" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "ISM1" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 15 - c03: - type: mnru - q: 23 - c04: - type: mnru - q: 31 - c05: - type: mnru - q: 39 - c06: - type: mnru - q: 47 - c07: - type: esdru - alpha: 0.1 - c08: - type: esdru - alpha: 0.3 - c09: - type: esdru - alpha: 0.5 - c10: - type: esdru - alpha: 0.7 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 64000 - cod: - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c21: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "ISM1" - c25: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM1" - c26: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM1" - c27: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM1" - c28: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM1" - c29: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "ISM1" - - c30: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - - c34: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - c35: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - c36: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-6/config/P800-6-cat6.yml b/experiments/selection/P800-6/config/P800-6-cat6.yml deleted file mode 100644 index 1bd6f8a7..00000000 --- a/experiments/selection/P800-6/config/P800-6-cat6.yml +++ /dev/null @@ -1,304 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-6 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-6/proc_input/cat6" -output_path: "experiments/selection/P800-6/proc_output/cat6" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "ISM1" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 15 - c03: - type: mnru - q: 23 - c04: - type: mnru - q: 31 - c05: - type: mnru - q: 39 - c06: - type: mnru - q: 47 - c07: - type: esdru - alpha: 0.1 - c08: - type: esdru - alpha: 0.3 - c09: - type: esdru - alpha: 0.5 - c10: - type: esdru - alpha: 0.7 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 48000 - cod: - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 64000 - cod: - opts: ["-max_band", "FB"] - dec: - - c17: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c20: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c21: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "ISM1" - c25: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM1" - c26: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM1" - c27: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM1" - c28: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM1" - c29: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "ISM1" - - c30: - type: ivas - bitrates: - - 13200 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM1" - tx: - type: "FER" - error_rate: 5 - - c34: - type: ivas - bitrates: - - 13200 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - c35: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - c36: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM1" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-6/config/P800-6-cat1.yml b/experiments/selection/P800-6/config/P800-6.yml similarity index 97% rename from experiments/selection/P800-6/config/P800-6-cat1.yml rename to experiments/selection/P800-6/config/P800-6.yml index 8ff35479..2dd0f1c2 100644 --- a/experiments/selection/P800-6/config/P800-6-cat1.yml +++ b/experiments/selection/P800-6/config/P800-6.yml @@ -7,8 +7,8 @@ name: P800-6 master_seed: 5 prerun_seed: 2 -input_path: "experiments/selection/P800-6/proc_input/cat1" -output_path: "experiments/selection/P800-6/proc_output/cat1" +input_path: "experiments/selection/P800-6/proc_input" +output_path: "experiments/selection/P800-6/proc_output" use_windows_codec_binaries: true condition_in_output_filename: true diff --git a/experiments/selection/P800-7/config/P800-7-cat2.yml b/experiments/selection/P800-7/config/P800-7-cat2.yml deleted file mode 100644 index 77760adf..00000000 --- a/experiments/selection/P800-7/config/P800-7-cat2.yml +++ /dev/null @@ -1,305 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-7 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-7/proc_input/cat2" -output_path: "experiments/selection/P800-7/proc_output/cat2" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "ISM2" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 15 - c03: - type: mnru - q: 23 - c04: - type: mnru - q: 31 - c05: - type: mnru - q: 39 - c06: - type: mnru - q: 47 - c07: - type: esdru - alpha: 0.1 - c08: - type: esdru - alpha: 0.3 - c09: - type: esdru - alpha: 0.5 - c10: - type: esdru - alpha: 0.7 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - - c16: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c17: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c20: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM2" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM2" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM2" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM2" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "ISM2" - - c29: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c30: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - - c33: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c34: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c35: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c36: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-7/config/P800-7-cat3.yml b/experiments/selection/P800-7/config/P800-7-cat3.yml deleted file mode 100644 index 48692ae9..00000000 --- a/experiments/selection/P800-7/config/P800-7-cat3.yml +++ /dev/null @@ -1,305 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-7 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-7/proc_input/cat3" -output_path: "experiments/selection/P800-7/proc_output/cat3" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "ISM2" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 15 - c03: - type: mnru - q: 23 - c04: - type: mnru - q: 31 - c05: - type: mnru - q: 39 - c06: - type: mnru - q: 47 - c07: - type: esdru - alpha: 0.1 - c08: - type: esdru - alpha: 0.3 - c09: - type: esdru - alpha: 0.5 - c10: - type: esdru - alpha: 0.7 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - - c16: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c17: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c20: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM2" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM2" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM2" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM2" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "ISM2" - - c29: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c30: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - - c33: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c34: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c35: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c36: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-7/config/P800-7-cat4.yml b/experiments/selection/P800-7/config/P800-7-cat4.yml deleted file mode 100644 index ed17e8fe..00000000 --- a/experiments/selection/P800-7/config/P800-7-cat4.yml +++ /dev/null @@ -1,305 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-7 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-7/proc_input/cat4" -output_path: "experiments/selection/P800-7/proc_output/cat4" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "ISM2" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 15 - c03: - type: mnru - q: 23 - c04: - type: mnru - q: 31 - c05: - type: mnru - q: 39 - c06: - type: mnru - q: 47 - c07: - type: esdru - alpha: 0.1 - c08: - type: esdru - alpha: 0.3 - c09: - type: esdru - alpha: 0.5 - c10: - type: esdru - alpha: 0.7 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - - c16: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c17: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c20: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM2" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM2" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM2" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM2" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "ISM2" - - c29: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c30: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - - c33: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c34: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c35: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c36: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-7/config/P800-7-cat5.yml b/experiments/selection/P800-7/config/P800-7-cat5.yml deleted file mode 100644 index af2bc879..00000000 --- a/experiments/selection/P800-7/config/P800-7-cat5.yml +++ /dev/null @@ -1,305 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-7 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-7/proc_input/cat5" -output_path: "experiments/selection/P800-7/proc_output/cat5" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "ISM2" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 15 - c03: - type: mnru - q: 23 - c04: - type: mnru - q: 31 - c05: - type: mnru - q: 39 - c06: - type: mnru - q: 47 - c07: - type: esdru - alpha: 0.1 - c08: - type: esdru - alpha: 0.3 - c09: - type: esdru - alpha: 0.5 - c10: - type: esdru - alpha: 0.7 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - - c16: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c17: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c20: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM2" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM2" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM2" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM2" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "ISM2" - - c29: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c30: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - - c33: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c34: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c35: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c36: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-7/config/P800-7-cat6.yml b/experiments/selection/P800-7/config/P800-7-cat6.yml deleted file mode 100644 index c7e5371b..00000000 --- a/experiments/selection/P800-7/config/P800-7-cat6.yml +++ /dev/null @@ -1,305 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-7 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-7/proc_input/cat6" -output_path: "experiments/selection/P800-7/proc_output/cat6" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "ISM2" - # TODO: to be clarified in Test Plan - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 15 - c03: - type: mnru - q: 23 - c04: - type: mnru - q: 31 - c05: - type: mnru - q: 39 - c06: - type: mnru - q: 47 - c07: - type: esdru - alpha: 0.1 - c08: - type: esdru - alpha: 0.3 - c09: - type: esdru - alpha: 0.5 - c10: - type: esdru - alpha: 0.7 - - ### EVS condition ################################ - c11: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - - c16: - type: evs - bitrates: - - 8000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c17: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c18: - type: evs - bitrates: - - 16400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c19: - type: evs - bitrates: - - 24400 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - c20: - type: evs - bitrates: - - 8000 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 13200 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM2" - c25: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM2" - c26: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM2" - c27: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM2" - c28: - type: ivas - bitrates: - - 64000 - cod: - dec: - fmt: "ISM2" - - c29: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c30: - type: ivas - bitrates: - - 24400 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c31: - type: ivas - bitrates: - - 32000 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - c32: - type: ivas - bitrates: - - 48000 - cod: - dec: - fmt: "ISM2" - tx: - type: "FER" - error_rate: 5 - - c33: - type: ivas - bitrates: - - 16400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c34: - type: ivas - bitrates: - - 24400 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c35: - type: ivas - bitrates: - - 32000 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - c36: - type: ivas - bitrates: - - 48000 - cod: - opts: ["-dtx"] - dec: - fmt: "ISM2" - - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: "BINAURAL" - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-7/config/P800-7-cat1.yml b/experiments/selection/P800-7/config/P800-7.yml similarity index 97% rename from experiments/selection/P800-7/config/P800-7-cat1.yml rename to experiments/selection/P800-7/config/P800-7.yml index 10e50370..b584a724 100644 --- a/experiments/selection/P800-7/config/P800-7-cat1.yml +++ b/experiments/selection/P800-7/config/P800-7.yml @@ -7,8 +7,8 @@ name: P800-7 master_seed: 5 prerun_seed: 2 -input_path: "experiments/selection/P800-7/proc_input/cat1" -output_path: "experiments/selection/P800-7/proc_output/cat1" +input_path: "experiments/selection/P800-7/proc_input" +output_path: "experiments/selection/P800-7/proc_output" use_windows_codec_binaries: true condition_in_output_filename: true diff --git a/experiments/selection/P800-8/config/P800-8-cat2.yml b/experiments/selection/P800-8/config/P800-8-cat2.yml deleted file mode 100644 index e9aa8544..00000000 --- a/experiments/selection/P800-8/config/P800-8-cat2.yml +++ /dev/null @@ -1,344 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-8 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-8/proc_input/cat2" -output_path: "experiments/selection/P800-8/proc_output/cat2" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat2.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 28 - c04: - type: mnru - q: 24 - c05: - type: mnru - q: 20 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - # ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 7200 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 8000 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c17: - type: evs - bitrates: - - 9600 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c18: - type: evs - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 24400 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - - c20: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c24: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c25: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c26: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c27: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c28: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c29: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c30: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c31: - type: ivas - bitrates: - - 80000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - - c32: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c35: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c36: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: ["MASA2", "BINAURAL"] - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-8/config/P800-8-cat3.yml b/experiments/selection/P800-8/config/P800-8-cat3.yml deleted file mode 100644 index 64961169..00000000 --- a/experiments/selection/P800-8/config/P800-8-cat3.yml +++ /dev/null @@ -1,344 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-8 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-8/proc_input/cat3" -output_path: "experiments/selection/P800-8/proc_output/cat3" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat3.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 28 - c04: - type: mnru - q: 24 - c05: - type: mnru - q: 20 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - # ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 7200 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 8000 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c17: - type: evs - bitrates: - - 9600 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c18: - type: evs - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 24400 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - - c20: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c24: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c25: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c26: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c27: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c28: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c29: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c30: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c31: - type: ivas - bitrates: - - 80000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - - c32: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c35: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c36: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: ["MASA2", "BINAURAL"] - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-8/config/P800-8-cat4.yml b/experiments/selection/P800-8/config/P800-8-cat4.yml deleted file mode 100644 index 4c4c5429..00000000 --- a/experiments/selection/P800-8/config/P800-8-cat4.yml +++ /dev/null @@ -1,344 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-8 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-8/proc_input/cat4" -output_path: "experiments/selection/P800-8/proc_output/cat4" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat4.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 28 - c04: - type: mnru - q: 24 - c05: - type: mnru - q: 20 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - # ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 7200 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 8000 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c17: - type: evs - bitrates: - - 9600 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c18: - type: evs - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 24400 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - - c20: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c24: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c25: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c26: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c27: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c28: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c29: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c30: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c31: - type: ivas - bitrates: - - 80000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - - c32: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c35: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c36: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: ["MASA2", "BINAURAL"] - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-8/config/P800-8-cat5.yml b/experiments/selection/P800-8/config/P800-8-cat5.yml deleted file mode 100644 index 3ab95d39..00000000 --- a/experiments/selection/P800-8/config/P800-8-cat5.yml +++ /dev/null @@ -1,344 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-8 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-8/proc_input/cat5" -output_path: "experiments/selection/P800-8/proc_output/cat5" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat5.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 28 - c04: - type: mnru - q: 24 - c05: - type: mnru - q: 20 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - # ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 7200 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 8000 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c17: - type: evs - bitrates: - - 9600 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c18: - type: evs - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 24400 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - - c20: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c24: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c25: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c26: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c27: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c28: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c29: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c30: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c31: - type: ivas - bitrates: - - 80000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - - c32: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c35: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c36: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: ["MASA2", "BINAURAL"] - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-8/config/P800-8-cat6.yml b/experiments/selection/P800-8/config/P800-8-cat6.yml deleted file mode 100644 index d903c7ed..00000000 --- a/experiments/selection/P800-8/config/P800-8-cat6.yml +++ /dev/null @@ -1,344 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-8 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-8/proc_input/cat6" -output_path: "experiments/selection/P800-8/proc_output/cat6" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - repeat_signal: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 45 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat6.wav" - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 32 - c03: - type: mnru - q: 28 - c04: - type: mnru - q: 24 - c05: - type: mnru - q: 20 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - # ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c15: - type: evs - bitrates: - - 7200 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 8000 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c17: - type: evs - bitrates: - - 9600 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c18: - type: evs - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 24400 - cod: - fmt: "MASA2" - opts: ["-max_band", "FB"] - dec: - - c20: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c21: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c22: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c23: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c24: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### - c25: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c26: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c27: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c28: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c29: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c30: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c31: - type: ivas - bitrates: - - 80000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - - c32: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c33: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c34: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c35: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c36: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: ["MASA2", "BINAURAL"] - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-8/config/P800-8-cat1.yml b/experiments/selection/P800-8/config/P800-8.yml similarity index 97% rename from experiments/selection/P800-8/config/P800-8-cat1.yml rename to experiments/selection/P800-8/config/P800-8.yml index 81a89b53..2dbf23d2 100644 --- a/experiments/selection/P800-8/config/P800-8-cat1.yml +++ b/experiments/selection/P800-8/config/P800-8.yml @@ -7,8 +7,8 @@ name: P800-8 master_seed: 5 prerun_seed: 2 -input_path: "experiments/selection/P800-8/proc_input/cat1" -output_path: "experiments/selection/P800-8/proc_output/cat1" +input_path: "experiments/selection/P800-8/proc_input" +output_path: "experiments/selection/P800-8/proc_output" use_windows_codec_binaries: true condition_in_output_filename: true @@ -39,7 +39,7 @@ preprocessing_2: ### REQUIRED: SNR for background noise in dB snr: 45 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat1.wav" + background_noise_path: "experiments/selection/P800-8/background_noise/background_noise.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-9/config/P800-9-cat2.yml b/experiments/selection/P800-9/config/P800-9-cat2.yml deleted file mode 100644 index 37fefcee..00000000 --- a/experiments/selection/P800-9/config/P800-9-cat2.yml +++ /dev/null @@ -1,321 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-9 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-9/proc_input/cat2" -output_path: "experiments/selection/P800-9/proc_output/cat2" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 10 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-9/background_noise/background_noise_cat2.wav" - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 29 - c03: - type: mnru - q: 25 - c04: - type: mnru - q: 21 - c05: - type: mnru - q: 17 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - # ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c15: - type: evs - bitrates: - - 7200 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 9600 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - c17: - type: evs - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - - c18: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c20: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c25: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c26: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c27: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c28: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c29: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c30: - type: ivas - bitrates: - - 80000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - - c31: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c32: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c33: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c34: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c35: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c36: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: ["MASA2", "BINAURAL"] - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-9/config/P800-9-cat3.yml b/experiments/selection/P800-9/config/P800-9-cat3.yml deleted file mode 100644 index ebd7e193..00000000 --- a/experiments/selection/P800-9/config/P800-9-cat3.yml +++ /dev/null @@ -1,321 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-9 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-9/proc_input/cat3" -output_path: "experiments/selection/P800-9/proc_output/cat3" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-9/background_noise/background_noise_cat3.wav" - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 29 - c03: - type: mnru - q: 25 - c04: - type: mnru - q: 21 - c05: - type: mnru - q: 17 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - # ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c15: - type: evs - bitrates: - - 7200 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 9600 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - c17: - type: evs - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - - c18: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c20: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c25: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c26: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c27: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c28: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c29: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c30: - type: ivas - bitrates: - - 80000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - - c31: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c32: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c33: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c34: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c35: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c36: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: ["MASA2", "BINAURAL"] - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-9/config/P800-9-cat4.yml b/experiments/selection/P800-9/config/P800-9-cat4.yml deleted file mode 100644 index c7579d70..00000000 --- a/experiments/selection/P800-9/config/P800-9-cat4.yml +++ /dev/null @@ -1,321 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-9 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-9/proc_input/cat4" -output_path: "experiments/selection/P800-9/proc_output/cat4" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-9/background_noise/background_noise_cat4.wav" - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 29 - c03: - type: mnru - q: 25 - c04: - type: mnru - q: 21 - c05: - type: mnru - q: 17 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - # ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c15: - type: evs - bitrates: - - 7200 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 9600 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - c17: - type: evs - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - - c18: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c20: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c25: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c26: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c27: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c28: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c29: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c30: - type: ivas - bitrates: - - 80000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - - c31: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c32: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c33: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c34: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c35: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c36: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: ["MASA2", "BINAURAL"] - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-9/config/P800-9-cat5.yml b/experiments/selection/P800-9/config/P800-9-cat5.yml deleted file mode 100644 index 77e54cab..00000000 --- a/experiments/selection/P800-9/config/P800-9-cat5.yml +++ /dev/null @@ -1,321 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-9 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-9/proc_input/cat5" -output_path: "experiments/selection/P800-9/proc_output/cat5" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-9/background_noise/background_noise_cat5.wav" - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 29 - c03: - type: mnru - q: 25 - c04: - type: mnru - q: 21 - c05: - type: mnru - q: 17 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - # ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c15: - type: evs - bitrates: - - 7200 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 9600 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - c17: - type: evs - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - - c18: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c20: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c25: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c26: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c27: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c28: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c29: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c30: - type: ivas - bitrates: - - 80000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - - c31: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c32: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c33: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c34: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c35: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c36: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: ["MASA2", "BINAURAL"] - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-9/config/P800-9-cat6.yml b/experiments/selection/P800-9/config/P800-9-cat6.yml deleted file mode 100644 index 11c317df..00000000 --- a/experiments/selection/P800-9/config/P800-9-cat6.yml +++ /dev/null @@ -1,321 +0,0 @@ ---- -################################################ -# General configuration -################################################ - -name: P800-9 -master_seed: 5 -prerun_seed: 2 - -input_path: "experiments/selection/P800-9/proc_input/cat6" -output_path: "experiments/selection/P800-9/proc_output/cat6" -use_windows_codec_binaries: true -condition_in_output_filename: true - -################################################ -### Input configuration -################################################ -input: - fmt: "FOA" - fs: 48000 - -################################################ -### Pre-processing on individual items -################################################ -preprocessing: - mask: "HP50" - loudness: -26 - window: 100 - -################################################ -### Pre-processing on whole signal(s) -################################################ -preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true - background_noise: - ### REQUIRED: SNR for background noise in dB - snr: 15 - ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-9/background_noise/background_noise_cat6.wav" - repeat_signal: true - -################################################# -### Bitstream processing -################################################# - -################################################ -### Configuration for conditions under test -################################################ -conditions_to_generate: - ### Reference and anchor conditions ########################## - c01: - type: ref - c02: - type: mnru - q: 29 - c03: - type: mnru - q: 25 - c04: - type: mnru - q: 21 - c05: - type: mnru - q: 17 - c06: - type: esdru - alpha: 0.8 - c07: - type: esdru - alpha: 0.6 - c08: - type: esdru - alpha: 0.4 - - # ### EVS condition ################################ - c09: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-max_band", "FB"] - dec: - c10: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c11: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c12: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c13: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - c14: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-max_band", "FB"] - dec: - - c15: - type: evs - bitrates: - - 7200 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - c16: - type: evs - bitrates: - - 9600 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - c17: - type: evs - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-dtx", "-max_band", "FB"] - dec: - - c18: - type: evs - bitrates: - - 7200 - cod: - fmt: "PLANARFOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c19: - type: evs - bitrates: - - 7200 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c20: - type: evs - bitrates: - - 8000 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c21: - type: evs - bitrates: - - 9600 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c22: - type: evs - bitrates: - - 16400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - c23: - type: evs - bitrates: - - 24400 - cod: - fmt: "FOA" - opts: ["-dtx", "-max_band", "FB"] - dec: - - ### IVAS condition ############################### - c24: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c25: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c26: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c27: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c28: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c29: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - c30: - type: ivas - bitrates: - - 80000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - - c31: - type: ivas - bitrates: - - 13200 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c32: - type: ivas - bitrates: - - 16400 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c33: - type: ivas - bitrates: - - 24400 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c34: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c35: - type: ivas - bitrates: - - 48000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - c36: - type: ivas - bitrates: - - 64000 - cod: - fmt: "MASA2" - opts: ["-dtx"] - dec: - fmt: "MASA2" - -################################################ -### Post-processing -################################################ -postprocessing: - fmt: ["MASA2", "BINAURAL"] - fs: 48000 - loudness: -26 diff --git a/experiments/selection/P800-9/config/P800-9-cat1.yml b/experiments/selection/P800-9/config/P800-9.yml similarity index 97% rename from experiments/selection/P800-9/config/P800-9-cat1.yml rename to experiments/selection/P800-9/config/P800-9.yml index 14e85e8c..fe941a8a 100644 --- a/experiments/selection/P800-9/config/P800-9-cat1.yml +++ b/experiments/selection/P800-9/config/P800-9.yml @@ -7,8 +7,8 @@ name: P800-9 master_seed: 5 prerun_seed: 2 -input_path: "experiments/selection/P800-9/proc_input/cat1" -output_path: "experiments/selection/P800-9/proc_output/cat1" +input_path: "experiments/selection/P800-9/proc_input" +output_path: "experiments/selection/P800-9/proc_output" use_windows_codec_binaries: true condition_in_output_filename: true @@ -39,7 +39,7 @@ preprocessing_2: ### REQUIRED: SNR for background noise in dB snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) - background_noise_path: "experiments/selection/P800-9/background_noise/background_noise_cat1.wav" + background_noise_path: "experiments/selection/P800-9/background_noise/background_noise.wav" repeat_signal: true ################################################# diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 264e125b..d68a776c 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -134,10 +134,10 @@ def test_categories(exp_name): create_items_p800.create_items(exp_name) -@pytest.mark.parametrize("exp_name", ["P800-1"]) +@pytest.mark.parametrize("exp_name", [f"P800-{i}" for i in range(1, 10)]) @pytest.mark.parametrize("lab_id", ["a", "b", "c", "d"]) def test_experiment_setup(exp_name, lab_id): cfgs = create_experiment_config.create_experiment_setup(exp_name, lab_id) for cfg in cfgs: # create config for validation of folder structure to be present - config = TestConfig(cfg) + _ = TestConfig(cfg) -- GitLab From 1baedaf7b4f21a1ed676ae28d22d265b14744d2b Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 11:01:57 +0200 Subject: [PATCH 12/33] add two categories for MASA Mushra tests --- experiments/create_experiment_config.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py index 78ba5cf3..bec26fa5 100644 --- a/experiments/create_experiment_config.py +++ b/experiments/create_experiment_config.py @@ -13,6 +13,8 @@ HERE = Path(__file__).parent.absolute().resolve() IN_FMT_FOR_MASA_EXPS = { "P800-8": dict(zip([f"cat{i}" for i in range(1, 7)], ["FOA"] * 6)), "P800-9": dict(zip([f"cat{i}" for i in range(1, 7)], ["FOA"] * 6)), + "BS1534-7a": dict(zip([f"cat{i}" for i in range(1, 3)], ["FOA"] * 2)), + "BS1534-7b": dict(zip([f"cat{i}" for i in range(1, 3)], ["FOA"] * 2)), } @@ -23,7 +25,15 @@ def _get_seed(exp, lab): def create_experiment_setup(experiment, lab) -> list[Path]: default_cfg_path = HERE.joinpath(f"selection/{experiment}/config/{experiment}.yml") - categories = [f"cat{i}" for i in range(1, 7)] if experiment in EXPERIMENTS_P800 else [""] + num_categories = 1 + # for P800 we nee 6 categories (for each background/scene) + if experiment in EXPERIMENTS_P800: + num_categories = 6 + # for MUSHRA, we only need categories in the MASA tests, as there could be both FOA and HOA2 input + elif experiment in IN_FMT_FOR_MASA_EXPS: + num_categories = 2 + categories = [f"cat{i}" for i in range(1, num_categories + 1)] + seed = _get_seed(experiment, lab) base_path = Path(HERE.name).joinpath(f"selection/{experiment}") -- GitLab From 97001fc6ee01dadb04baa44b21e515030a493158 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 11:16:55 +0200 Subject: [PATCH 13/33] make config dump take into account modifications to the config --- ivas_processing_scripts/processing/config.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ivas_processing_scripts/processing/config.py b/ivas_processing_scripts/processing/config.py index 24c8808d..f7fc66b1 100755 --- a/ivas_processing_scripts/processing/config.py +++ b/ivas_processing_scripts/processing/config.py @@ -104,13 +104,11 @@ class TestConfig: # merge dictionaries, overriding from config file merge_dicts(cfg, file_cfg) self._validate_merged_config(cfg) + self._dump_keys = list(cfg.keys()) # set attributes from merged dictionary self.__dict__.update(cfg) - # store the merged config for writing to file later - self._yaml_dump = self._dump_yaml(cfg) - # convert to Path self.input_path = Path(self.input_path).resolve().absolute() self.output_path = Path(self.output_path).resolve().absolute() @@ -136,8 +134,9 @@ class TestConfig: return cfg def to_file(self, outfile: str|Path): + to_dump = self._dump_yaml({k:v for k, v in self.__dict__.items() if k in self._dump_keys}) with open(outfile, "w") as f: - yaml.safe_dump(self._yaml_dump, f) + yaml.safe_dump(to_dump, f) def _validate_file_cfg(self, cfg: dict, use_windows_codec_binaries: bool): """ensure configuration contains required keys""" -- GitLab From 10ded0d624b723b82e0f50a4ec6678cfda9537c6 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 12:02:57 +0200 Subject: [PATCH 14/33] fix yaml dump of paths --- ivas_processing_scripts/processing/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ivas_processing_scripts/processing/config.py b/ivas_processing_scripts/processing/config.py index f7fc66b1..1b0842fe 100755 --- a/ivas_processing_scripts/processing/config.py +++ b/ivas_processing_scripts/processing/config.py @@ -119,14 +119,14 @@ class TestConfig: return yaml.safe_load(fp) def _dump_yaml(self, cfg: dict): - """convert objects to to strings to avoid YAML dump as object""" + """convert Path objects to strings to avoid YAML dump as object""" cfg = deepcopy(cfg) def format(d: dict): for k, v in d.items(): if isinstance(v, dict): format(v) - else: + elif isinstance(v, Path): d[k] = str(v) format(cfg) @@ -136,7 +136,7 @@ class TestConfig: def to_file(self, outfile: str|Path): to_dump = self._dump_yaml({k:v for k, v in self.__dict__.items() if k in self._dump_keys}) with open(outfile, "w") as f: - yaml.safe_dump(to_dump, f) + yaml.dump(to_dump, f) def _validate_file_cfg(self, cfg: dict, use_windows_codec_binaries: bool): """ensure configuration contains required keys""" -- GitLab From 08350cb6b1225427608e0861cc0d1a9b3dc740a3 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 13:09:18 +0200 Subject: [PATCH 15/33] adapt tests to create configs with script --- tests/constants.py | 3 +++ tests/test_experiments.py | 34 ++++++++++++++-------------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/tests/constants.py b/tests/constants.py index 971e3828..6f0fcb14 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -31,6 +31,7 @@ # from pathlib import PurePath +from itertools import cycle """ Set up paths """ TESTS_DIR = PurePath(__file__).parent @@ -227,5 +228,7 @@ INPUT_EXPERIMENT_NAMES = [ "P800-8", "P800-9", ] +__LABS = cycle("abcd") +LAB_IDS_FOR_EXPERIMENTS = [next(__LABS) for e in INPUT_EXPERIMENT_NAMES] CREATE_CATEGORIES_TESTS = ["P800-2"] diff --git a/tests/test_experiments.py b/tests/test_experiments.py index d68a776c..e7047366 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -46,6 +46,7 @@ from tests.constants import ( FORMAT_TO_METADATA_FILES, INPUT_EXPERIMENT_NAMES, NCHAN_TO_FILE, + LAB_IDS_FOR_EXPERIMENTS, TESTS_DIR, ) from experiments import create_experiment_config, create_items_p800 @@ -59,7 +60,7 @@ class Arguments: self.debug = True -def setup_input_files_for_config(config, category=1): +def setup_input_files_for_config(config): input_path = Path(config.input_path).resolve().absolute() input_fmt = config.input["fmt"] @@ -104,34 +105,27 @@ def setup_input_files_for_config(config, category=1): write(bg_noise_path, noise) -@pytest.mark.parametrize("exp_name", INPUT_EXPERIMENT_NAMES) -def test_generate_test_items(exp_name): - cfg_dir = Path(TESTS_DIR).joinpath(EXPERIMENTS_DIR) - exp_path = Path(cfg_dir).joinpath(Path(exp_name)).resolve().absolute() - if not (cfg := exp_path.joinpath(f"config/{exp_name}.yml")).exists(): - # for the P800 tests - they have different configs per category - cfg = exp_path.joinpath(f"config/{exp_name}-cat1.yml") - args = Arguments(cfg) +@pytest.mark.parametrize("exp_lab_pair", zip(INPUT_EXPERIMENT_NAMES, LAB_IDS_FOR_EXPERIMENTS)) +def test_generate_test_items(exp_lab_pair): + exp_name, lab_id = exp_lab_pair + cfgs = sorted(create_experiment_config.create_experiment_setup(exp_name, lab_id)) + cfg = cfgs[0] + args = Arguments(cfg) config = TestConfig(cfg) - setup_input_files_for_config(config) - generate_test(args) @pytest.mark.parametrize("exp_name", CREATE_CATEGORIES_TESTS) -def test_categories(exp_name): - for cat in range(1, 7): - cfg_dir = Path(TESTS_DIR).joinpath(EXPERIMENTS_DIR) - cfg = Path(cfg_dir).joinpath(Path(exp_name)).resolve().absolute() - cfg = cfg.joinpath(f"config/{exp_name}-cat{cat}.yml") - +@pytest.mark.parametrize("lab_id", ["a", "b", "c", "d"]) +def test_categories(exp_name, lab_id): + cfgs = create_experiment_config.create_experiment_setup(exp_name, lab_id) + for cfg in cfgs: config = TestConfig(cfg) + setup_input_files_for_config(config) - setup_input_files_for_config(config, cat) - - create_items_p800.create_items(exp_name) + create_items_p800.create_items(exp_name, lab_id) @pytest.mark.parametrize("exp_name", [f"P800-{i}" for i in range(1, 10)]) -- GitLab From 53b1126ebf6a59bd452447e27b5c61b1adc545eb Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 13:11:10 +0200 Subject: [PATCH 16/33] activate test jobs again --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7b9c02c..aa518567 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,14 +74,15 @@ test_audiotools_convert: - python3 -m pytest -n auto tests/test_audiotools_convert.py # run the test configs for the selection experiments -.experiments: +experiments: stage: test tags: - linux script: - *print-common-info - *get-codec-binaries - - python3 -m pytest tests/test_experiments.py -n auto | tee log.txt + - python3 -m pytest tests/test_experiments.py::test_generate_test_items -n auto | tee log.txt + - python3 -m pytest tests/test_experiments.py::test_categories -n auto | tee log.txt artifacts: paths: - experiments/selection/*/proc_output/*.log @@ -104,7 +105,7 @@ experiment-setup: expire_in: "1 week" # run some test configs for item creation -.test_processing: +test_processing: stage: test rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' -- GitLab From 7b90aa4dec9f528b12a1fe0f7d11a89eabb094c0 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 14:08:02 +0200 Subject: [PATCH 17/33] make unique paths for cat/lab combi, not only for category -> should solve data race bug when running tests in parallel --- experiments/create_experiment_config.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py index 38eacb02..aff910a9 100644 --- a/experiments/create_experiment_config.py +++ b/experiments/create_experiment_config.py @@ -42,15 +42,16 @@ def create_experiment_setup(experiment, lab) -> list[Path]: cfgs = list() for cat in categories: - input_path = base_path.joinpath("proc_input").joinpath(cat) - output_path = base_path.joinpath("proc_output").joinpath(cat) - bg_noise_path = base_path.joinpath("background_noise").joinpath(f"background_noise_{cat}.wav") + suffix = cat + f"-lab_{lab}" + input_path = base_path.joinpath("proc_input").joinpath(suffix) + output_path = base_path.joinpath("proc_output").joinpath(suffix) + bg_noise_path = base_path.joinpath("background_noise").joinpath(f"background_noise_{suffix}.wav") cfg_path = default_cfg_path.parent.joinpath(f"{experiment}{cat}-lab_{lab}.yml") cfgs.append(cfg_path) # set new lab- and category-dependent values cfg = config.TestConfig(default_cfg_path) - cfg.name = f"{experiment}{cat}-lab_{lab}" + cfg.name = f"{experiment}{suffix}" cfg.prerun_seed = seed cfg.input_path = str(input_path) cfg.output_path = str(output_path) -- GitLab From 20ac983d57043768a6be2966e3749419dd542ad0 Mon Sep 17 00:00:00 2001 From: Treffehn Date: Mon, 5 Jun 2023 14:32:54 +0200 Subject: [PATCH 18/33] small change to use python 3.9 --- experiments/create_experiment_config.py | 3 +-- experiments/create_items_p800.py | 2 +- ivas_processing_scripts/processing/config.py | 3 ++- tests/constants.py | 2 +- tests/test_experiments.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py index aff910a9..1a72e419 100644 --- a/experiments/create_experiment_config.py +++ b/experiments/create_experiment_config.py @@ -1,13 +1,12 @@ #! /usr/bin/env python3 import argparse +import sys from pathlib import Path -import sys HERE = Path(__file__).parent.absolute().resolve() sys.path.append(str(HERE.parent)) from ivas_processing_scripts import config - EXPERIMENTS_P800 = [f"P800-{i}" for i in range(1, 10)] EXPERIMENTS_BS1534 = [f"BS1534-{i}{x}" for i in range(1, 8) for x in ["a", "b"]] EXPERIMENTS = EXPERIMENTS_P800 + EXPERIMENTS_BS1534 diff --git a/experiments/create_items_p800.py b/experiments/create_items_p800.py index d40599d9..7713fb32 100644 --- a/experiments/create_items_p800.py +++ b/experiments/create_items_p800.py @@ -1,8 +1,8 @@ #! /usr/bin/env python3 import argparse +import sys from pathlib import Path -import sys HERE = Path(__file__).parent.absolute() sys.path.append(str(HERE.parent)) from ivas_processing_scripts import main as generate_test diff --git a/ivas_processing_scripts/processing/config.py b/ivas_processing_scripts/processing/config.py index 1b0842fe..27b443a1 100755 --- a/ivas_processing_scripts/processing/config.py +++ b/ivas_processing_scripts/processing/config.py @@ -33,6 +33,7 @@ import platform from copy import deepcopy from pathlib import Path +from typing import Union import yaml @@ -133,7 +134,7 @@ class TestConfig: return cfg - def to_file(self, outfile: str|Path): + def to_file(self, outfile: Union[str, Path]): to_dump = self._dump_yaml({k:v for k, v in self.__dict__.items() if k in self._dump_keys}) with open(outfile, "w") as f: yaml.dump(to_dump, f) diff --git a/tests/constants.py b/tests/constants.py index 6f0fcb14..39881628 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -30,8 +30,8 @@ # the United Nations Convention on Contracts on the International Sales of Goods. # -from pathlib import PurePath from itertools import cycle +from pathlib import PurePath """ Set up paths """ TESTS_DIR = PurePath(__file__).parent diff --git a/tests/test_experiments.py b/tests/test_experiments.py index e7047366..bfd719f1 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -36,6 +36,7 @@ from pathlib import Path import pytest from numpy.random import random, seed +from experiments import create_experiment_config, create_items_p800 from ivas_processing_scripts import main as generate_test from ivas_processing_scripts.audiotools import audio from ivas_processing_scripts.audiotools.audiofile import concat, write @@ -45,11 +46,10 @@ from tests.constants import ( EXPERIMENTS_DIR, FORMAT_TO_METADATA_FILES, INPUT_EXPERIMENT_NAMES, - NCHAN_TO_FILE, LAB_IDS_FOR_EXPERIMENTS, + NCHAN_TO_FILE, TESTS_DIR, ) -from experiments import create_experiment_config, create_items_p800 BG_NOISE_NAME = "background_noise_cat.wav" -- GitLab From 3c4c3e800d72df69978c7ba016a22e1b0781f7c3 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 14:51:24 +0200 Subject: [PATCH 19/33] add constant module to experiments package --- experiments/constants.py | 5 +++++ experiments/create_experiment_config.py | 10 ++++------ experiments/{create_items_p800.py => create_items.py} | 7 +++---- tests/test_experiments.py | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 experiments/constants.py rename experiments/{create_items_p800.py => create_items.py} (85%) diff --git a/experiments/constants.py b/experiments/constants.py new file mode 100644 index 00000000..c4d821f7 --- /dev/null +++ b/experiments/constants.py @@ -0,0 +1,5 @@ +from pathlib import Path + +EXPERIMENTS_P800 = [f"P800-{i}" for i in range(1, 10)] +EXPERIMENTS_BS1534 = [f"BS1534-{i}{x}" for i in range(1, 8) for x in ["a", "b"]] +LAB_IDS = ["a", "b", "c", "d"] \ No newline at end of file diff --git a/experiments/create_experiment_config.py b/experiments/create_experiment_config.py index aff910a9..15d5b494 100644 --- a/experiments/create_experiment_config.py +++ b/experiments/create_experiment_config.py @@ -6,12 +6,9 @@ import sys HERE = Path(__file__).parent.absolute().resolve() sys.path.append(str(HERE.parent)) from ivas_processing_scripts import config +from .constants import EXPERIMENTS_P800, EXPERIMENTS_BS1534, LAB_IDS -EXPERIMENTS_P800 = [f"P800-{i}" for i in range(1, 10)] -EXPERIMENTS_BS1534 = [f"BS1534-{i}{x}" for i in range(1, 8) for x in ["a", "b"]] -EXPERIMENTS = EXPERIMENTS_P800 + EXPERIMENTS_BS1534 -LABS = ["a", "b", "c", "d"] # TODO: this is a placeholder for later, currently everything is FOA IN_FMT_FOR_MASA_EXPS = { "P800-8": dict(zip([f"cat{i}" for i in range(1, 7)], ["FOA"] * 6)), @@ -22,7 +19,8 @@ IN_FMT_FOR_MASA_EXPS = { def _get_seed(exp, lab): - return 101 + EXPERIMENTS.index(exp) * 4 + LABS.index(lab) + experiments = EXPERIMENTS_P800 + EXPERIMENTS_BS1534 + return 101 + experiments.index(exp) * 4 + LAB_IDS.index(lab) def create_experiment_setup(experiment, lab) -> list[Path]: @@ -82,7 +80,7 @@ def create_experiment_setup(experiment, lab) -> list[Path]: if __name__ == "__main__": parser = argparse.ArgumentParser() parser.add_argument("experiment", type=str, choices=EXPERIMENTS_BS1534+EXPERIMENTS_P800) - parser.add_argument("lab", type=str, choices=LABS) + parser.add_argument("lab", type=str, choices=LAB_IDS) args = parser.parse_args() diff --git a/experiments/create_items_p800.py b/experiments/create_items.py similarity index 85% rename from experiments/create_items_p800.py rename to experiments/create_items.py index d40599d9..1a654dac 100644 --- a/experiments/create_items_p800.py +++ b/experiments/create_items.py @@ -8,8 +8,7 @@ sys.path.append(str(HERE.parent)) from ivas_processing_scripts import main as generate_test from ivas_processing_scripts.utils import apply_func_parallel -P800_TESTS = [f"P800-{i}" for i in range(1, 8)] -LABS = ["a", "b", "c", "d"] +from .constants import EXPERIMENTS_P800, LAB_IDS class Arguments: @@ -31,8 +30,8 @@ def create_items(experiment, lab): # if is necessary here so that multiprocessing does not crash if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument("experiment", choices=P800_TESTS) - parser.add_argument("lab", choices=LABS) + parser.add_argument("experiment", choices=EXPERIMENTS_P800) + parser.add_argument("lab", choices=LAB_IDS) args = parser.parse_args() create_items(args.experiment, args.lab) diff --git a/tests/test_experiments.py b/tests/test_experiments.py index e7047366..918af76a 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -49,7 +49,7 @@ from tests.constants import ( LAB_IDS_FOR_EXPERIMENTS, TESTS_DIR, ) -from experiments import create_experiment_config, create_items_p800 +from experiments import create_experiment_config, create_items BG_NOISE_NAME = "background_noise_cat.wav" @@ -125,7 +125,7 @@ def test_categories(exp_name, lab_id): config = TestConfig(cfg) setup_input_files_for_config(config) - create_items_p800.create_items(exp_name, lab_id) + create_items.create_items(exp_name, lab_id) @pytest.mark.parametrize("exp_name", [f"P800-{i}" for i in range(1, 10)]) -- GitLab From 02406cb24ad5a5fb294932cd27d5be085a6cf559 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 16:37:58 +0200 Subject: [PATCH 20/33] move scripts out of experiments folder and unify into one script --- experiments/__init__.py | 0 experiments/constants.py | 5 -- experiments/create_items.py | 37 ---------- ...e_experiment_config.py => generate_test.py | 69 +++++++++++++++---- 4 files changed, 55 insertions(+), 56 deletions(-) delete mode 100644 experiments/__init__.py delete mode 100644 experiments/constants.py delete mode 100644 experiments/create_items.py rename experiments/create_experiment_config.py => generate_test.py (56%) diff --git a/experiments/__init__.py b/experiments/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/experiments/constants.py b/experiments/constants.py deleted file mode 100644 index c4d821f7..00000000 --- a/experiments/constants.py +++ /dev/null @@ -1,5 +0,0 @@ -from pathlib import Path - -EXPERIMENTS_P800 = [f"P800-{i}" for i in range(1, 10)] -EXPERIMENTS_BS1534 = [f"BS1534-{i}{x}" for i in range(1, 8) for x in ["a", "b"]] -LAB_IDS = ["a", "b", "c", "d"] \ No newline at end of file diff --git a/experiments/create_items.py b/experiments/create_items.py deleted file mode 100644 index 1a654dac..00000000 --- a/experiments/create_items.py +++ /dev/null @@ -1,37 +0,0 @@ -#! /usr/bin/env python3 -import argparse -from pathlib import Path - -import sys -HERE = Path(__file__).parent.absolute() -sys.path.append(str(HERE.parent)) -from ivas_processing_scripts import main as generate_test -from ivas_processing_scripts.utils import apply_func_parallel - -from .constants import EXPERIMENTS_P800, LAB_IDS - - -class Arguments: - def __init__(self, config): - self.config = config - self.debug = False - # used to overwrite the multiprocessing key in the configs to rather parallelize on category level - self.multiprocessing = False - - -def create_items(experiment, lab): - p800_path = Path(f"experiments/selection/{experiment}") - p800_cfgs = p800_path.joinpath("config").glob(f"{experiment}cat*-lab_{lab}.yml") - - args = [Arguments(str(cfg)) for cfg in p800_cfgs] - apply_func_parallel(generate_test, zip(args), type="mp") - - -# if is necessary here so that multiprocessing does not crash -if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument("experiment", choices=EXPERIMENTS_P800) - parser.add_argument("lab", choices=LAB_IDS) - args = parser.parse_args() - - create_items(args.experiment, args.lab) diff --git a/experiments/create_experiment_config.py b/generate_test.py similarity index 56% rename from experiments/create_experiment_config.py rename to generate_test.py index 15d5b494..eda72d57 100644 --- a/experiments/create_experiment_config.py +++ b/generate_test.py @@ -1,13 +1,16 @@ #! /usr/bin/env python3 + import argparse from pathlib import Path -import sys -HERE = Path(__file__).parent.absolute().resolve() -sys.path.append(str(HERE.parent)) -from ivas_processing_scripts import config -from .constants import EXPERIMENTS_P800, EXPERIMENTS_BS1534, LAB_IDS +HERE = Path(__file__).parent.absolute() + +from ivas_processing_scripts import main as generate_test, config +from ivas_processing_scripts.utils import apply_func_parallel +EXPERIMENTS_P800 = [f"P800-{i}" for i in range(1, 10)] +EXPERIMENTS_BS1534 = [f"BS1534-{i}{x}" for i in range(1, 8) for x in ["a", "b"]] +LAB_IDS = ["a", "b", "c", "d"] # TODO: this is a placeholder for later, currently everything is FOA IN_FMT_FOR_MASA_EXPS = { @@ -18,12 +21,30 @@ IN_FMT_FOR_MASA_EXPS = { } -def _get_seed(exp, lab): - experiments = EXPERIMENTS_P800 + EXPERIMENTS_BS1534 - return 101 + experiments.index(exp) * 4 + LAB_IDS.index(lab) +def generate_tests(exp_lab_pairs, run_parallel=True): + """ + Create configs and run them for all given experiment/lab pairs + """ + # get config paths for all given experiment/lab combis and flatten into single list + cfgs = [create_experiment_setup(exp, lab) for exp, lab in exp_lab_pairs] + cfgs = [c for cl in cfgs for c in cl] + + args = [Arguments(str, cfg) for cfg in cfgs] + apply_func_parallel(generate_test, zip(args), type="mp" if run_parallel else None) + + +class Arguments: + def __init__(self, config): + self.config = config + self.debug = False + # used to overwrite the multiprocessing key in the configs to rather parallelize on category level + self.multiprocessing = False def create_experiment_setup(experiment, lab) -> list[Path]: + """ + Create the config files for all categories for the given experiment and lab id. + """ default_cfg_path = HERE.joinpath(f"selection/{experiment}/config/{experiment}.yml") num_categories = 1 @@ -35,7 +56,10 @@ def create_experiment_setup(experiment, lab) -> list[Path]: num_categories = 2 categories = [f"cat{i}" for i in range(1, num_categories + 1)] - seed = _get_seed(experiment, lab) + # calculate the seed value according to processing plan + experiments = EXPERIMENTS_P800 + EXPERIMENTS_BS1534 + seed = 101 + experiments.index(exp) * 4 + LAB_IDS.index(lab) + base_path = Path(HERE.name).joinpath(f"selection/{experiment}") cfgs = list() @@ -77,11 +101,28 @@ def create_experiment_setup(experiment, lab) -> list[Path]: return cfgs +def exp_lab_pair(arg): + """ + Validation function for command line input + """ + exp, lab = arg.split(',') + + msg = "'{}' is not a valid {}. Possible values are: {}" + if exp not in EXPERIMENTS_BS1534 + EXPERIMENTS_P800: + experiments_msg = ",".join(EXPERIMENTS_BS1534 + EXPERIMENTS_P800) + err_msg = msg.format(exp, "experiment name", f"{{{experiments_msg}}}.") + raise ValueError(err_msg) + if lab not in LAB_IDS: + labs_msg = ",".join(LAB_IDS) + err_msg = msg.format(lab, "lab identifier", labs_msg) + raise ValueError(err_msg) + + return exp, lab + + if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument("experiment", type=str, choices=EXPERIMENTS_BS1534+EXPERIMENTS_P800) - parser.add_argument("lab", type=str, choices=LAB_IDS) - + parser.add_argument("exp_lab_pairs", type=exp_lab_pair, nargs="+", help="The combinations of experiment/lab-id that you want to generate, separated by whitespace. Experiment and lab id need to be separated by a comma.") + parser.add_argument("--no_parallel", action="store_true", help="If given, configs will not be run in parallel") args = parser.parse_args() - - create_experiment_setup(args.experiment, args.lab) + generate_tests(args.exp_lab_pairs, not args.no_parallel) -- GitLab From eddac253773fb6dc47642fb71fe3442c01639bd9 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 16:50:05 +0200 Subject: [PATCH 21/33] add argument for only creating the config files + small fixes --- generate_test.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/generate_test.py b/generate_test.py index eda72d57..08616378 100644 --- a/generate_test.py +++ b/generate_test.py @@ -2,34 +2,34 @@ import argparse from pathlib import Path - -HERE = Path(__file__).parent.absolute() - from ivas_processing_scripts import main as generate_test, config from ivas_processing_scripts.utils import apply_func_parallel +HERE = Path(__file__).parent.absolute() EXPERIMENTS_P800 = [f"P800-{i}" for i in range(1, 10)] EXPERIMENTS_BS1534 = [f"BS1534-{i}{x}" for i in range(1, 8) for x in ["a", "b"]] LAB_IDS = ["a", "b", "c", "d"] - -# TODO: this is a placeholder for later, currently everything is FOA IN_FMT_FOR_MASA_EXPS = { "P800-8": dict(zip([f"cat{i}" for i in range(1, 7)], ["FOA"] * 6)), "P800-9": dict(zip([f"cat{i}" for i in range(1, 7)], ["FOA"] * 6)), - "BS1534-7a": dict(zip([f"cat{i}" for i in range(1, 3)], ["FOA"] * 2)), - "BS1534-7b": dict(zip([f"cat{i}" for i in range(1, 3)], ["FOA"] * 2)), + "BS1534-7a": {"cat1": "FOA", "cat2": "HOA2"}, + "BS1534-7b": {"cat1": "FOA", "cat2": "HOA2"}, } -def generate_tests(exp_lab_pairs, run_parallel=True): +def generate_tests(exp_lab_pairs, run_parallel=True, create_cfg_only=False): """ Create configs and run them for all given experiment/lab pairs """ - # get config paths for all given experiment/lab combis and flatten into single list + # get config paths for all given experiment/lab combis cfgs = [create_experiment_setup(exp, lab) for exp, lab in exp_lab_pairs] - cfgs = [c for cl in cfgs for c in cl] - args = [Arguments(str, cfg) for cfg in cfgs] + if create_cfg_only: + return + + # flatten into single list + cfgs = [c for cl in cfgs for c in cl] + args = [Arguments(str(cfg)) for cfg in cfgs] apply_func_parallel(generate_test, zip(args), type="mp" if run_parallel else None) @@ -45,7 +45,7 @@ def create_experiment_setup(experiment, lab) -> list[Path]: """ Create the config files for all categories for the given experiment and lab id. """ - default_cfg_path = HERE.joinpath(f"selection/{experiment}/config/{experiment}.yml") + default_cfg_path = HERE.joinpath(f"experiments/selection/{experiment}/config/{experiment}.yml") num_categories = 1 # for P800 we nee 6 categories (for each background/scene) @@ -58,9 +58,9 @@ def create_experiment_setup(experiment, lab) -> list[Path]: # calculate the seed value according to processing plan experiments = EXPERIMENTS_P800 + EXPERIMENTS_BS1534 - seed = 101 + experiments.index(exp) * 4 + LAB_IDS.index(lab) + seed = 101 + experiments.index(experiment) * 4 + LAB_IDS.index(lab) - base_path = Path(HERE.name).joinpath(f"selection/{experiment}") + base_path = Path(HERE.name).joinpath(f"experiments/selection/{experiment}") cfgs = list() for cat in categories: @@ -124,5 +124,6 @@ if __name__ == "__main__": parser = argparse.ArgumentParser() parser.add_argument("exp_lab_pairs", type=exp_lab_pair, nargs="+", help="The combinations of experiment/lab-id that you want to generate, separated by whitespace. Experiment and lab id need to be separated by a comma.") parser.add_argument("--no_parallel", action="store_true", help="If given, configs will not be run in parallel") + parser.add_argument("--create_cfg_only", action="store_true", help="If given, only create the configs and folder structure without processing items") args = parser.parse_args() - generate_tests(args.exp_lab_pairs, not args.no_parallel) + generate_tests(args.exp_lab_pairs, not args.no_parallel, args.create_cfg_only) -- GitLab From 7237395c6c826b29f0e9bcc803652756c6c3ae83 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 17:11:07 +0200 Subject: [PATCH 22/33] use new script in tests --- tests/constants.py | 4 +--- tests/test_experiments.py | 41 +++++++-------------------------------- 2 files changed, 8 insertions(+), 37 deletions(-) diff --git a/tests/constants.py b/tests/constants.py index 6f0fcb14..be89d1c9 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -219,7 +219,7 @@ INPUT_EXPERIMENT_NAMES = [ "BS1534-7a", "BS1534-7b", "P800-1", - # P800-2 is tested category-wise, see below + "P800-2", "P800-3", "P800-4", "P800-5", @@ -230,5 +230,3 @@ INPUT_EXPERIMENT_NAMES = [ ] __LABS = cycle("abcd") LAB_IDS_FOR_EXPERIMENTS = [next(__LABS) for e in INPUT_EXPERIMENT_NAMES] - -CREATE_CATEGORIES_TESTS = ["P800-2"] diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 918af76a..7c198183 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -34,6 +34,7 @@ import shutil from pathlib import Path import pytest +import sys from numpy.random import random, seed from ivas_processing_scripts import main as generate_test @@ -41,23 +42,15 @@ from ivas_processing_scripts.audiotools import audio from ivas_processing_scripts.audiotools.audiofile import concat, write from ivas_processing_scripts.processing.config import TestConfig from tests.constants import ( - CREATE_CATEGORIES_TESTS, - EXPERIMENTS_DIR, FORMAT_TO_METADATA_FILES, INPUT_EXPERIMENT_NAMES, NCHAN_TO_FILE, LAB_IDS_FOR_EXPERIMENTS, - TESTS_DIR, ) -from experiments import create_experiment_config, create_items -BG_NOISE_NAME = "background_noise_cat.wav" - - -class Arguments: - def __init__(self, config): - self.config = config - self.debug = True +HERE = Path(__file__).parent.absolute() +sys.path.append(HERE.parent) +from generate_test import create_experiment_setup, Arguments def setup_input_files_for_config(config): @@ -108,30 +101,10 @@ def setup_input_files_for_config(config): @pytest.mark.parametrize("exp_lab_pair", zip(INPUT_EXPERIMENT_NAMES, LAB_IDS_FOR_EXPERIMENTS)) def test_generate_test_items(exp_lab_pair): exp_name, lab_id = exp_lab_pair - cfgs = sorted(create_experiment_config.create_experiment_setup(exp_name, lab_id)) - cfg = cfgs[0] - - args = Arguments(cfg) - config = TestConfig(cfg) - setup_input_files_for_config(config) - generate_test(args) - + cfgs = create_experiment_setup(exp_name, lab_id) -@pytest.mark.parametrize("exp_name", CREATE_CATEGORIES_TESTS) -@pytest.mark.parametrize("lab_id", ["a", "b", "c", "d"]) -def test_categories(exp_name, lab_id): - cfgs = create_experiment_config.create_experiment_setup(exp_name, lab_id) for cfg in cfgs: + args = Arguments(str(cfg)) config = TestConfig(cfg) setup_input_files_for_config(config) - - create_items.create_items(exp_name, lab_id) - - -@pytest.mark.parametrize("exp_name", [f"P800-{i}" for i in range(1, 10)]) -@pytest.mark.parametrize("lab_id", ["a", "b", "c", "d"]) -def test_experiment_setup(exp_name, lab_id): - cfgs = create_experiment_config.create_experiment_setup(exp_name, lab_id) - for cfg in cfgs: - # create config for validation of folder structure to be present - _ = TestConfig(cfg) + generate_test(args) -- GitLab From 47c27bf8e880b60e399fbb7224b5509d3efb7e98 Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 17:18:27 +0200 Subject: [PATCH 23/33] cleanup and formatting --- generate_test.py | 37 +++++++++++++++----- ivas_processing_scripts/processing/config.py | 4 ++- tests/test_experiments.py | 9 ++--- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/generate_test.py b/generate_test.py index 08616378..63ef79db 100644 --- a/generate_test.py +++ b/generate_test.py @@ -2,7 +2,9 @@ import argparse from pathlib import Path -from ivas_processing_scripts import main as generate_test, config + +from ivas_processing_scripts import config +from ivas_processing_scripts import main as generate_test from ivas_processing_scripts.utils import apply_func_parallel HERE = Path(__file__).parent.absolute() @@ -45,7 +47,9 @@ def create_experiment_setup(experiment, lab) -> list[Path]: """ Create the config files for all categories for the given experiment and lab id. """ - default_cfg_path = HERE.joinpath(f"experiments/selection/{experiment}/config/{experiment}.yml") + default_cfg_path = HERE.joinpath( + f"experiments/selection/{experiment}/config/{experiment}.yml" + ) num_categories = 1 # for P800 we nee 6 categories (for each background/scene) @@ -67,7 +71,9 @@ def create_experiment_setup(experiment, lab) -> list[Path]: suffix = cat + f"-lab_{lab}" input_path = base_path.joinpath("proc_input").joinpath(suffix) output_path = base_path.joinpath("proc_output").joinpath(suffix) - bg_noise_path = base_path.joinpath("background_noise").joinpath(f"background_noise_{suffix}.wav") + bg_noise_path = base_path.joinpath("background_noise").joinpath( + f"background_noise_{suffix}.wav" + ) cfg_path = default_cfg_path.parent.joinpath(f"{experiment}{cat}-lab_{lab}.yml") cfgs.append(cfg_path) @@ -77,7 +83,9 @@ def create_experiment_setup(experiment, lab) -> list[Path]: cfg.prerun_seed = seed cfg.input_path = str(input_path) cfg.output_path = str(output_path) - if (bg_noise_pre_proc_2 := cfg.preprocessing_2.get("background_noise", None)) is not None: + if ( + bg_noise_pre_proc_2 := cfg.preprocessing_2.get("background_noise", None) + ) is not None: bg_noise_pre_proc_2["background_noise_path"] = str(bg_noise_path) # bg noise SNR only differs from default config for some experiments @@ -105,7 +113,7 @@ def exp_lab_pair(arg): """ Validation function for command line input """ - exp, lab = arg.split(',') + exp, lab = arg.split(",") msg = "'{}' is not a valid {}. Possible values are: {}" if exp not in EXPERIMENTS_BS1534 + EXPERIMENTS_P800: @@ -122,8 +130,21 @@ def exp_lab_pair(arg): if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument("exp_lab_pairs", type=exp_lab_pair, nargs="+", help="The combinations of experiment/lab-id that you want to generate, separated by whitespace. Experiment and lab id need to be separated by a comma.") - parser.add_argument("--no_parallel", action="store_true", help="If given, configs will not be run in parallel") - parser.add_argument("--create_cfg_only", action="store_true", help="If given, only create the configs and folder structure without processing items") + parser.add_argument( + "exp_lab_pairs", + type=exp_lab_pair, + nargs="+", + help="The combinations of experiment/lab-id that you want to generate, separated by whitespace. Experiment and lab id need to be separated by a comma.", + ) + parser.add_argument( + "--no_parallel", + action="store_true", + help="If given, configs will not be run in parallel", + ) + parser.add_argument( + "--create_cfg_only", + action="store_true", + help="If given, only create the configs and folder structure without processing items", + ) args = parser.parse_args() generate_tests(args.exp_lab_pairs, not args.no_parallel, args.create_cfg_only) diff --git a/ivas_processing_scripts/processing/config.py b/ivas_processing_scripts/processing/config.py index 27b443a1..d813f766 100755 --- a/ivas_processing_scripts/processing/config.py +++ b/ivas_processing_scripts/processing/config.py @@ -135,7 +135,9 @@ class TestConfig: return cfg def to_file(self, outfile: Union[str, Path]): - to_dump = self._dump_yaml({k:v for k, v in self.__dict__.items() if k in self._dump_keys}) + to_dump = self._dump_yaml( + {k: v for k, v in self.__dict__.items() if k in self._dump_keys} + ) with open(outfile, "w") as f: yaml.dump(to_dump, f) diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 17368783..d8543d78 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -31,13 +31,12 @@ # import shutil +import sys from pathlib import Path import pytest -import sys from numpy.random import random, seed -from experiments import create_experiment_config, create_items_p800 from ivas_processing_scripts import main as generate_test from ivas_processing_scripts.audiotools import audio from ivas_processing_scripts.audiotools.audiofile import concat, write @@ -51,7 +50,7 @@ from tests.constants import ( HERE = Path(__file__).parent.absolute() sys.path.append(HERE.parent) -from generate_test import create_experiment_setup, Arguments +from generate_test import Arguments, create_experiment_setup def setup_input_files_for_config(config): @@ -99,7 +98,9 @@ def setup_input_files_for_config(config): write(bg_noise_path, noise) -@pytest.mark.parametrize("exp_lab_pair", zip(INPUT_EXPERIMENT_NAMES, LAB_IDS_FOR_EXPERIMENTS)) +@pytest.mark.parametrize( + "exp_lab_pair", zip(INPUT_EXPERIMENT_NAMES, LAB_IDS_FOR_EXPERIMENTS) +) def test_generate_test_items(exp_lab_pair): exp_name, lab_id = exp_lab_pair cfgs = create_experiment_setup(exp_name, lab_id) -- GitLab From 6c17bb57f0c15f9d5582c20c69a07e553cf00e7f Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 17:28:53 +0200 Subject: [PATCH 24/33] ignore the generated config files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3f2d086e..e922075f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ mc.double experiments/selection/*/proc_input/*.wav experiments/selection/*/proc_input/*.pcm experiments/selection/*/proc_output/ +experiments/selection/*/config/*cat*-lab_*.yml *~ tests/tmp_output_* tests/cut -- GitLab From 12a7a14581bc0a2ed8457e8c868d0bc4da4b88ff Mon Sep 17 00:00:00 2001 From: knj Date: Mon, 5 Jun 2023 17:37:40 +0200 Subject: [PATCH 25/33] add help text and printout info --- generate_test.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/generate_test.py b/generate_test.py index 63ef79db..aa1c6591 100644 --- a/generate_test.py +++ b/generate_test.py @@ -25,12 +25,14 @@ def generate_tests(exp_lab_pairs, run_parallel=True, create_cfg_only=False): """ # get config paths for all given experiment/lab combis cfgs = [create_experiment_setup(exp, lab) for exp, lab in exp_lab_pairs] + # flatten into single list + cfgs = [c for cl in cfgs for c in cl] if create_cfg_only: + print("Configs generated:") + print("\n".join(["- " + cfg.name for cfg in cfgs])) return - # flatten into single list - cfgs = [c for cl in cfgs for c in cl] args = [Arguments(str(cfg)) for cfg in cfgs] apply_func_parallel(generate_test, zip(args), type="mp" if run_parallel else None) @@ -129,7 +131,7 @@ def exp_lab_pair(arg): if __name__ == "__main__": - parser = argparse.ArgumentParser() + parser = argparse.ArgumentParser(description="Generate config files and process files for selecton experiments. Experiment names and lab ids must be given as comma-separated pairs (e.g. 'P800-5,b BS1534-4a,d ...')") parser.add_argument( "exp_lab_pairs", type=exp_lab_pair, -- GitLab From e34264c82cd2cfa89c7a88d09e78c04bfe1f6a77 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 6 Jun 2023 09:27:17 +0200 Subject: [PATCH 26/33] only test one config per experiment for shorter runtime --- .gitlab-ci.yml | 15 --------------- tests/test_experiments.py | 10 +++++----- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa518567..d5a2b1b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,7 +82,6 @@ experiments: - *print-common-info - *get-codec-binaries - python3 -m pytest tests/test_experiments.py::test_generate_test_items -n auto | tee log.txt - - python3 -m pytest tests/test_experiments.py::test_categories -n auto | tee log.txt artifacts: paths: - experiments/selection/*/proc_output/*.log @@ -90,20 +89,6 @@ experiments: when: on_failure expire_in: 1 week -# test the lab/category-wise config creation -experiment-setup: - stage: test - tags: - - linux - script: - - *print-common-info - - python3 -m pytest tests/test_experiments.py::test_experiment_setup -n auto | tee log.txt - artifacts: - paths: - - log.txt - when: always - expire_in: "1 week" - # run some test configs for item creation test_processing: stage: test diff --git a/tests/test_experiments.py b/tests/test_experiments.py index d8543d78..e57a77dc 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -104,9 +104,9 @@ def setup_input_files_for_config(config): def test_generate_test_items(exp_lab_pair): exp_name, lab_id = exp_lab_pair cfgs = create_experiment_setup(exp_name, lab_id) + cfg = cfgs[0] - for cfg in cfgs: - args = Arguments(str(cfg)) - config = TestConfig(cfg) - setup_input_files_for_config(config) - generate_test(args) + args = Arguments(str(cfg)) + config = TestConfig(cfg) + setup_input_files_for_config(config) + generate_test(args) -- GitLab From c95396bf94ed4ffdd2b1d43c514e6e48a51336c0 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 6 Jun 2023 09:50:06 +0200 Subject: [PATCH 27/33] run formatter --- generate_test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generate_test.py b/generate_test.py index aa1c6591..65f1f649 100644 --- a/generate_test.py +++ b/generate_test.py @@ -131,7 +131,9 @@ def exp_lab_pair(arg): if __name__ == "__main__": - parser = argparse.ArgumentParser(description="Generate config files and process files for selecton experiments. Experiment names and lab ids must be given as comma-separated pairs (e.g. 'P800-5,b BS1534-4a,d ...')") + parser = argparse.ArgumentParser( + description="Generate config files and process files for selecton experiments. Experiment names and lab ids must be given as comma-separated pairs (e.g. 'P800-5,b BS1534-4a,d ...')" + ) parser.add_argument( "exp_lab_pairs", type=exp_lab_pair, -- GitLab From 0ebec021f52eaf519cf986572320f6567ce1156a Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 6 Jun 2023 10:03:23 +0200 Subject: [PATCH 28/33] fix formatter and linter complains --- generate_test.py | 30 +++++++++++++++++++++++++++++ ivas_processing_scripts/__init__.py | 2 -- tests/test_experiments.py | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/generate_test.py b/generate_test.py index 65f1f649..629e44bb 100644 --- a/generate_test.py +++ b/generate_test.py @@ -1,5 +1,35 @@ #! /usr/bin/env python3 +# +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +# contributors to this repository. All Rights Reserved. +# +# This software is protected by copyright law and by international treaties. +# The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, +# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +# contributors to this repository retain full ownership rights in their respective contributions in +# the software. This notice grants no license of any kind, including but not limited to patent +# license, nor is any license granted by implication, estoppel or otherwise. +# +# Contributors are required to enter into the IVAS codec Public Collaboration agreement before making +# contributions. +# +# This software is provided "AS IS", without any express or implied warranties. The software is in the +# development stage. It is intended exclusively for experts who have experience with such software and +# solely for the purpose of inspection. All implied warranties of non-infringement, merchantability +# and fitness for a particular purpose are hereby disclaimed and excluded. +# +# Any dispute, controversy or claim arising under or in relation to providing this software shall be +# submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in +# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and +# the United Nations Convention on Contracts on the International Sales of Goods. +# + import argparse from pathlib import Path diff --git a/ivas_processing_scripts/__init__.py b/ivas_processing_scripts/__init__.py index 60e6dc10..ce54f6d4 100755 --- a/ivas_processing_scripts/__init__.py +++ b/ivas_processing_scripts/__init__.py @@ -33,8 +33,6 @@ import logging from itertools import repeat -import yaml - from ivas_processing_scripts.audiotools.metadata import check_ISM_metadata from ivas_processing_scripts.constants import ( LOGGER_DATEFMT, diff --git a/tests/test_experiments.py b/tests/test_experiments.py index e57a77dc..a073b2e9 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -50,7 +50,7 @@ from tests.constants import ( HERE = Path(__file__).parent.absolute() sys.path.append(HERE.parent) -from generate_test import Arguments, create_experiment_setup +from generate_test import Arguments, create_experiment_setup # NOQA def setup_input_files_for_config(config): -- GitLab From 9d447ecc0871eadbf50c28d9b67eba5819e80462 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 6 Jun 2023 11:47:50 +0200 Subject: [PATCH 29/33] add description in readme --- README.md | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 934940ae..5d1421d1 100755 --- a/README.md +++ b/README.md @@ -690,8 +690,35 @@ ISM Please refer to [the notebook](./examples/audiotools.ipynb) for an overview. -# Selection test experiments +# How to generate the configs and process items for the selection test experiments -The folder `experiments/selection` contains a directory skeleton for processing items for the various selection test experiments including the config files. E.g. for processing the items for BS1534-1a, the input files need to be put into `experiments/selection/BS1534-1a/proc_input`, then execute `python3 -m ivas_processing_scripts experiments/selection/BS1534-1a/config/BS1534-1a.yml`. The output files will be in `experiments/selection/BS1534-1a/proc_output`, in subfolders per conditions. +The script `generate_test.py` is used to generate config files and process items for the selection test experiments: +``` +usage: generate_test.py [-h] [--no_parallel] [--create_cfg_only] exp_lab_pairs [exp_lab_pairs ...] + +Generate config files and process files for selecton experiments. Experiment names and lab ids must be given as comma-separated pairs (e.g. 'P800-5,b BS1534-4a,d ...') + +positional arguments: + exp_lab_pairs The combinations of experiment/lab-id that you want to generate, separated by whitespace. Experiment and lab id need to be separated by a comma. + +options: + -h, --help show this help message and exit + --no_parallel If given, configs will not be run in parallel + --create_cfg_only If given, only create the configs and folder structure without processing items +``` +Before running the script, one needs to put the input files in the respective input folder (including the background noise files, see below). If input files are missing, the script will complain ad stop. For example, for processing tests P800-3 and BS1534-4a for labs b and d, respectively, command line would look like this (no whitespace between the commas!): +``` +python3 generate_test.py P800-3,b BS1534-4a,d +``` -Note that for P800 experiments, there are separate configs per category as different background noises need to be specified. Thus, there are several config files with `-catX` suffix available. The background noise files need to be put into `experiments/selection/P800-X/background_noise`. To generate all categories, there is a convenience script `create_items_p800.py` in the repository root folder. \ No newline at end of file +Tests are processed separately per category and per lab (as some values in the configs are dependent on category and lab). For each experiment, a static base config is stored from which the actual configs are generated (identfied by the suffix `catX-lab_Y.yml`). For P800 tests, there are 6 categories each. The BS1534 experiments do not define categories, except for the MASA ones (BAS534-7a/b) - there one might mix FOA and HOA2 input material, so ther eare 2 categories for those in the scripts (category 1 for FOA, category 2 for HOA2). In `experiments/selection/` there is a folder structure prepared for all selection experiments, in which you have to put the input files for your test. For example, for P800-1: +``` +experiments/selection/P800-1/ +├── background_noise <--- put your background files in here and name them as background_noisecatX.wav. Not all experiments use background noise +├── config <--- contains base config, generated configs will be stored here, too +│ ├── P800-1.yml +├── proc_input +│ ├── catX <--- put your input files for cat X in here +└── proc_output <--- collect your output from here, example subfolder below +│ ├── catX-lab_Y <--- NOTE: this is only generated by the script and not checked in in the repository +``` \ No newline at end of file -- GitLab From 338629a9acabc245b36548156eb868ce2067b07f Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 6 Jun 2023 11:49:15 +0200 Subject: [PATCH 30/33] no need for separated input folders for different labs --- generate_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate_test.py b/generate_test.py index 629e44bb..c393dd73 100644 --- a/generate_test.py +++ b/generate_test.py @@ -101,7 +101,7 @@ def create_experiment_setup(experiment, lab) -> list[Path]: cfgs = list() for cat in categories: suffix = cat + f"-lab_{lab}" - input_path = base_path.joinpath("proc_input").joinpath(suffix) + input_path = base_path.joinpath("proc_input").joinpath(cat) output_path = base_path.joinpath("proc_output").joinpath(suffix) bg_noise_path = base_path.joinpath("background_noise").joinpath( f"background_noise_{suffix}.wav" -- GitLab From f9c65751dd1132bfc3ab3a6879727a76dc5837ae Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 6 Jun 2023 11:54:42 +0200 Subject: [PATCH 31/33] add folders back to folder skeleton --- experiments/selection/P800-1/proc_input/cat1/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat2/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat3/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat4/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat5/.gitkeep | 0 experiments/selection/P800-1/proc_input/cat6/.gitkeep | 0 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 experiments/selection/P800-1/proc_input/cat1/.gitkeep create mode 100644 experiments/selection/P800-1/proc_input/cat2/.gitkeep create mode 100644 experiments/selection/P800-1/proc_input/cat3/.gitkeep create mode 100644 experiments/selection/P800-1/proc_input/cat4/.gitkeep create mode 100644 experiments/selection/P800-1/proc_input/cat5/.gitkeep create mode 100644 experiments/selection/P800-1/proc_input/cat6/.gitkeep diff --git a/experiments/selection/P800-1/proc_input/cat1/.gitkeep b/experiments/selection/P800-1/proc_input/cat1/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/selection/P800-1/proc_input/cat2/.gitkeep b/experiments/selection/P800-1/proc_input/cat2/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/selection/P800-1/proc_input/cat3/.gitkeep b/experiments/selection/P800-1/proc_input/cat3/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/selection/P800-1/proc_input/cat4/.gitkeep b/experiments/selection/P800-1/proc_input/cat4/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/selection/P800-1/proc_input/cat5/.gitkeep b/experiments/selection/P800-1/proc_input/cat5/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/selection/P800-1/proc_input/cat6/.gitkeep b/experiments/selection/P800-1/proc_input/cat6/.gitkeep new file mode 100644 index 00000000..e69de29b -- GitLab From 9c4dccde0e58c3f87c0d2855693562a49ac4791f Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 6 Jun 2023 12:00:56 +0200 Subject: [PATCH 32/33] clean up folder skeleton --- .../selection/{P800-2 => BS1534-7a}/proc_input/cat1/.gitkeep | 0 .../selection/{P800-2 => BS1534-7a}/proc_input/cat2/.gitkeep | 0 .../proc_input/cat3 => BS1534-7b/proc_input/cat1}/.gitkeep | 0 .../proc_input/cat4 => BS1534-7b/proc_input/cat2}/.gitkeep | 0 experiments/selection/P800-2/proc_input/cat5/.gitkeep | 0 experiments/selection/P800-2/proc_input/cat6/.gitkeep | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename experiments/selection/{P800-2 => BS1534-7a}/proc_input/cat1/.gitkeep (100%) rename experiments/selection/{P800-2 => BS1534-7a}/proc_input/cat2/.gitkeep (100%) rename experiments/selection/{P800-2/proc_input/cat3 => BS1534-7b/proc_input/cat1}/.gitkeep (100%) rename experiments/selection/{P800-2/proc_input/cat4 => BS1534-7b/proc_input/cat2}/.gitkeep (100%) delete mode 100644 experiments/selection/P800-2/proc_input/cat5/.gitkeep delete mode 100644 experiments/selection/P800-2/proc_input/cat6/.gitkeep diff --git a/experiments/selection/P800-2/proc_input/cat1/.gitkeep b/experiments/selection/BS1534-7a/proc_input/cat1/.gitkeep similarity index 100% rename from experiments/selection/P800-2/proc_input/cat1/.gitkeep rename to experiments/selection/BS1534-7a/proc_input/cat1/.gitkeep diff --git a/experiments/selection/P800-2/proc_input/cat2/.gitkeep b/experiments/selection/BS1534-7a/proc_input/cat2/.gitkeep similarity index 100% rename from experiments/selection/P800-2/proc_input/cat2/.gitkeep rename to experiments/selection/BS1534-7a/proc_input/cat2/.gitkeep diff --git a/experiments/selection/P800-2/proc_input/cat3/.gitkeep b/experiments/selection/BS1534-7b/proc_input/cat1/.gitkeep similarity index 100% rename from experiments/selection/P800-2/proc_input/cat3/.gitkeep rename to experiments/selection/BS1534-7b/proc_input/cat1/.gitkeep diff --git a/experiments/selection/P800-2/proc_input/cat4/.gitkeep b/experiments/selection/BS1534-7b/proc_input/cat2/.gitkeep similarity index 100% rename from experiments/selection/P800-2/proc_input/cat4/.gitkeep rename to experiments/selection/BS1534-7b/proc_input/cat2/.gitkeep diff --git a/experiments/selection/P800-2/proc_input/cat5/.gitkeep b/experiments/selection/P800-2/proc_input/cat5/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/experiments/selection/P800-2/proc_input/cat6/.gitkeep b/experiments/selection/P800-2/proc_input/cat6/.gitkeep deleted file mode 100644 index e69de29b..00000000 -- GitLab From 5dc8b27144c9455f5a2ebafbd90f2a6caba87e20 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 6 Jun 2023 12:05:24 +0200 Subject: [PATCH 33/33] correct folder structure again --- .../{P800-2/proc_output/cat1 => P800-1/background_noise}/.gitkeep | 0 .../P800-2/{proc_output/cat2 => proc_input/cat1}/.gitkeep | 0 .../P800-2/{proc_output/cat3 => proc_input/cat2}/.gitkeep | 0 .../P800-2/{proc_output/cat4 => proc_input/cat3}/.gitkeep | 0 .../P800-2/{proc_output/cat5 => proc_input/cat4}/.gitkeep | 0 .../P800-2/{proc_output/cat6 => proc_input/cat5}/.gitkeep | 0 experiments/selection/P800-2/proc_input/cat6/.gitkeep | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename experiments/selection/{P800-2/proc_output/cat1 => P800-1/background_noise}/.gitkeep (100%) rename experiments/selection/P800-2/{proc_output/cat2 => proc_input/cat1}/.gitkeep (100%) rename experiments/selection/P800-2/{proc_output/cat3 => proc_input/cat2}/.gitkeep (100%) rename experiments/selection/P800-2/{proc_output/cat4 => proc_input/cat3}/.gitkeep (100%) rename experiments/selection/P800-2/{proc_output/cat5 => proc_input/cat4}/.gitkeep (100%) rename experiments/selection/P800-2/{proc_output/cat6 => proc_input/cat5}/.gitkeep (100%) create mode 100644 experiments/selection/P800-2/proc_input/cat6/.gitkeep diff --git a/experiments/selection/P800-2/proc_output/cat1/.gitkeep b/experiments/selection/P800-1/background_noise/.gitkeep similarity index 100% rename from experiments/selection/P800-2/proc_output/cat1/.gitkeep rename to experiments/selection/P800-1/background_noise/.gitkeep diff --git a/experiments/selection/P800-2/proc_output/cat2/.gitkeep b/experiments/selection/P800-2/proc_input/cat1/.gitkeep similarity index 100% rename from experiments/selection/P800-2/proc_output/cat2/.gitkeep rename to experiments/selection/P800-2/proc_input/cat1/.gitkeep diff --git a/experiments/selection/P800-2/proc_output/cat3/.gitkeep b/experiments/selection/P800-2/proc_input/cat2/.gitkeep similarity index 100% rename from experiments/selection/P800-2/proc_output/cat3/.gitkeep rename to experiments/selection/P800-2/proc_input/cat2/.gitkeep diff --git a/experiments/selection/P800-2/proc_output/cat4/.gitkeep b/experiments/selection/P800-2/proc_input/cat3/.gitkeep similarity index 100% rename from experiments/selection/P800-2/proc_output/cat4/.gitkeep rename to experiments/selection/P800-2/proc_input/cat3/.gitkeep diff --git a/experiments/selection/P800-2/proc_output/cat5/.gitkeep b/experiments/selection/P800-2/proc_input/cat4/.gitkeep similarity index 100% rename from experiments/selection/P800-2/proc_output/cat5/.gitkeep rename to experiments/selection/P800-2/proc_input/cat4/.gitkeep diff --git a/experiments/selection/P800-2/proc_output/cat6/.gitkeep b/experiments/selection/P800-2/proc_input/cat5/.gitkeep similarity index 100% rename from experiments/selection/P800-2/proc_output/cat6/.gitkeep rename to experiments/selection/P800-2/proc_input/cat5/.gitkeep diff --git a/experiments/selection/P800-2/proc_input/cat6/.gitkeep b/experiments/selection/P800-2/proc_input/cat6/.gitkeep new file mode 100644 index 00000000..e69de29b -- GitLab