From c824a95ee254b41259734b69397a05c7802b35fc Mon Sep 17 00:00:00 2001 From: Treffehn Date: Tue, 9 May 2023 16:44:22 +0200 Subject: [PATCH 01/48] added config file for P800-3 and test file --- .../selection/P800-3/config/P800-3.yml | 365 ++++++++++++++++++ tests/constants.py | 5 + tests/test_experiments.py | 83 ++++ 3 files changed, 453 insertions(+) create mode 100644 experiments/selection/P800-3/config/P800-3.yml create mode 100644 tests/test_experiments.py diff --git a/experiments/selection/P800-3/config/P800-3.yml b/experiments/selection/P800-3/config/P800-3.yml new file mode 100644 index 00000000..b80f90ff --- /dev/null +++ b/experiments/selection/P800-3/config/P800-3.yml @@ -0,0 +1,365 @@ +--- +################################################ +# General configuration +################################################ + +name: P800-3 +master_seed: 5 + +input_path: "experiments/selection/P800-3/proc_input" +output_path: "experiments/selection/P800-3/proc_output" + +################################################ +### 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 + preamble: 10000 + preamble_noise: true + +################################################# +### 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: 23 + 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: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + c10: + type: evs + bitrates: + - 8000 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + c11: + type: evs + bitrates: + - 9600 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + c12: + type: evs + bitrates: + - 13200 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + c13: + type: evs + bitrates: + - 16400 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + c14: + type: evs + bitrates: + - 24400 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + c15: + type: evs + bitrates: + - 32000 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + c16: + type: evs + bitrates: + - 7200 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + c17: + type: evs + bitrates: + - 8000 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + c18: + type: evs + bitrates: + - 9600 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + c19: + type: evs + bitrates: + - 13200 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + c20: + type: evs + bitrates: + - 16400 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + c21: + type: evs + bitrates: + - 24400 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + c22: + type: evs + bitrates: + - 32000 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_cod + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + + ### IVAS condition ############################### + c23: + type: ivas + bitrates: + - 13200 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + c24: + type: ivas + bitrates: + - 16400 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + c25: + type: ivas + bitrates: + - 24400 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + c26: + type: ivas + bitrates: + - 32000 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + c27: + type: ivas + bitrates: + - 48000 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + c28: + type: ivas + bitrates: + - 13200 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + c29: + type: ivas + bitrates: + - 16400 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + c30: + type: ivas + bitrates: + - 24400 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + c31: + type: ivas + bitrates: + - 32000 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + c32: + type: ivas + bitrates: + - 48000 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + + c33: + type: ivas + bitrates: + - 24400 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-dtx"] + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + + c34: + type: ivas + bitrates: + - 13200 + cod: + bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-dtx"] + dec: + bin: ivas_processing_scripts/bin/IVAS_dec + fmt: "STEREO" + tx: + type: "FER" + + error_rate: 5 + prerun_seed: 2 + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "STEREO" + fs: 48000 diff --git a/tests/constants.py b/tests/constants.py index 56a531a4..55a0bf6c 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -35,6 +35,7 @@ from pathlib import PurePath """ Set up paths """ TESTS_DIR = PurePath(__file__).parent TEST_VECTOR_DIR = TESTS_DIR.joinpath("data") +EXPERIMENTS_DIR = "../experiments/selection" ISM_METADATA_DIR = TEST_VECTOR_DIR.joinpath("ism_metadata") MASA_METADATA_DIR = TEST_VECTOR_DIR.joinpath("masa") @@ -200,3 +201,7 @@ INPUT_CONFIG_FILES = [ str(TEST_VECTOR_DIR.joinpath("test_MC.yml")), str(TEST_VECTOR_DIR.joinpath("test_SBA.yml")), ] + +INPUT_EXPERIMENT_NAMES = [ + "P800-3", +] diff --git a/tests/test_experiments.py b/tests/test_experiments.py new file mode 100644 index 00000000..c06adbe6 --- /dev/null +++ b/tests/test_experiments.py @@ -0,0 +1,83 @@ +#!/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 shutil +from pathlib import Path + +import pytest + +from ivas_processing_scripts import main as generate_test +from ivas_processing_scripts.processing.config import TestConfig +from tests.constants import INPUT_EXPERIMENT_NAMES, EXPERIMENTS_DIR, TESTS_DIR +from ivas_processing_scripts.audiotools import audio + + +class Arguments: + def __init__(self, config): + self.config = config + self.debug = True + + +@pytest.mark.parametrize("exp_name", INPUT_EXPERIMENT_NAMES) +def test_generate_test_items(exp_name): + Dir = Path(TESTS_DIR).joinpath(EXPERIMENTS_DIR) + cfg = Path(Dir).joinpath(Path(exp_name)).resolve().absolute() + cfg = cfg.joinpath(f"config/{exp_name}.yml") + args = Arguments(cfg) + + # read out input path + config = TestConfig(cfg) + input_path = Path(config.input_path).resolve().absolute() + + # deduce number of channels based on input format + input_object = audio.fromtype(config.input["fmt"]) + num_channels = input_object.num_channels + + # check if folder exists + if not input_path.exists(): + raise ValueError("Input path from experiments config does not exist") + + # copy items to folder -> pink noise and spectral test + pink_noise = ( + Path(f"./tests/data/pinknoise/pink_noise_{num_channels}ch_48kHz.wav") + .resolve() + .absolute() + ) + shutil.copy(pink_noise, input_path.joinpath(pink_noise.name)) + spectral = ( + Path(f"./tests/data/spectral/spectral_test_{num_channels}ch_48kHz.wav") + .resolve() + .absolute() + ) + shutil.copy(spectral, input_path.joinpath(spectral.name)) + + generate_test(args) -- GitLab From 71b83665c9ff1983a0ef398ed4f209acc9409113 Mon Sep 17 00:00:00 2001 From: Treffehn Date: Tue, 9 May 2023 17:15:43 +0200 Subject: [PATCH 02/48] added test, might break pipeline --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c654af3..c43fea9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ stages: - check - test - analyze + - optional # print some info on the runner setup @@ -103,3 +104,14 @@ format: when: on_failure name: "$ARTIFACT_BASE_NAME" expose_as: "formatting patch" + +experiments: + stage: optional + tags: + - linux + rules: + - when: manual + script: + - *print-common-info + - *get-codec-binaries + - python3 -m pytest -n auto tests/test_experiments.py -- GitLab From 474615a527767ec041c1360b736e3c0e8ea05f19 Mon Sep 17 00:00:00 2001 From: Treffehn Date: Tue, 9 May 2023 17:40:42 +0200 Subject: [PATCH 03/48] added needs to experioments test --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c43fea9f..bca37820 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,6 +111,7 @@ experiments: - linux rules: - when: manual + needs: [] script: - *print-common-info - *get-codec-binaries -- GitLab From 61141abe720f30e2b4bdc785f2340c1b68d33952 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Tue, 9 May 2023 18:22:37 +0200 Subject: [PATCH 04/48] revisit config-file for P800-3 --- .../selection/P800-3/config/P800-3.yml | 80 ++++--------------- 1 file changed, 15 insertions(+), 65 deletions(-) diff --git a/experiments/selection/P800-3/config/P800-3.yml b/experiments/selection/P800-3/config/P800-3.yml index b80f90ff..f83744f1 100644 --- a/experiments/selection/P800-3/config/P800-3.yml +++ b/experiments/selection/P800-3/config/P800-3.yml @@ -70,68 +70,59 @@ conditions_to_generate: bitrates: - 7200 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod c10: type: evs bitrates: - 8000 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod c11: type: evs bitrates: - 9600 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod c12: type: evs bitrates: - 13200 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod c13: type: evs bitrates: - 16400 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod c14: type: evs bitrates: - 24400 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod c15: type: evs bitrates: - 32000 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod c16: type: evs bitrates: - 7200 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod tx: type: "FER" - error_rate: 5 prerun_seed: 2 c17: @@ -139,12 +130,10 @@ conditions_to_generate: bitrates: - 8000 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod tx: type: "FER" - error_rate: 5 prerun_seed: 2 c18: @@ -152,12 +141,10 @@ conditions_to_generate: bitrates: - 9600 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod tx: type: "FER" - error_rate: 5 prerun_seed: 2 c19: @@ -165,12 +152,10 @@ conditions_to_generate: bitrates: - 13200 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod tx: type: "FER" - error_rate: 5 prerun_seed: 2 c20: @@ -178,12 +163,10 @@ conditions_to_generate: bitrates: - 16400 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod tx: type: "FER" - error_rate: 5 prerun_seed: 2 c21: @@ -191,12 +174,10 @@ conditions_to_generate: bitrates: - 24400 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod tx: type: "FER" - error_rate: 5 prerun_seed: 2 c22: @@ -204,12 +185,10 @@ conditions_to_generate: bitrates: - 32000 cod: - bin: ivas_processing_scripts/bin/IVAS_cod + opts: ["-max_band", "FB"] dec: - bin: ivas_processing_scripts/bin/IVAS_cod tx: type: "FER" - error_rate: 5 prerun_seed: 2 @@ -219,58 +198,45 @@ conditions_to_generate: bitrates: - 13200 cod: - bin: ivas_processing_scripts/bin/IVAS_cod dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" c24: type: ivas bitrates: - 16400 cod: - bin: ivas_processing_scripts/bin/IVAS_cod dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" c25: type: ivas bitrates: - 24400 cod: - bin: ivas_processing_scripts/bin/IVAS_cod dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" c26: type: ivas bitrates: - 32000 cod: - bin: ivas_processing_scripts/bin/IVAS_cod dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" c27: type: ivas bitrates: - 48000 cod: - bin: ivas_processing_scripts/bin/IVAS_cod dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" c28: type: ivas bitrates: - 13200 cod: - bin: ivas_processing_scripts/bin/IVAS_cod dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" tx: type: "FER" - error_rate: 5 prerun_seed: 2 c29: @@ -278,13 +244,10 @@ conditions_to_generate: bitrates: - 16400 cod: - bin: ivas_processing_scripts/bin/IVAS_cod dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" tx: type: "FER" - error_rate: 5 prerun_seed: 2 c30: @@ -292,13 +255,10 @@ conditions_to_generate: bitrates: - 24400 cod: - bin: ivas_processing_scripts/bin/IVAS_cod dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" tx: type: "FER" - error_rate: 5 prerun_seed: 2 c31: @@ -306,13 +266,10 @@ conditions_to_generate: bitrates: - 32000 cod: - bin: ivas_processing_scripts/bin/IVAS_cod dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" tx: type: "FER" - error_rate: 5 prerun_seed: 2 c32: @@ -320,13 +277,10 @@ conditions_to_generate: bitrates: - 48000 cod: - bin: ivas_processing_scripts/bin/IVAS_cod dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" tx: type: "FER" - error_rate: 5 prerun_seed: 2 @@ -335,10 +289,8 @@ conditions_to_generate: bitrates: - 24400 cod: - bin: ivas_processing_scripts/bin/IVAS_cod opts: ["-dtx"] dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" c34: @@ -346,14 +298,11 @@ conditions_to_generate: bitrates: - 13200 cod: - bin: ivas_processing_scripts/bin/IVAS_cod opts: ["-dtx"] dec: - bin: ivas_processing_scripts/bin/IVAS_dec fmt: "STEREO" tx: type: "FER" - error_rate: 5 prerun_seed: 2 @@ -363,3 +312,4 @@ conditions_to_generate: postprocessing: fmt: "STEREO" fs: 48000 + loudness: -26 -- GitLab From 00c1d9192ad2dafb4250e92a3ec16f39cba55c25 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Tue, 9 May 2023 22:57:49 +0200 Subject: [PATCH 05/48] add commented concatenation order - will be needed for final configs --- experiments/selection/P800-3/config/P800-3.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/experiments/selection/P800-3/config/P800-3.yml b/experiments/selection/P800-3/config/P800-3.yml index f83744f1..c4265a40 100644 --- a/experiments/selection/P800-3/config/P800-3.yml +++ b/experiments/selection/P800-3/config/P800-3.yml @@ -28,6 +28,7 @@ preprocessing: ################################################ preprocessing_2: concatenate_input: true + # concatenation_order: [] preamble: 10000 preamble_noise: true -- GitLab From f433719452e4f45525a1dea8e18f4d4636c9e7e5 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 11:38:17 +0200 Subject: [PATCH 06/48] add config for P800-1 test --- .../selection/P800-1/config/P800-1.yml | 318 ++++++++++++++++++ 1 file changed, 318 insertions(+) create mode 100644 experiments/selection/P800-1/config/P800-1.yml diff --git a/experiments/selection/P800-1/config/P800-1.yml b/experiments/selection/P800-1/config/P800-1.yml new file mode 100644 index 00000000..912ee7ae --- /dev/null +++ b/experiments/selection/P800-1/config/P800-1.yml @@ -0,0 +1,318 @@ +--- +################################################ +# General configuration +################################################ + +name: P800-1 +master_seed: 5 + +input_path: "experiments/selection/P800-1/proc_input" +output_path: "experiments/selection/P800-1/proc_output" + +################################################ +### 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 + +################################################# +### 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", "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: + - 7200 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c17: + type: evs + bitrates: + - 8000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c18: + type: evs + bitrates: + - 9600 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c19: + type: evs + bitrates: + - 13200 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c20: + type: evs + bitrates: + - 16400 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c21: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c22: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + + ### IVAS condition ############################### + c23: + type: ivas + bitrates: + - 13200 + cod: + dec: + fmt: "STEREO" + c24: + type: ivas + bitrates: + - 16400 + cod: + dec: + fmt: "STEREO" + c25: + type: ivas + bitrates: + - 24400 + cod: + dec: + fmt: "STEREO" + c26: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "STEREO" + c27: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "STEREO" + c28: + type: ivas + bitrates: + - 13200 + cod: + dec: + fmt: "STEREO" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c29: + type: ivas + bitrates: + - 16400 + cod: + dec: + fmt: "STEREO" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c30: + type: ivas + bitrates: + - 24400 + cod: + dec: + fmt: "STEREO" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c31: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "STEREO" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c32: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "STEREO" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + + c33: + type: ivas + bitrates: + - 24400 + cod: + opts: ["-dtx"] + dec: + fmt: "STEREO" + + c34: + type: ivas + bitrates: + - 13200 + cod: + opts: ["-dtx"] + dec: + fmt: "STEREO" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "STEREO" + fs: 48000 + loudness: -26 -- GitLab From 15389986f3753ca5fa459a32a8367982b53edc42 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 12:22:25 +0200 Subject: [PATCH 07/48] add test for P800-1 --- .gitlab-ci.yml | 4 ++-- tests/constants.py | 1 + tests/test_experiments.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bca37820..fb61efa7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,8 +109,8 @@ experiments: stage: optional tags: - linux - rules: - - when: manual + #rules: + #- when: manual needs: [] script: - *print-common-info diff --git a/tests/constants.py b/tests/constants.py index 55a0bf6c..2ebc2c64 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -203,5 +203,6 @@ INPUT_CONFIG_FILES = [ ] INPUT_EXPERIMENT_NAMES = [ + "P800-1", "P800-3", ] diff --git a/tests/test_experiments.py b/tests/test_experiments.py index c06adbe6..7eba295f 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -49,8 +49,8 @@ class Arguments: @pytest.mark.parametrize("exp_name", INPUT_EXPERIMENT_NAMES) def test_generate_test_items(exp_name): - Dir = Path(TESTS_DIR).joinpath(EXPERIMENTS_DIR) - cfg = Path(Dir).joinpath(Path(exp_name)).resolve().absolute() + 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}.yml") args = Arguments(cfg) -- GitLab From a00861eb17f4d282718639ae7514a7ec3540ae2b Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 12:23:19 +0200 Subject: [PATCH 08/48] disable all other tests to save time --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb61efa7..751bc76a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ check_for_binaries: # ------------------------------------ # test the format conversion only -test_audiotools_convert: +.test_audiotools_convert: stage: test tags: - linux @@ -59,7 +59,7 @@ test_audiotools_convert: - python3 -m pytest -n auto tests/test_audiotools_convert.py # run some test configs for item creation -test_processing: +.test_processing: stage: test tags: - linux @@ -72,7 +72,7 @@ test_processing: # static analysis/formatting tests # ------------------------------------ -lint: +.lint: stage: analyze tags: - linux @@ -80,7 +80,7 @@ lint: script: - flake8 --max-line-length 88 --extend-ignore=E203,E501,E741 -format: +.format: stage: analyze variables: ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix" -- GitLab From 662bec373f7023cc50845d2e50b7c2a1d586224f Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 13:25:41 +0200 Subject: [PATCH 09/48] add config file for P800-2 --- .../selection/P800-2/config/P800-2.yml | 254 ++++++++++++++++++ 1 file changed, 254 insertions(+) create mode 100644 experiments/selection/P800-2/config/P800-2.yml diff --git a/experiments/selection/P800-2/config/P800-2.yml b/experiments/selection/P800-2/config/P800-2.yml new file mode 100644 index 00000000..bef46bec --- /dev/null +++ b/experiments/selection/P800-2/config/P800-2.yml @@ -0,0 +1,254 @@ +--- +################################################ +# General configuration +################################################ + +name: P800-2 +master_seed: 5 + +input_path: "experiments/selection/P800-2/proc_input" +output_path: "experiments/selection/P800-2/proc_output" + +################################################ +### 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 + +################################################# +### 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", "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: + - 7200 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c17: + type: evs + bitrates: + - 8000 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c18: + type: evs + bitrates: + - 9600 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c19: + type: evs + bitrates: + - 13200 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c20: + type: evs + bitrates: + - 16400 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c21: + type: evs + bitrates: + - 24400 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c22: + type: evs + bitrates: + - 32000 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + + ### IVAS condition ############################### + c23: + type: ivas + bitrates: + - 13200 + cod: + dec: + fmt: "STEREO" + c24: + type: ivas + bitrates: + - 16400 + cod: + dec: + fmt: "STEREO" + c25: + type: ivas + bitrates: + - 24400 + cod: + dec: + fmt: "STEREO" + c26: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "STEREO" + c27: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "STEREO" + c28: + type: ivas + bitrates: + - 13200 + cod: + opts: ["-dtx"] + dec: + fmt: "STEREO" + c29: + type: ivas + bitrates: + - 16400 + cod: + opts: ["-dtx"] + dec: + fmt: "STEREO" + c30: + type: ivas + bitrates: + - 24400 + cod: + opts: ["-dtx"] + dec: + fmt: "STEREO" + c31: + type: ivas + bitrates: + - 32000 + cod: + opts: ["-dtx"] + dec: + fmt: "STEREO" + c32: + type: ivas + bitrates: + - 48000 + cod: + opts: ["-dtx"] + dec: + fmt: "STEREO" + + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "STEREO" + fs: 48000 + loudness: -26 -- GitLab From 479610e476cbf715f67be571caf1d9390b5b6253 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 13:29:23 +0200 Subject: [PATCH 10/48] add test for P800-2 --- tests/constants.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/constants.py b/tests/constants.py index 2ebc2c64..4d730fc4 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -204,5 +204,12 @@ INPUT_CONFIG_FILES = [ INPUT_EXPERIMENT_NAMES = [ "P800-1", + "P800-2", "P800-3", + # "P800-4", + # "P800-5", + # "P800-6", + # "P800-7", + # "P800-8", + # "P800-9", ] -- GitLab From 7521682bceff52e85abda41fb339f4f2ae3513d1 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 14:14:34 +0200 Subject: [PATCH 11/48] add P800-4 config --- .../selection/P800-4/config/P800-4.yml | 333 ++++++++++++++++++ tests/constants.py | 2 +- 2 files changed, 334 insertions(+), 1 deletion(-) create mode 100644 experiments/selection/P800-4/config/P800-4.yml diff --git a/experiments/selection/P800-4/config/P800-4.yml b/experiments/selection/P800-4/config/P800-4.yml new file mode 100644 index 00000000..a1b04dc9 --- /dev/null +++ b/experiments/selection/P800-4/config/P800-4.yml @@ -0,0 +1,333 @@ +--- +################################################ +# General configuration +################################################ + +name: P800-4 +master_seed: 5 + +input_path: "experiments/selection/P800-4/proc_input" +output_path: "experiments/selection/P800-4/proc_output" + +################################################ +### 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 + +################################################# +### 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: esdru + alpha: 0.8 + c07: + type: esdru + alpha: 0.675 + c08: + type: esdru + alpha: 0.55 + + ### 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: + - 7200 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c17: + type: evs + bitrates: + - 8000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c18: + type: evs + bitrates: + - 9600 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c19: + type: evs + bitrates: + - 13200 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c20: + type: evs + bitrates: + - 16400 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c21: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c22: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + + ### IVAS condition ############################### + c23: + type: ivas + bitrates: + - 16400 + cod: + dec: + fmt: "FOA" + c24: + type: ivas + bitrates: + - 24400 + cod: + dec: + fmt: "FOA" + c25: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "FOA" + c26: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "FOA" + c27: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "FOA" + c28: + type: ivas + bitrates: + - 80000 + cod: + dec: + fmt: "FOA" + c29: + type: ivas + bitrates: + - 96000 + cod: + dec: + fmt: "FOA" + c30: + type: ivas + bitrates: + - 16400 + cod: + dec: + fmt: "FOA" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c31: + type: ivas + bitrates: + - 24400 + cod: + dec: + fmt: "FOA" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c32: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "FOA" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c33: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "FOA" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c34: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "FOA" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c35: + type: ivas + bitrates: + - 80000 + cod: + dec: + fmt: "FOA" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + c36: + type: ivas + bitrates: + - 96000 + cod: + dec: + fmt: "FOA" + tx: + type: "FER" + error_rate: 5 + prerun_seed: 2 + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "FOA" + fs: 48000 + loudness: -26 diff --git a/tests/constants.py b/tests/constants.py index 4d730fc4..4509456b 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -206,7 +206,7 @@ INPUT_EXPERIMENT_NAMES = [ "P800-1", "P800-2", "P800-3", - # "P800-4", + "P800-4", # "P800-5", # "P800-6", # "P800-7", -- GitLab From 1d3bc9140697480bf242818f7f25a0767a3ec6ac Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 15:15:12 +0200 Subject: [PATCH 12/48] add P800-5 cfg --- .../selection/P800-5/config/P800-5.yml | 283 ++++++++++++++++++ 1 file changed, 283 insertions(+) create mode 100644 experiments/selection/P800-5/config/P800-5.yml diff --git a/experiments/selection/P800-5/config/P800-5.yml b/experiments/selection/P800-5/config/P800-5.yml new file mode 100644 index 00000000..cf15a284 --- /dev/null +++ b/experiments/selection/P800-5/config/P800-5.yml @@ -0,0 +1,283 @@ +--- +################################################ +# General configuration +################################################ + +name: P800-5 +master_seed: 5 + +input_path: "experiments/selection/P800-5/proc_input" +output_path: "experiments/selection/P800-5/proc_output" + +################################################ +### 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 + +################################################# +### 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", "FB"] + sba_format: "PLANARFOA" + c10: + type: evs + bitrates: + - 7200 + cod: + opts: ["-max_band", "FB"] + dec: + c11: + type: evs + bitrates: + - 8000 + cod: + opts: ["-max_band", "FB"] + dec: + c12: + type: evs + bitrates: + - 9600 + cod: + opts: ["-max_band", "FB"] + dec: + c13: + type: evs + bitrates: + - 13200 + cod: + opts: ["-max_band", "FB"] + dec: + c14: + type: evs + bitrates: + - 16400 + cod: + opts: ["-max_band", "FB"] + dec: + c15: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + c16: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + c17: + type: evs + bitrates: + - 7200 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c18: + type: evs + bitrates: + - 8000 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c19: + type: evs + bitrates: + - 9600 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c20: + type: evs + bitrates: + - 13200 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c21: + type: evs + bitrates: + - 16400 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c22: + type: evs + bitrates: + - 24400 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + + ### IVAS condition ############################### + c23: + type: ivas + bitrates: + - 13200 + cod: + dec: + fmt: "FOA" + 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 -- GitLab From d4293ab21d4d30ea94e5b2884a2a5ab1a13bcbfd Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 15:19:43 +0200 Subject: [PATCH 13/48] adP800-6 and -7 configs --- .../selection/P800-6/config/P800-6.yml | 254 ++++++++++++++++ .../selection/P800-7/config/P800-7.yml | 287 ++++++++++++++++++ 2 files changed, 541 insertions(+) create mode 100644 experiments/selection/P800-6/config/P800-6.yml create mode 100644 experiments/selection/P800-7/config/P800-7.yml diff --git a/experiments/selection/P800-6/config/P800-6.yml b/experiments/selection/P800-6/config/P800-6.yml new file mode 100644 index 00000000..874c141f --- /dev/null +++ b/experiments/selection/P800-6/config/P800-6.yml @@ -0,0 +1,254 @@ +--- +################################################ +# General configuration +################################################ + +name: P800-6 +master_seed: 5 + +input_path: "experiments/selection/P800-6/proc_input" +output_path: "experiments/selection/P800-6/proc_output" + +################################################ +### 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 + +################################################# +### 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: + - 13200 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c16: + type: evs + bitrates: + - 16400 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c17: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c18: + type: evs + bitrates: + - 13200 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c19: + type: evs + bitrates: + - 16400 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c20: + type: evs + bitrates: + - 24400 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + + ### IVAS condition ############################### + c21: + type: ivas + bitrates: + - 13200 + cod: + dec: + fmt: "BINAURAL" + c22: + type: ivas + bitrates: + - 16400 + cod: + dec: + fmt: "BINAURAL" + c23: + type: ivas + bitrates: + - 24400 + cod: + dec: + fmt: "BINAURAL" + c24: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "BINAURAL" + c25: + type: ivas + bitrates: + - 13200 + cod: + dec: + fmt: "BINAURAL" + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c26: + type: ivas + bitrates: + - 16400 + cod: + dec: + fmt: "BINAURAL" + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c27: + type: ivas + bitrates: + - 24400 + cod: + dec: + fmt: "BINAURAL" + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c28: + type: ivas + bitrates: + - 13200 + cod: + opts: ["-dtx"] + dec: + fmt: "BINAURAL" + c29: + type: ivas + bitrates: + - 16400 + cod: + opts: ["-dtx"] + dec: + fmt: "BINAURAL" + c30: + type: ivas + bitrates: + - 24400 + cod: + opts: ["-dtx"] + dec: + fmt: "BINAURAL" + + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "BINAURAL" + fs: 48000 + loudness: -26 diff --git a/experiments/selection/P800-7/config/P800-7.yml b/experiments/selection/P800-7/config/P800-7.yml new file mode 100644 index 00000000..81c5d988 --- /dev/null +++ b/experiments/selection/P800-7/config/P800-7.yml @@ -0,0 +1,287 @@ +--- +################################################ +# General configuration +################################################ + +name: P800-7 +master_seed: 5 + +input_path: "experiments/selection/P800-7/proc_input" +output_path: "experiments/selection/P800-7/proc_output" + +################################################ +### 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 + +################################################# +### 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: + - 8000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c16: + type: evs + bitrates: + - 13200 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c17: + type: evs + bitrates: + - 16400 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c18: + type: evs + bitrates: + - 24400 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c19: + type: evs + bitrates: + - 8000 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c20: + type: evs + bitrates: + - 13200 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c21: + type: evs + bitrates: + - 16400 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + c22: + type: evs + bitrates: + - 24400 + cod: + opts: ["-dtx", "-max_band", "FB"] + dec: + + ### IVAS condition ############################### + c23: + type: ivas + bitrates: + - 16400 + cod: + dec: + fmt: "BINAURAL" + c24: + type: ivas + bitrates: + - 24400 + cod: + dec: + fmt: "BINAURAL" + c25: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "BINAURAL" + c26: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "BINAURAL" + c27: + type: ivas + bitrates: + - 16400 + cod: + dec: + fmt: "BINAURAL" + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c28: + type: ivas + bitrates: + - 24400 + cod: + dec: + fmt: "BINAURAL" + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c29: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "BINAURAL" + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c30: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "BINAURAL" + tx: + type: "FER" + error_rate: 3 + prerun_seed: 2 + c31: + type: ivas + bitrates: + - 16400 + cod: + opts: ["-dtx"] + dec: + fmt: "BINAURAL" + c32: + type: ivas + bitrates: + - 24400 + cod: + opts: ["-dtx"] + dec: + fmt: "BINAURAL" + c33: + type: ivas + bitrates: + - 32000 + cod: + opts: ["-dtx"] + dec: + fmt: "BINAURAL" + c34: + type: ivas + bitrates: + - 48000 + cod: + opts: ["-dtx"] + dec: + fmt: "BINAURAL" + + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "BINAURAL" + fs: 48000 + loudness: -26 -- GitLab From 0099eaa49909dece429918cb3c58e3b047182be9 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 15:20:36 +0200 Subject: [PATCH 14/48] add tests for new selection test configs --- tests/constants.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/constants.py b/tests/constants.py index 4509456b..f4ca7aa9 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -207,9 +207,9 @@ INPUT_EXPERIMENT_NAMES = [ "P800-2", "P800-3", "P800-4", - # "P800-5", - # "P800-6", - # "P800-7", + "P800-5", + "P800-6", + "P800-7", # "P800-8", # "P800-9", ] -- GitLab From 486d99ab5554095987cb0fdfce542d88a6ad5cf9 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 15:24:22 +0200 Subject: [PATCH 15/48] fix output format for P800-4 --- experiments/selection/P800-4/config/P800-4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiments/selection/P800-4/config/P800-4.yml b/experiments/selection/P800-4/config/P800-4.yml index a1b04dc9..85958b15 100644 --- a/experiments/selection/P800-4/config/P800-4.yml +++ b/experiments/selection/P800-4/config/P800-4.yml @@ -328,6 +328,6 @@ conditions_to_generate: ### Post-processing ################################################ postprocessing: - fmt: "FOA" + fmt: "BINAURAL" fs: 48000 loudness: -26 -- GitLab From 25cfc0f11fd24b95a5a46bb753e3e6168472b43c Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 16:44:24 +0200 Subject: [PATCH 16/48] add metadata file copying --- tests/test_experiments.py | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 7eba295f..4775cf0e 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -37,7 +37,7 @@ import pytest from ivas_processing_scripts import main as generate_test from ivas_processing_scripts.processing.config import TestConfig -from tests.constants import INPUT_EXPERIMENT_NAMES, EXPERIMENTS_DIR, TESTS_DIR +from tests.constants import INPUT_EXPERIMENT_NAMES, EXPERIMENTS_DIR, TESTS_DIR, FORMAT_TO_METADATA_FILES, NCHAN_TO_FILE from ivas_processing_scripts.audiotools import audio @@ -57,27 +57,34 @@ def test_generate_test_items(exp_name): # read out input path config = TestConfig(cfg) input_path = Path(config.input_path).resolve().absolute() + input_fmt = config.input["fmt"] # deduce number of channels based on input format - input_object = audio.fromtype(config.input["fmt"]) + input_object = audio.fromtype(input_fmt) num_channels = input_object.num_channels # check if folder exists if not input_path.exists(): raise ValueError("Input path from experiments config does not exist") - # copy items to folder -> pink noise and spectral test - pink_noise = ( - Path(f"./tests/data/pinknoise/pink_noise_{num_channels}ch_48kHz.wav") - .resolve() - .absolute() - ) - shutil.copy(pink_noise, input_path.joinpath(pink_noise.name)) - spectral = ( - Path(f"./tests/data/spectral/spectral_test_{num_channels}ch_48kHz.wav") - .resolve() - .absolute() - ) - shutil.copy(spectral, input_path.joinpath(spectral.name)) + # get dummy input files: + spectral_dummy = NCHAN_TO_FILE[num_channels] + pink_noise_dummy = Path(str(spectral_dummy).replace("spectral/spectral_test", "pinknoise/pink_noise")) + dummy_input_files = [spectral_dummy, pink_noise_dummy] + + # get dummy metadata files + dummy_md_files = FORMAT_TO_METADATA_FILES.get(input_fmt, list()) + + for f in dummy_input_files: + print(f) + f_out = input_path.joinpath(f.name).resolve().absolute() + print(f_out) + shutil.copy(f, f_out) + for i, md_f in enumerate(dummy_md_files): + print(md_f) + suffix = f"{i}.csv" + md_f_out = ".".join([str(f_out), suffix]) + print(md_f_out) + shutil.copy(md_f, md_f_out) generate_test(args) -- GitLab From 52708e7558ba109b6bc17f4f8f4819e8052bcca9 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 17:42:57 +0200 Subject: [PATCH 17/48] add background dummy noise, in cfg still commented due to bug --- experiments/selection/P800-2/config/P800-2.yml | 9 +++++++++ experiments/selection/P800-5/config/P800-5.yml | 8 ++++++++ tests/data/p800-2_background_noise.wav | 3 +++ tests/data/p800-5_background_noise.wav | 3 +++ tests/test_experiments.py | 16 ++++++++++++---- 5 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 tests/data/p800-2_background_noise.wav create mode 100644 tests/data/p800-5_background_noise.wav diff --git a/experiments/selection/P800-2/config/P800-2.yml b/experiments/selection/P800-2/config/P800-2.yml index bef46bec..6255685f 100644 --- a/experiments/selection/P800-2/config/P800-2.yml +++ b/experiments/selection/P800-2/config/P800-2.yml @@ -33,6 +33,15 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + ### Additive background noise + # TODO: enable after bug with bg noise addition is fixed + #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/proc_input/background_noise.wav" + #### Seed for delay offest; default = 0 + #seed_delay: 10 ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-5/config/P800-5.yml b/experiments/selection/P800-5/config/P800-5.yml index cf15a284..84b17e9b 100644 --- a/experiments/selection/P800-5/config/P800-5.yml +++ b/experiments/selection/P800-5/config/P800-5.yml @@ -34,6 +34,14 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + # TODO: enable after bug with bg noise addition is fixed + #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/proc_input/background_noise.wav" + #### Seed for delay offest; default = 0 + #seed_delay: 10 ################################################# ### Bitstream processing diff --git a/tests/data/p800-2_background_noise.wav b/tests/data/p800-2_background_noise.wav new file mode 100644 index 00000000..63afe59d --- /dev/null +++ b/tests/data/p800-2_background_noise.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cab2e1b1bc8b0ce66b4c3433101518f267d33675ce0272e235d71276f04801eb +size 12480044 diff --git a/tests/data/p800-5_background_noise.wav b/tests/data/p800-5_background_noise.wav new file mode 100644 index 00000000..d1dbf587 --- /dev/null +++ b/tests/data/p800-5_background_noise.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d82354070c91872116d603a174568ac789703b329fa93ea40a4bddd96fd7a11a +size 24960044 diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 4775cf0e..57956901 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -41,6 +41,12 @@ from tests.constants import INPUT_EXPERIMENT_NAMES, EXPERIMENTS_DIR, TESTS_DIR, from ivas_processing_scripts.audiotools import audio +BG_NOISE_FOR_EXPERIMENT = { + "P800-2": Path(TESTS_DIR).joinpath("data").joinpath("p800-2_background_noise.wav"), + "P800-5": Path(TESTS_DIR).joinpath("data").joinpath("p800-5_background_noise.wav"), + } +BG_NOISE_NAME = "background_noise.wav" + class Arguments: def __init__(self, config): self.config = config @@ -75,16 +81,18 @@ def test_generate_test_items(exp_name): # get dummy metadata files dummy_md_files = FORMAT_TO_METADATA_FILES.get(input_fmt, list()) + # copy input files for f in dummy_input_files: - print(f) f_out = input_path.joinpath(f.name).resolve().absolute() - print(f_out) shutil.copy(f, f_out) for i, md_f in enumerate(dummy_md_files): - print(md_f) suffix = f"{i}.csv" md_f_out = ".".join([str(f_out), suffix]) - print(md_f_out) shutil.copy(md_f, md_f_out) + # copy background noise if needed + if (bg_noise := BG_NOISE_FOR_EXPERIMENT.get(exp_name)) is not None: + bg_noise_out = input_path.joinpath(BG_NOISE_NAME) + shutil.copy(bg_noise, bg_noise_out) + generate_test(args) -- GitLab From 6e872eaf3c24ec7ae164957dc15061f316f1cae8 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 17:50:35 +0200 Subject: [PATCH 18/48] move prerun_seed to general section --- experiments/selection/P800-1/config/P800-1.yml | 14 +------------- experiments/selection/P800-2/config/P800-2.yml | 1 + experiments/selection/P800-3/config/P800-3.yml | 14 +------------- experiments/selection/P800-4/config/P800-4.yml | 15 +-------------- experiments/selection/P800-5/config/P800-5.yml | 1 + experiments/selection/P800-6/config/P800-6.yml | 7 +------ experiments/selection/P800-7/config/P800-7.yml | 8 +------- 7 files changed, 7 insertions(+), 53 deletions(-) diff --git a/experiments/selection/P800-1/config/P800-1.yml b/experiments/selection/P800-1/config/P800-1.yml index 912ee7ae..dbf42f8d 100644 --- a/experiments/selection/P800-1/config/P800-1.yml +++ b/experiments/selection/P800-1/config/P800-1.yml @@ -5,6 +5,7 @@ name: P800-1 master_seed: 5 +prerun_seed: 2 input_path: "experiments/selection/P800-1/proc_input" output_path: "experiments/selection/P800-1/proc_output" @@ -127,7 +128,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c17: type: evs bitrates: @@ -138,7 +138,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c18: type: evs bitrates: @@ -149,7 +148,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c19: type: evs bitrates: @@ -160,7 +158,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c20: type: evs bitrates: @@ -171,7 +168,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c21: type: evs bitrates: @@ -182,7 +178,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c22: type: evs bitrates: @@ -193,7 +188,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 ### IVAS condition ############################### c23: @@ -241,7 +235,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c29: type: ivas bitrates: @@ -252,7 +245,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c30: type: ivas bitrates: @@ -263,7 +255,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c31: type: ivas bitrates: @@ -274,7 +265,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c32: type: ivas bitrates: @@ -285,7 +275,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c33: type: ivas @@ -307,7 +296,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 ################################################ ### Post-processing diff --git a/experiments/selection/P800-2/config/P800-2.yml b/experiments/selection/P800-2/config/P800-2.yml index 6255685f..465bb2cf 100644 --- a/experiments/selection/P800-2/config/P800-2.yml +++ b/experiments/selection/P800-2/config/P800-2.yml @@ -5,6 +5,7 @@ name: P800-2 master_seed: 5 +prerun_seed: 2 input_path: "experiments/selection/P800-2/proc_input" output_path: "experiments/selection/P800-2/proc_output" diff --git a/experiments/selection/P800-3/config/P800-3.yml b/experiments/selection/P800-3/config/P800-3.yml index c4265a40..feb754a4 100644 --- a/experiments/selection/P800-3/config/P800-3.yml +++ b/experiments/selection/P800-3/config/P800-3.yml @@ -5,6 +5,7 @@ name: P800-3 master_seed: 5 +prerun_seed: 2 input_path: "experiments/selection/P800-3/proc_input" output_path: "experiments/selection/P800-3/proc_output" @@ -125,7 +126,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c17: type: evs bitrates: @@ -136,7 +136,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c18: type: evs bitrates: @@ -147,7 +146,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c19: type: evs bitrates: @@ -158,7 +156,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c20: type: evs bitrates: @@ -169,7 +166,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c21: type: evs bitrates: @@ -180,7 +176,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c22: type: evs bitrates: @@ -191,7 +186,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 ### IVAS condition ############################### c23: @@ -239,7 +233,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c29: type: ivas bitrates: @@ -250,7 +243,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c30: type: ivas bitrates: @@ -261,7 +253,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c31: type: ivas bitrates: @@ -272,7 +263,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c32: type: ivas bitrates: @@ -283,7 +273,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c33: type: ivas @@ -305,7 +294,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 ################################################ ### Post-processing diff --git a/experiments/selection/P800-4/config/P800-4.yml b/experiments/selection/P800-4/config/P800-4.yml index 85958b15..af306c40 100644 --- a/experiments/selection/P800-4/config/P800-4.yml +++ b/experiments/selection/P800-4/config/P800-4.yml @@ -5,6 +5,7 @@ name: P800-4 master_seed: 5 +prerun_seed: 2 input_path: "experiments/selection/P800-4/proc_input" output_path: "experiments/selection/P800-4/proc_output" @@ -128,7 +129,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c17: type: evs bitrates: @@ -139,7 +139,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c18: type: evs bitrates: @@ -150,7 +149,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c19: type: evs bitrates: @@ -161,7 +159,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c20: type: evs bitrates: @@ -172,7 +169,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c21: type: evs bitrates: @@ -183,7 +179,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c22: type: evs bitrates: @@ -194,7 +189,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 ### IVAS condition ############################### c23: @@ -256,7 +250,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c31: type: ivas bitrates: @@ -267,7 +260,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c32: type: ivas bitrates: @@ -278,7 +270,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c33: type: ivas bitrates: @@ -289,7 +280,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c34: type: ivas bitrates: @@ -300,7 +290,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c35: type: ivas bitrates: @@ -311,7 +300,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 c36: type: ivas bitrates: @@ -322,7 +310,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - prerun_seed: 2 ################################################ ### Post-processing diff --git a/experiments/selection/P800-5/config/P800-5.yml b/experiments/selection/P800-5/config/P800-5.yml index 84b17e9b..786e0318 100644 --- a/experiments/selection/P800-5/config/P800-5.yml +++ b/experiments/selection/P800-5/config/P800-5.yml @@ -5,6 +5,7 @@ name: P800-5 master_seed: 5 +prerun_seed: 2 input_path: "experiments/selection/P800-5/proc_input" output_path: "experiments/selection/P800-5/proc_output" diff --git a/experiments/selection/P800-6/config/P800-6.yml b/experiments/selection/P800-6/config/P800-6.yml index 874c141f..69b581d0 100644 --- a/experiments/selection/P800-6/config/P800-6.yml +++ b/experiments/selection/P800-6/config/P800-6.yml @@ -5,6 +5,7 @@ name: P800-6 master_seed: 5 +prerun_seed: 2 input_path: "experiments/selection/P800-6/proc_input" output_path: "experiments/selection/P800-6/proc_output" @@ -112,7 +113,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c16: type: evs bitrates: @@ -123,7 +123,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c17: type: evs bitrates: @@ -134,7 +133,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c18: type: evs bitrates: @@ -196,7 +194,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c26: type: ivas bitrates: @@ -207,7 +204,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c27: type: ivas bitrates: @@ -218,7 +214,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c28: type: ivas bitrates: diff --git a/experiments/selection/P800-7/config/P800-7.yml b/experiments/selection/P800-7/config/P800-7.yml index 81c5d988..be39dd19 100644 --- a/experiments/selection/P800-7/config/P800-7.yml +++ b/experiments/selection/P800-7/config/P800-7.yml @@ -5,6 +5,7 @@ name: P800-7 master_seed: 5 +prerun_seed: 2 input_path: "experiments/selection/P800-7/proc_input" output_path: "experiments/selection/P800-7/proc_output" @@ -112,7 +113,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c16: type: evs bitrates: @@ -123,7 +123,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c17: type: evs bitrates: @@ -134,7 +133,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c18: type: evs bitrates: @@ -210,7 +208,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c28: type: ivas bitrates: @@ -221,7 +218,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c29: type: ivas bitrates: @@ -232,7 +228,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c30: type: ivas bitrates: @@ -243,7 +238,6 @@ conditions_to_generate: tx: type: "FER" error_rate: 3 - prerun_seed: 2 c31: type: ivas bitrates: -- GitLab From 25781c85e10822a23ac9d88144851ca98d7bfe70 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 17:53:59 +0200 Subject: [PATCH 19/48] add tests back --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 751bc76a..fb61efa7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ check_for_binaries: # ------------------------------------ # test the format conversion only -.test_audiotools_convert: +test_audiotools_convert: stage: test tags: - linux @@ -59,7 +59,7 @@ check_for_binaries: - python3 -m pytest -n auto tests/test_audiotools_convert.py # run some test configs for item creation -.test_processing: +test_processing: stage: test tags: - linux @@ -72,7 +72,7 @@ check_for_binaries: # static analysis/formatting tests # ------------------------------------ -.lint: +lint: stage: analyze tags: - linux @@ -80,7 +80,7 @@ check_for_binaries: script: - flake8 --max-line-length 88 --extend-ignore=E203,E501,E741 -.format: +format: stage: analyze variables: ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix" -- GitLab From 011e8f4f17f0f7c51e0be53902dde5ff87d59216 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 17:54:31 +0200 Subject: [PATCH 20/48] run formatter --- tests/test_experiments.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 57956901..c53aa906 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -37,16 +37,23 @@ import pytest from ivas_processing_scripts import main as generate_test from ivas_processing_scripts.processing.config import TestConfig -from tests.constants import INPUT_EXPERIMENT_NAMES, EXPERIMENTS_DIR, TESTS_DIR, FORMAT_TO_METADATA_FILES, NCHAN_TO_FILE +from tests.constants import ( + INPUT_EXPERIMENT_NAMES, + EXPERIMENTS_DIR, + TESTS_DIR, + FORMAT_TO_METADATA_FILES, + NCHAN_TO_FILE, +) from ivas_processing_scripts.audiotools import audio BG_NOISE_FOR_EXPERIMENT = { "P800-2": Path(TESTS_DIR).joinpath("data").joinpath("p800-2_background_noise.wav"), "P800-5": Path(TESTS_DIR).joinpath("data").joinpath("p800-5_background_noise.wav"), - } +} BG_NOISE_NAME = "background_noise.wav" + class Arguments: def __init__(self, config): self.config = config @@ -75,7 +82,9 @@ def test_generate_test_items(exp_name): # get dummy input files: spectral_dummy = NCHAN_TO_FILE[num_channels] - pink_noise_dummy = Path(str(spectral_dummy).replace("spectral/spectral_test", "pinknoise/pink_noise")) + pink_noise_dummy = Path( + str(spectral_dummy).replace("spectral/spectral_test", "pinknoise/pink_noise") + ) dummy_input_files = [spectral_dummy, pink_noise_dummy] # get dummy metadata files -- GitLab From bbe80ff7db0e7f5ab9a6a313990c64b2b0dc861a Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 10 May 2023 18:10:34 +0200 Subject: [PATCH 21/48] fix error rate and IVAS decoder output format --- .../selection/P800-6/config/P800-6.yml | 22 +++++----------- .../selection/P800-7/config/P800-7.yml | 26 +++++-------------- 2 files changed, 13 insertions(+), 35 deletions(-) diff --git a/experiments/selection/P800-6/config/P800-6.yml b/experiments/selection/P800-6/config/P800-6.yml index 69b581d0..39afc65f 100644 --- a/experiments/selection/P800-6/config/P800-6.yml +++ b/experiments/selection/P800-6/config/P800-6.yml @@ -112,7 +112,7 @@ conditions_to_generate: dec: tx: type: "FER" - error_rate: 3 + error_rate: 5 c16: type: evs bitrates: @@ -122,7 +122,7 @@ conditions_to_generate: dec: tx: type: "FER" - error_rate: 3 + error_rate: 5 c17: type: evs bitrates: @@ -132,7 +132,7 @@ conditions_to_generate: dec: tx: type: "FER" - error_rate: 3 + error_rate: 5 c18: type: evs bitrates: @@ -162,58 +162,51 @@ conditions_to_generate: - 13200 cod: dec: - fmt: "BINAURAL" c22: type: ivas bitrates: - 16400 cod: dec: - fmt: "BINAURAL" c23: type: ivas bitrates: - 24400 cod: dec: - fmt: "BINAURAL" c24: type: ivas bitrates: - 32000 cod: dec: - fmt: "BINAURAL" c25: type: ivas bitrates: - 13200 cod: dec: - fmt: "BINAURAL" tx: type: "FER" - error_rate: 3 + error_rate: 5 c26: type: ivas bitrates: - 16400 cod: dec: - fmt: "BINAURAL" tx: type: "FER" - error_rate: 3 + error_rate: 5 c27: type: ivas bitrates: - 24400 cod: dec: - fmt: "BINAURAL" tx: type: "FER" - error_rate: 3 + error_rate: 5 c28: type: ivas bitrates: @@ -221,7 +214,6 @@ conditions_to_generate: cod: opts: ["-dtx"] dec: - fmt: "BINAURAL" c29: type: ivas bitrates: @@ -229,7 +221,6 @@ conditions_to_generate: cod: opts: ["-dtx"] dec: - fmt: "BINAURAL" c30: type: ivas bitrates: @@ -237,7 +228,6 @@ conditions_to_generate: cod: opts: ["-dtx"] dec: - fmt: "BINAURAL" ################################################ diff --git a/experiments/selection/P800-7/config/P800-7.yml b/experiments/selection/P800-7/config/P800-7.yml index be39dd19..19077662 100644 --- a/experiments/selection/P800-7/config/P800-7.yml +++ b/experiments/selection/P800-7/config/P800-7.yml @@ -112,7 +112,7 @@ conditions_to_generate: dec: tx: type: "FER" - error_rate: 3 + error_rate: 5 c16: type: evs bitrates: @@ -122,7 +122,7 @@ conditions_to_generate: dec: tx: type: "FER" - error_rate: 3 + error_rate: 5 c17: type: evs bitrates: @@ -132,7 +132,7 @@ conditions_to_generate: dec: tx: type: "FER" - error_rate: 3 + error_rate: 5 c18: type: evs bitrates: @@ -176,68 +176,60 @@ conditions_to_generate: - 16400 cod: dec: - fmt: "BINAURAL" c24: type: ivas bitrates: - 24400 cod: dec: - fmt: "BINAURAL" c25: type: ivas bitrates: - 32000 cod: dec: - fmt: "BINAURAL" c26: type: ivas bitrates: - 48000 cod: dec: - fmt: "BINAURAL" c27: type: ivas bitrates: - 16400 cod: dec: - fmt: "BINAURAL" tx: type: "FER" - error_rate: 3 + error_rate: 5 c28: type: ivas bitrates: - 24400 cod: dec: - fmt: "BINAURAL" tx: type: "FER" - error_rate: 3 + error_rate: 5 c29: type: ivas bitrates: - 32000 cod: dec: - fmt: "BINAURAL" tx: type: "FER" - error_rate: 3 + error_rate: 5 c30: type: ivas bitrates: - 48000 cod: dec: - fmt: "BINAURAL" tx: type: "FER" - error_rate: 3 + error_rate: 5 c31: type: ivas bitrates: @@ -245,7 +237,6 @@ conditions_to_generate: cod: opts: ["-dtx"] dec: - fmt: "BINAURAL" c32: type: ivas bitrates: @@ -253,7 +244,6 @@ conditions_to_generate: cod: opts: ["-dtx"] dec: - fmt: "BINAURAL" c33: type: ivas bitrates: @@ -261,7 +251,6 @@ conditions_to_generate: cod: opts: ["-dtx"] dec: - fmt: "BINAURAL" c34: type: ivas bitrates: @@ -269,7 +258,6 @@ conditions_to_generate: cod: opts: ["-dtx"] dec: - fmt: "BINAURAL" ################################################ -- GitLab From a37c4b37b269a63e91da69ae116d9abd66b4cd47 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 10:19:43 +0200 Subject: [PATCH 22/48] store background noise for tests in different folder than input prevents "noise file too short for audio" error --- experiments/selection/P800-2/config/P800-2.yml | 14 +++++++------- experiments/selection/P800-5/config/P800-5.yml | 14 +++++++------- tests/test_experiments.py | 3 ++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/experiments/selection/P800-2/config/P800-2.yml b/experiments/selection/P800-2/config/P800-2.yml index 465bb2cf..c01cffe0 100644 --- a/experiments/selection/P800-2/config/P800-2.yml +++ b/experiments/selection/P800-2/config/P800-2.yml @@ -36,13 +36,13 @@ preprocessing_2: preamble_noise: true ### Additive background noise # TODO: enable after bug with bg noise addition is fixed - #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/proc_input/background_noise.wav" - #### Seed for delay offest; default = 0 - #seed_delay: 10 + 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.wav" + ### Seed for delay offest; default = 0 + seed_delay: 10 ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-5/config/P800-5.yml b/experiments/selection/P800-5/config/P800-5.yml index 786e0318..4fb650ba 100644 --- a/experiments/selection/P800-5/config/P800-5.yml +++ b/experiments/selection/P800-5/config/P800-5.yml @@ -36,13 +36,13 @@ preprocessing_2: preamble: 10000 preamble_noise: true # TODO: enable after bug with bg noise addition is fixed - #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/proc_input/background_noise.wav" - #### Seed for delay offest; default = 0 - #seed_delay: 10 + 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.wav" + ### Seed for delay offest; default = 0 + seed_delay: 10 ################################################# ### Bitstream processing diff --git a/tests/test_experiments.py b/tests/test_experiments.py index c53aa906..036b2643 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -101,7 +101,8 @@ def test_generate_test_items(exp_name): # copy background noise if needed if (bg_noise := BG_NOISE_FOR_EXPERIMENT.get(exp_name)) is not None: - bg_noise_out = input_path.joinpath(BG_NOISE_NAME) + bg_noise_folder = input_path.parent.joinpath("background_noise") + bg_noise_out = bg_noise_folder.joinpath(BG_NOISE_NAME) shutil.copy(bg_noise, bg_noise_out) generate_test(args) -- GitLab From 3d3077e031959dd0e65449e435a63f99c42c8809 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 11:13:05 +0200 Subject: [PATCH 23/48] add background noise folders to experiments folder skeleton --- experiments/selection/P800-2/background_noise/.gitkeep | 0 experiments/selection/P800-5/background_noise/.gitkeep | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 experiments/selection/P800-2/background_noise/.gitkeep create mode 100644 experiments/selection/P800-5/background_noise/.gitkeep diff --git a/experiments/selection/P800-2/background_noise/.gitkeep b/experiments/selection/P800-2/background_noise/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/selection/P800-5/background_noise/.gitkeep b/experiments/selection/P800-5/background_noise/.gitkeep new file mode 100644 index 00000000..e69de29b -- GitLab From 4f9e8f4ce98d657cdc91b5edd63cdb0cef0ca3e9 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 11:36:13 +0200 Subject: [PATCH 24/48] add config files for first 2 BS1534 experiments --- .../selection/BS1534-1a/config/BS1534-1a.yml | 97 +++++++++++++++ .../selection/BS1534-1b/config/BS1534-1b.yml | 112 ++++++++++++++++++ 2 files changed, 209 insertions(+) create mode 100644 experiments/selection/BS1534-1a/config/BS1534-1a.yml create mode 100644 experiments/selection/BS1534-1b/config/BS1534-1b.yml diff --git a/experiments/selection/BS1534-1a/config/BS1534-1a.yml b/experiments/selection/BS1534-1a/config/BS1534-1a.yml new file mode 100644 index 00000000..45246917 --- /dev/null +++ b/experiments/selection/BS1534-1a/config/BS1534-1a.yml @@ -0,0 +1,97 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-1a +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-1a/proc_input" +output_path: "experiments/selection/BS1534-1a/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "STEREO" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + c04: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + c05: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "STEREO" + c7: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "STEREO" + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "STEREO" + fs: 48000 + loudness: -26 diff --git a/experiments/selection/BS1534-1b/config/BS1534-1b.yml b/experiments/selection/BS1534-1b/config/BS1534-1b.yml new file mode 100644 index 00000000..b34ece27 --- /dev/null +++ b/experiments/selection/BS1534-1b/config/BS1534-1b.yml @@ -0,0 +1,112 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-1b +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-1b/proc_input" +output_path: "experiments/selection/BS1534-1b/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "STEREO" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + c04: + type: evs + bitrates: + - 64000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + c05: + type: evs + bitrates: + - 96000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 96000 + cod: + dec: + fmt: "STEREO" + tx: + type: "FER" + error_rate: 5 + c7: + type: ivas + bitrates: + - 128000 + cod: + dec: + fmt: "STEREO" + tx: + type: "FER" + error_rate: 5 + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "STEREO" + fs: 48000 + loudness: -26 -- GitLab From b75545ef1db10e68a84b32587c938c152fcedea5 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 11:44:10 +0200 Subject: [PATCH 25/48] config for BS1534-2a --- .../selection/BS1534-2a/config/BS1534-2a.yml | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 experiments/selection/BS1534-2a/config/BS1534-2a.yml diff --git a/experiments/selection/BS1534-2a/config/BS1534-2a.yml b/experiments/selection/BS1534-2a/config/BS1534-2a.yml new file mode 100644 index 00000000..68e3cc91 --- /dev/null +++ b/experiments/selection/BS1534-2a/config/BS1534-2a.yml @@ -0,0 +1,100 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-2a +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-2a/proc_input" +output_path: "experiments/selection/BS1534-2a/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "5_1" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 13200 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + c04: + type: evs + bitrates: + - 16400 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + c05: + type: evs + bitrates: + - 244000 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "5_1" + c7: + type: ivas + bitrates: + - 96000 + cod: + dec: + fmt: "5_1" + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "5_1" + fs: 48000 + loudness: -26 -- GitLab From b4498796fb3a827479dc5353ea9752df071b9394 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 12:03:24 +0200 Subject: [PATCH 26/48] add 2b and correct 2a condition name --- .../selection/BS1534-2a/config/BS1534-2a.yml | 2 +- .../selection/BS1534-2b/config/BS1534-2b.yml | 100 ++++++++++++++++++ 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 experiments/selection/BS1534-2b/config/BS1534-2b.yml diff --git a/experiments/selection/BS1534-2a/config/BS1534-2a.yml b/experiments/selection/BS1534-2a/config/BS1534-2a.yml index 68e3cc91..75208e95 100644 --- a/experiments/selection/BS1534-2a/config/BS1534-2a.yml +++ b/experiments/selection/BS1534-2a/config/BS1534-2a.yml @@ -83,7 +83,7 @@ conditions_to_generate: cod: dec: fmt: "5_1" - c7: + c07: type: ivas bitrates: - 96000 diff --git a/experiments/selection/BS1534-2b/config/BS1534-2b.yml b/experiments/selection/BS1534-2b/config/BS1534-2b.yml new file mode 100644 index 00000000..5da26e83 --- /dev/null +++ b/experiments/selection/BS1534-2b/config/BS1534-2b.yml @@ -0,0 +1,100 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-2b +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-2b/proc_input" +output_path: "experiments/selection/BS1534-2b/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "5_1" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + c04: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + c05: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 128000 + cod: + dec: + fmt: "5_1" + c07: + type: ivas + bitrates: + - 160000 + cod: + dec: + fmt: "5_1" + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "5_1" + fs: 48000 + loudness: -26 -- GitLab From fea6fbc1096a8eaaf93fe34e62f8e0cc347a127e Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 12:08:56 +0200 Subject: [PATCH 27/48] add configs for BS1534-3a and b --- .../selection/BS1534-3a/config/BS1534-3a.yml | 100 ++++++++++++++++++ .../selection/BS1534-3b/config/BS1534-3b.yml | 100 ++++++++++++++++++ 2 files changed, 200 insertions(+) create mode 100644 experiments/selection/BS1534-3a/config/BS1534-3a.yml create mode 100644 experiments/selection/BS1534-3b/config/BS1534-3b.yml diff --git a/experiments/selection/BS1534-3a/config/BS1534-3a.yml b/experiments/selection/BS1534-3a/config/BS1534-3a.yml new file mode 100644 index 00000000..4f09ac46 --- /dev/null +++ b/experiments/selection/BS1534-3a/config/BS1534-3a.yml @@ -0,0 +1,100 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-3a +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-3a/proc_input" +output_path: "experiments/selection/BS1534-3a/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "7_1_4" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 9600 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + c04: + type: evs + bitrates: + - 13200 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + c05: + type: evs + bitrates: + - 16400 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 128000 + cod: + dec: + fmt: "7_1_4" + c7: + type: ivas + bitrates: + - 160000 + cod: + dec: + fmt: "7_1_4" + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "7_1_4" + fs: 48000 + loudness: -26 diff --git a/experiments/selection/BS1534-3b/config/BS1534-3b.yml b/experiments/selection/BS1534-3b/config/BS1534-3b.yml new file mode 100644 index 00000000..80be5aee --- /dev/null +++ b/experiments/selection/BS1534-3b/config/BS1534-3b.yml @@ -0,0 +1,100 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-3b +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-3b/proc_input" +output_path: "experiments/selection/BS1534-3b/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "7_1_4" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + c04: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + c05: + type: evs + bitrates: + - 64000 + cod: + opts: ["-max_band", "FB"] + dec: + evs_lfe_9k6bps_nb: true + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 384000 + cod: + dec: + fmt: "7_1_4" + c7: + type: ivas + bitrates: + - 512000 + cod: + dec: + fmt: "7_1_4" + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "7_1_4" + fs: 48000 + loudness: -26 -- GitLab From 76436c97c8d5feaa3c0fc5b05a82f15df88e553c Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 12:15:13 +0200 Subject: [PATCH 28/48] 4a --- .../selection/BS1534-4a/config/BS1534-4a.yml | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 experiments/selection/BS1534-4a/config/BS1534-4a.yml diff --git a/experiments/selection/BS1534-4a/config/BS1534-4a.yml b/experiments/selection/BS1534-4a/config/BS1534-4a.yml new file mode 100644 index 00000000..4e793570 --- /dev/null +++ b/experiments/selection/BS1534-4a/config/BS1534-4a.yml @@ -0,0 +1,104 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-4a +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-4a/proc_input" +output_path: "experiments/selection/BS1534-4a/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "FOA" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + c04: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + c05: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 96000 + cod: + dec: + fmt: "FOA" + c07: + type: ivas + bitrates: + - 128000 + cod: + dec: + fmt: "FOA" + c08: + type: ivas + bitrates: + - 160000 + cod: + dec: + fmt: "FOA" + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "BINAURAL" + fs: 48000 + loudness: -26 -- GitLab From 118aaf32de0f500a2f6367fe41b73cd6360a3c15 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 12:22:47 +0200 Subject: [PATCH 29/48] 4b --- .../selection/BS1534-4b/config/BS1534-4b.yml | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 experiments/selection/BS1534-4b/config/BS1534-4b.yml diff --git a/experiments/selection/BS1534-4b/config/BS1534-4b.yml b/experiments/selection/BS1534-4b/config/BS1534-4b.yml new file mode 100644 index 00000000..4e793570 --- /dev/null +++ b/experiments/selection/BS1534-4b/config/BS1534-4b.yml @@ -0,0 +1,104 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-4a +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-4a/proc_input" +output_path: "experiments/selection/BS1534-4a/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "FOA" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + c04: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + c05: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 96000 + cod: + dec: + fmt: "FOA" + c07: + type: ivas + bitrates: + - 128000 + cod: + dec: + fmt: "FOA" + c08: + type: ivas + bitrates: + - 160000 + cod: + dec: + fmt: "FOA" + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "BINAURAL" + fs: 48000 + loudness: -26 -- GitLab From 8f85e697227193601bf5254b30e6be022090963a Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 12:25:21 +0200 Subject: [PATCH 30/48] 5a --- .../selection/BS1534-5a/config/BS1534-5a.yml | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 experiments/selection/BS1534-5a/config/BS1534-5a.yml diff --git a/experiments/selection/BS1534-5a/config/BS1534-5a.yml b/experiments/selection/BS1534-5a/config/BS1534-5a.yml new file mode 100644 index 00000000..ed5e15b1 --- /dev/null +++ b/experiments/selection/BS1534-5a/config/BS1534-5a.yml @@ -0,0 +1,97 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-5a +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-5a/proc_input" +output_path: "experiments/selection/BS1534-5a/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "HOA3" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + c04: + type: evs + bitrates: + - 64000 + cod: + opts: ["-max_band", "FB"] + dec: + c05: + type: evs + bitrates: + - 96000 + cod: + opts: ["-max_band", "FB"] + dec: + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 192000 + cod: + dec: + fmt: "HOA2" + c07: + type: ivas + bitrates: + - 256000 + cod: + dec: + fmt: "HOA2" + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "BINAURAL" + fs: 48000 + loudness: -26 -- GitLab From 5d41b1af1c33a0d2964c9fbe3550f6aa7e9a2853 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 12:29:25 +0200 Subject: [PATCH 31/48] 5b, correction in 5a --- .../selection/BS1534-5a/config/BS1534-5a.yml | 4 +- .../selection/BS1534-5b/config/BS1534-5b.yml | 97 +++++++++++++++++++ 2 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 experiments/selection/BS1534-5b/config/BS1534-5b.yml diff --git a/experiments/selection/BS1534-5a/config/BS1534-5a.yml b/experiments/selection/BS1534-5a/config/BS1534-5a.yml index ed5e15b1..125faa3d 100644 --- a/experiments/selection/BS1534-5a/config/BS1534-5a.yml +++ b/experiments/selection/BS1534-5a/config/BS1534-5a.yml @@ -79,14 +79,14 @@ conditions_to_generate: - 192000 cod: dec: - fmt: "HOA2" + fmt: "HOA3" c07: type: ivas bitrates: - 256000 cod: dec: - fmt: "HOA2" + fmt: "HOA3" ################################################ ### Post-processing diff --git a/experiments/selection/BS1534-5b/config/BS1534-5b.yml b/experiments/selection/BS1534-5b/config/BS1534-5b.yml new file mode 100644 index 00000000..18a6bd9b --- /dev/null +++ b/experiments/selection/BS1534-5b/config/BS1534-5b.yml @@ -0,0 +1,97 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-5b +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-5b/proc_input" +output_path: "experiments/selection/BS1534-5b/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "HOA3" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 96000 + cod: + opts: ["-max_band", "FB"] + dec: + c04: + type: evs + bitrates: + - 128000 + cod: + opts: ["-max_band", "FB"] + dec: + c05: + type: evs + bitrates: + - 96000 + cod: + opts: ["-max_band", "FB"] + dec: + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 384000 + cod: + dec: + fmt: "HOA3" + c07: + type: ivas + bitrates: + - 512000 + cod: + dec: + fmt: "HOA3" + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "7_1_4" + fs: 48000 + loudness: -26 -- GitLab From 183accce5b9181b7fb17857bb9918d1661747503 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 12:50:20 +0200 Subject: [PATCH 32/48] 6a and b --- .../selection/BS1534-6a/config/BS1534-6a.yml | 104 ++++++++++++++++++ .../selection/BS1534-6b/config/BS1534-6b.yml | 96 ++++++++++++++++ 2 files changed, 200 insertions(+) create mode 100644 experiments/selection/BS1534-6a/config/BS1534-6a.yml create mode 100644 experiments/selection/BS1534-6b/config/BS1534-6b.yml diff --git a/experiments/selection/BS1534-6a/config/BS1534-6a.yml b/experiments/selection/BS1534-6a/config/BS1534-6a.yml new file mode 100644 index 00000000..08f3e02b --- /dev/null +++ b/experiments/selection/BS1534-6a/config/BS1534-6a.yml @@ -0,0 +1,104 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-6a +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-6a/proc_input" +output_path: "experiments/selection/BS1534-6a/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "ISM3" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 16400 + cod: + opts: ["-max_band", "FB"] + dec: + c04: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + c05: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + ### IVAS condition ############################### + c06: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "ISM3" + c07: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM3" + c08: + type: ivas + bitrates: + - 96000 + cod: + dec: + fmt: "ISM3" + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "BINAURAL" + fs: 48000 + loudness: -26 diff --git a/experiments/selection/BS1534-6b/config/BS1534-6b.yml b/experiments/selection/BS1534-6b/config/BS1534-6b.yml new file mode 100644 index 00000000..258df25d --- /dev/null +++ b/experiments/selection/BS1534-6b/config/BS1534-6b.yml @@ -0,0 +1,96 @@ +--- +################################################ +# General configuration +################################################ + +name: BS1534-6b +master_seed: 5 +prerun_seed: 2 + +input_path: "experiments/selection/BS1534-6b/proc_input" +output_path: "experiments/selection/BS1534-6b/proc_output" + +################################################ +### Input configuration +################################################ +input: + fmt: "ISM4" + fs: 48000 + +################################################ +### Pre-processing on individual items +################################################ +preprocessing: + mask: "20KBP" + loudness: -26 + window: 100 + +################################################ +### Pre-processing on whole signal(s) +################################################ +# TODO: concatenation for generic audio? +# preprocessing_2: +# concatenate_input: true +# # concatenation_order: [] +# preamble: 10000 +# preamble_noise: true + +################################################# +### Bitstream processing +################################################# + +################################################ +### Configuration for conditions under test +################################################ +conditions_to_generate: + ### Reference and anchor conditions ########################## + c01: + type: ref + c02: + type: lp7k + + ### EVS condition ################################ + c03: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + c04: + type: evs + bitrates: + - 24400 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + + ### IVAS condition ############################### + c05: + type: ivas + bitrates: + - 96000 + cod: + dec: + fmt: "ISM4" + c06: + type: ivas + bitrates: + - 96000 + cod: + dec: + fmt: "ISM4" + tx: + type: "FER" + error_rate: 5 + +################################################ +### Post-processing +################################################ +postprocessing: + fmt: "BINAURAL" + fs: 48000 + loudness: -26 -- GitLab From f4a7700b4518a8e9aec35a87230651cd3e78cb3c Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 12:55:46 +0200 Subject: [PATCH 33/48] fix 4a and 4b --- .../selection/BS1534-4a/config/BS1534-4a.yml | 8 +++++++- .../selection/BS1534-4b/config/BS1534-4b.yml | 20 ++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/experiments/selection/BS1534-4a/config/BS1534-4a.yml b/experiments/selection/BS1534-4a/config/BS1534-4a.yml index 4e793570..386c4f03 100644 --- a/experiments/selection/BS1534-4a/config/BS1534-4a.yml +++ b/experiments/selection/BS1534-4a/config/BS1534-4a.yml @@ -14,7 +14,7 @@ output_path: "experiments/selection/BS1534-4a/proc_output" ### Input configuration ################################################ input: - fmt: "FOA" + fmt: "HOA3" fs: 48000 ################################################ @@ -55,6 +55,7 @@ conditions_to_generate: bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c04: @@ -62,6 +63,7 @@ conditions_to_generate: bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c05: @@ -69,6 +71,7 @@ conditions_to_generate: bitrates: - 48000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: @@ -78,6 +81,7 @@ conditions_to_generate: bitrates: - 96000 cod: + fmt: "FOA" dec: fmt: "FOA" c07: @@ -85,6 +89,7 @@ conditions_to_generate: bitrates: - 128000 cod: + fmt: "FOA" dec: fmt: "FOA" c08: @@ -92,6 +97,7 @@ conditions_to_generate: bitrates: - 160000 cod: + fmt: "FOA" dec: fmt: "FOA" diff --git a/experiments/selection/BS1534-4b/config/BS1534-4b.yml b/experiments/selection/BS1534-4b/config/BS1534-4b.yml index 4e793570..e4f2a00b 100644 --- a/experiments/selection/BS1534-4b/config/BS1534-4b.yml +++ b/experiments/selection/BS1534-4b/config/BS1534-4b.yml @@ -3,18 +3,18 @@ # General configuration ################################################ -name: BS1534-4a +name: BS1534-4b master_seed: 5 prerun_seed: 2 -input_path: "experiments/selection/BS1534-4a/proc_input" -output_path: "experiments/selection/BS1534-4a/proc_output" +input_path: "experiments/selection/BS1534-4b/proc_input" +output_path: "experiments/selection/BS1534-4b/proc_output" ################################################ ### Input configuration ################################################ input: - fmt: "FOA" + fmt: "HOA3" fs: 48000 ################################################ @@ -55,6 +55,7 @@ conditions_to_generate: bitrates: - 24400 cod: + fmt: "HOA2" opts: ["-max_band", "FB"] dec: c04: @@ -62,6 +63,7 @@ conditions_to_generate: bitrates: - 32000 cod: + fmt: "HOA2" opts: ["-max_band", "FB"] dec: c05: @@ -69,6 +71,7 @@ conditions_to_generate: bitrates: - 48000 cod: + fmt: "HOA2" opts: ["-max_band", "FB"] dec: @@ -78,22 +81,25 @@ conditions_to_generate: bitrates: - 96000 cod: + fmt: "HOA2" dec: - fmt: "FOA" + fmt: "HOA2" c07: type: ivas bitrates: - 128000 cod: + fmt: "HOA2" dec: - fmt: "FOA" + fmt: "HOA2" c08: type: ivas bitrates: - 160000 cod: + fmt: "HOA2" dec: - fmt: "FOA" + fmt: "HOA2" ################################################ ### Post-processing -- GitLab From 210f6c872c1fef38a6f07fabee570f69953484da Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 12:57:14 +0200 Subject: [PATCH 34/48] fix 5a and 5b --- experiments/selection/BS1534-5a/config/BS1534-5a.yml | 3 +++ experiments/selection/BS1534-5b/config/BS1534-5b.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/experiments/selection/BS1534-5a/config/BS1534-5a.yml b/experiments/selection/BS1534-5a/config/BS1534-5a.yml index 125faa3d..f816ef3b 100644 --- a/experiments/selection/BS1534-5a/config/BS1534-5a.yml +++ b/experiments/selection/BS1534-5a/config/BS1534-5a.yml @@ -55,6 +55,7 @@ conditions_to_generate: bitrates: - 48000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c04: @@ -62,6 +63,7 @@ conditions_to_generate: bitrates: - 64000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c05: @@ -69,6 +71,7 @@ conditions_to_generate: bitrates: - 96000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: diff --git a/experiments/selection/BS1534-5b/config/BS1534-5b.yml b/experiments/selection/BS1534-5b/config/BS1534-5b.yml index 18a6bd9b..bc9f4b61 100644 --- a/experiments/selection/BS1534-5b/config/BS1534-5b.yml +++ b/experiments/selection/BS1534-5b/config/BS1534-5b.yml @@ -55,6 +55,7 @@ conditions_to_generate: bitrates: - 96000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c04: @@ -62,6 +63,7 @@ conditions_to_generate: bitrates: - 128000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c05: @@ -69,6 +71,7 @@ conditions_to_generate: bitrates: - 96000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: -- GitLab From 651a88e932d7c7278da6bf2c5e396fcd8dfd6f47 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 13:12:28 +0200 Subject: [PATCH 35/48] only test BS1534 experiment configs for now --- tests/constants.py | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/tests/constants.py b/tests/constants.py index f4ca7aa9..cd19f0c4 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -203,13 +203,27 @@ INPUT_CONFIG_FILES = [ ] INPUT_EXPERIMENT_NAMES = [ - "P800-1", - "P800-2", - "P800-3", - "P800-4", - "P800-5", - "P800-6", - "P800-7", + "BS1534-1a", + "BS1534-1b", + "BS1534-2a", + "BS1534-2b", + "BS1534-3a", + "BS1534-3b", + "BS1534-4a", + "BS1534-4b", + "BS1534-5a", + "BS1534-5b", + "BS1534-6a", + "BS1534-6b", + # "BS1534-7a", + # "BS1534-7b", + # "P800-1", + # "P800-2", + # "P800-3", + # "P800-4", + # "P800-5", + # "P800-6", + # "P800-7", # "P800-8", # "P800-9", ] -- GitLab From 83b7268ac6c8b3d5d403dd92dedd561b1cd3ee21 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 13:34:42 +0200 Subject: [PATCH 36/48] fix bitrate in config --- experiments/selection/BS1534-2a/config/BS1534-2a.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiments/selection/BS1534-2a/config/BS1534-2a.yml b/experiments/selection/BS1534-2a/config/BS1534-2a.yml index 75208e95..2f728b9c 100644 --- a/experiments/selection/BS1534-2a/config/BS1534-2a.yml +++ b/experiments/selection/BS1534-2a/config/BS1534-2a.yml @@ -69,7 +69,7 @@ conditions_to_generate: c05: type: evs bitrates: - - 244000 + - 24400 cod: opts: ["-max_band", "FB"] dec: -- GitLab From 3f3341597ca84346ab60d4e9c6e6f8e855097ae6 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 13:35:52 +0200 Subject: [PATCH 37/48] disable other tests for speed --- .gitlab-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb61efa7..b3d6f659 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,6 @@ stages: - check - test - analyze - - optional # print some info on the runner setup @@ -50,7 +49,7 @@ check_for_binaries: # ------------------------------------ # test the format conversion only -test_audiotools_convert: +.test_audiotools_convert: stage: test tags: - linux @@ -59,7 +58,7 @@ test_audiotools_convert: - python3 -m pytest -n auto tests/test_audiotools_convert.py # run some test configs for item creation -test_processing: +.test_processing: stage: test tags: - linux @@ -72,7 +71,7 @@ test_processing: # static analysis/formatting tests # ------------------------------------ -lint: +.lint: stage: analyze tags: - linux @@ -80,7 +79,7 @@ lint: script: - flake8 --max-line-length 88 --extend-ignore=E203,E501,E741 -format: +.format: stage: analyze variables: ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix" @@ -106,7 +105,7 @@ format: expose_as: "formatting patch" experiments: - stage: optional + stage: test tags: - linux #rules: -- GitLab From 7a9a676b5d07dbf19bd78852e01b4329e62eddc3 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 15:15:05 +0200 Subject: [PATCH 38/48] double testfile length to avoid problem with gen-patt --- tests/test_experiments.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 036b2643..58e2fff4 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -45,6 +45,7 @@ from tests.constants import ( NCHAN_TO_FILE, ) from ivas_processing_scripts.audiotools import audio +from ivas_processing_scripts.audiotools.audiofile import concat BG_NOISE_FOR_EXPERIMENT = { @@ -93,7 +94,8 @@ def test_generate_test_items(exp_name): # copy input files for f in dummy_input_files: f_out = input_path.joinpath(f.name).resolve().absolute() - shutil.copy(f, f_out) + # need at least 2s of input files for gen-patt to be happy (can not keep the tolerance for 50 frames only) + concat([str(f)] * 2, str(f_out)) for i, md_f in enumerate(dummy_md_files): suffix = f"{i}.csv" md_f_out = ".".join([str(f_out), suffix]) -- GitLab From e52fb864ef9124ecf5b6136c95a06e1f31b5aab3 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 15:29:04 +0200 Subject: [PATCH 39/48] activate all tests again --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3d6f659..46bfc359 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ check_for_binaries: # ------------------------------------ # test the format conversion only -.test_audiotools_convert: +test_audiotools_convert: stage: test tags: - linux @@ -58,7 +58,7 @@ check_for_binaries: - python3 -m pytest -n auto tests/test_audiotools_convert.py # run some test configs for item creation -.test_processing: +test_processing: stage: test tags: - linux -- GitLab From 9ba2c5519b0fc2bfebeab87a427e29d3864933ee Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 15:32:45 +0200 Subject: [PATCH 40/48] also add analyzer jobs back --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46bfc359..47517866 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ test_processing: # static analysis/formatting tests # ------------------------------------ -.lint: +lint: stage: analyze tags: - linux @@ -79,7 +79,7 @@ test_processing: script: - flake8 --max-line-length 88 --extend-ignore=E203,E501,E741 -.format: +format: stage: analyze variables: ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix" -- GitLab From b4bf31eda992b71997d26f51923ca57bc54348aa Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 15:33:45 +0200 Subject: [PATCH 41/48] run formatter --- ivas_processing_scripts/processing/config.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ivas_processing_scripts/processing/config.py b/ivas_processing_scripts/processing/config.py index 7027ce75..2a3e9165 100755 --- a/ivas_processing_scripts/processing/config.py +++ b/ivas_processing_scripts/processing/config.py @@ -141,8 +141,13 @@ class TestConfig: # validate preprocessing on concatenated file stage if (pre_proc_2 := getattr(cfg, "preprocessing_2", None)) is not None: bg_noise_folder = Path(pre_proc_2["background_noise_path"]).parent - if bg_noise_folder.resolve().absolute() == cfg.input_path.resolve().absolute(): - raise ValueError(f"Background noise file has to be placed outside the input folder!") + if ( + bg_noise_folder.resolve().absolute() + == cfg.input_path.resolve().absolute() + ): + raise ValueError( + f"Background noise file has to be placed outside the input folder!" + ) for cond_name, cond_cfg in cfg.get("conditions_to_generate").items(): type = cond_cfg.get("type") -- GitLab From b68f6c30c8b890b370b3fce1a8d5c74b57540b53 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 11 May 2023 15:36:09 +0200 Subject: [PATCH 42/48] make linter happy --- ivas_processing_scripts/processing/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivas_processing_scripts/processing/config.py b/ivas_processing_scripts/processing/config.py index 2a3e9165..a90487e6 100755 --- a/ivas_processing_scripts/processing/config.py +++ b/ivas_processing_scripts/processing/config.py @@ -146,7 +146,7 @@ class TestConfig: == cfg.input_path.resolve().absolute() ): raise ValueError( - f"Background noise file has to be placed outside the input folder!" + "Background noise file has to be placed outside the input folder!" ) for cond_name, cond_cfg in cfg.get("conditions_to_generate").items(): -- GitLab From 6ba6981bcf43e223e829a6d6151c03aefca8065a Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 11 May 2023 21:06:43 +0200 Subject: [PATCH 43/48] in general enable concatenation; fixes to SBA tests --- .../selection/BS1534-1a/config/BS1534-1a.yml | 11 +++++------ .../selection/BS1534-1b/config/BS1534-1b.yml | 11 +++++------ .../selection/BS1534-2a/config/BS1534-2a.yml | 11 +++++------ .../selection/BS1534-2b/config/BS1534-2b.yml | 11 +++++------ .../selection/BS1534-3a/config/BS1534-3a.yml | 11 +++++------ .../selection/BS1534-3b/config/BS1534-3b.yml | 11 +++++------ .../selection/BS1534-4a/config/BS1534-4a.yml | 17 ++++++++--------- .../selection/BS1534-4b/config/BS1534-4b.yml | 17 ++++++++--------- .../selection/BS1534-5a/config/BS1534-5a.yml | 11 +++++------ .../selection/BS1534-5b/config/BS1534-5b.yml | 11 +++++------ .../selection/BS1534-6a/config/BS1534-6a.yml | 11 +++++------ .../selection/BS1534-6b/config/BS1534-6b.yml | 11 +++++------ 12 files changed, 66 insertions(+), 78 deletions(-) diff --git a/experiments/selection/BS1534-1a/config/BS1534-1a.yml b/experiments/selection/BS1534-1a/config/BS1534-1a.yml index 45246917..b6bf8ed3 100644 --- a/experiments/selection/BS1534-1a/config/BS1534-1a.yml +++ b/experiments/selection/BS1534-1a/config/BS1534-1a.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-1b/config/BS1534-1b.yml b/experiments/selection/BS1534-1b/config/BS1534-1b.yml index b34ece27..38ce608a 100644 --- a/experiments/selection/BS1534-1b/config/BS1534-1b.yml +++ b/experiments/selection/BS1534-1b/config/BS1534-1b.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-2a/config/BS1534-2a.yml b/experiments/selection/BS1534-2a/config/BS1534-2a.yml index 2f728b9c..ad09975a 100644 --- a/experiments/selection/BS1534-2a/config/BS1534-2a.yml +++ b/experiments/selection/BS1534-2a/config/BS1534-2a.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-2b/config/BS1534-2b.yml b/experiments/selection/BS1534-2b/config/BS1534-2b.yml index 5da26e83..84ad3bc6 100644 --- a/experiments/selection/BS1534-2b/config/BS1534-2b.yml +++ b/experiments/selection/BS1534-2b/config/BS1534-2b.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-3a/config/BS1534-3a.yml b/experiments/selection/BS1534-3a/config/BS1534-3a.yml index 4f09ac46..0f7bf228 100644 --- a/experiments/selection/BS1534-3a/config/BS1534-3a.yml +++ b/experiments/selection/BS1534-3a/config/BS1534-3a.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-3b/config/BS1534-3b.yml b/experiments/selection/BS1534-3b/config/BS1534-3b.yml index 80be5aee..6d142193 100644 --- a/experiments/selection/BS1534-3b/config/BS1534-3b.yml +++ b/experiments/selection/BS1534-3b/config/BS1534-3b.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-4a/config/BS1534-4a.yml b/experiments/selection/BS1534-4a/config/BS1534-4a.yml index 386c4f03..c668e106 100644 --- a/experiments/selection/BS1534-4a/config/BS1534-4a.yml +++ b/experiments/selection/BS1534-4a/config/BS1534-4a.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing @@ -83,7 +82,7 @@ conditions_to_generate: cod: fmt: "FOA" dec: - fmt: "FOA" + fmt: "HOA3" c07: type: ivas bitrates: @@ -91,7 +90,7 @@ conditions_to_generate: cod: fmt: "FOA" dec: - fmt: "FOA" + fmt: "HOA3" c08: type: ivas bitrates: @@ -99,7 +98,7 @@ conditions_to_generate: cod: fmt: "FOA" dec: - fmt: "FOA" + fmt: "HOA3" ################################################ ### Post-processing diff --git a/experiments/selection/BS1534-4b/config/BS1534-4b.yml b/experiments/selection/BS1534-4b/config/BS1534-4b.yml index e4f2a00b..9a7b5788 100644 --- a/experiments/selection/BS1534-4b/config/BS1534-4b.yml +++ b/experiments/selection/BS1534-4b/config/BS1534-4b.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing @@ -83,7 +82,7 @@ conditions_to_generate: cod: fmt: "HOA2" dec: - fmt: "HOA2" + fmt: "HOA3" c07: type: ivas bitrates: @@ -91,7 +90,7 @@ conditions_to_generate: cod: fmt: "HOA2" dec: - fmt: "HOA2" + fmt: "HOA3" c08: type: ivas bitrates: @@ -99,7 +98,7 @@ conditions_to_generate: cod: fmt: "HOA2" dec: - fmt: "HOA2" + fmt: "HOA3" ################################################ ### Post-processing diff --git a/experiments/selection/BS1534-5a/config/BS1534-5a.yml b/experiments/selection/BS1534-5a/config/BS1534-5a.yml index f816ef3b..68430de5 100644 --- a/experiments/selection/BS1534-5a/config/BS1534-5a.yml +++ b/experiments/selection/BS1534-5a/config/BS1534-5a.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-5b/config/BS1534-5b.yml b/experiments/selection/BS1534-5b/config/BS1534-5b.yml index bc9f4b61..5575e50d 100644 --- a/experiments/selection/BS1534-5b/config/BS1534-5b.yml +++ b/experiments/selection/BS1534-5b/config/BS1534-5b.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-6a/config/BS1534-6a.yml b/experiments/selection/BS1534-6a/config/BS1534-6a.yml index 08f3e02b..66d9b043 100644 --- a/experiments/selection/BS1534-6a/config/BS1534-6a.yml +++ b/experiments/selection/BS1534-6a/config/BS1534-6a.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-6b/config/BS1534-6b.yml b/experiments/selection/BS1534-6b/config/BS1534-6b.yml index 258df25d..4998c7b2 100644 --- a/experiments/selection/BS1534-6b/config/BS1534-6b.yml +++ b/experiments/selection/BS1534-6b/config/BS1534-6b.yml @@ -28,12 +28,11 @@ preprocessing: ################################################ ### Pre-processing on whole signal(s) ################################################ -# TODO: concatenation for generic audio? -# preprocessing_2: -# concatenate_input: true -# # concatenation_order: [] -# preamble: 10000 -# preamble_noise: true +preprocessing_2: + concatenate_input: true + # concatenation_order: [] + preamble: 10000 + preamble_noise: true ################################################# ### Bitstream processing -- GitLab From 83c1106a7e0ac26aa3349dd290f9aef377845125 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 12 May 2023 08:47:37 +0200 Subject: [PATCH 44/48] activate P800 tests in CI again --- tests/constants.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/constants.py b/tests/constants.py index cd19f0c4..fb91b23c 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -217,13 +217,13 @@ INPUT_EXPERIMENT_NAMES = [ "BS1534-6b", # "BS1534-7a", # "BS1534-7b", - # "P800-1", - # "P800-2", - # "P800-3", - # "P800-4", - # "P800-5", - # "P800-6", - # "P800-7", + "P800-1", + "P800-2", + "P800-3", + "P800-4", + "P800-5", + "P800-6", + "P800-7", # "P800-8", # "P800-9", ] -- GitLab From a554263e0969adc93ee6b4fa87e55bcd5785aff1 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 12 May 2023 08:49:49 +0200 Subject: [PATCH 45/48] correct P800 bg noise --- experiments/selection/P800-2/config/P800-2.yml | 3 --- experiments/selection/P800-5/config/P800-5.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/experiments/selection/P800-2/config/P800-2.yml b/experiments/selection/P800-2/config/P800-2.yml index c01cffe0..5fa7f442 100644 --- a/experiments/selection/P800-2/config/P800-2.yml +++ b/experiments/selection/P800-2/config/P800-2.yml @@ -35,14 +35,11 @@ preprocessing_2: preamble: 10000 preamble_noise: true ### Additive background noise - # TODO: enable after bug with bg noise addition is fixed 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.wav" - ### Seed for delay offest; default = 0 - seed_delay: 10 ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-5/config/P800-5.yml b/experiments/selection/P800-5/config/P800-5.yml index 4fb650ba..a146020b 100644 --- a/experiments/selection/P800-5/config/P800-5.yml +++ b/experiments/selection/P800-5/config/P800-5.yml @@ -35,14 +35,11 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true - # TODO: enable after bug with bg noise addition is fixed 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.wav" - ### Seed for delay offest; default = 0 - seed_delay: 10 ################################################# ### Bitstream processing -- GitLab From 46b3e0e68c19bb323c95d8287b999783fc06f2ad Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 12 May 2023 08:54:45 +0200 Subject: [PATCH 46/48] run isort --- tests/test_experiments.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 58e2fff4..d3d4c637 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -36,17 +36,16 @@ from pathlib import Path import pytest from ivas_processing_scripts import main as generate_test +from ivas_processing_scripts.audiotools import audio +from ivas_processing_scripts.audiotools.audiofile import concat from ivas_processing_scripts.processing.config import TestConfig from tests.constants import ( - INPUT_EXPERIMENT_NAMES, EXPERIMENTS_DIR, - TESTS_DIR, FORMAT_TO_METADATA_FILES, + INPUT_EXPERIMENT_NAMES, NCHAN_TO_FILE, + TESTS_DIR, ) -from ivas_processing_scripts.audiotools import audio -from ivas_processing_scripts.audiotools.audiofile import concat - BG_NOISE_FOR_EXPERIMENT = { "P800-2": Path(TESTS_DIR).joinpath("data").joinpath("p800-2_background_noise.wav"), -- GitLab From a8a650ce9c3e9e6df7a930f0319870fed8a60b81 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 12 May 2023 09:42:16 +0200 Subject: [PATCH 47/48] some small CI adaptations --- .gitlab-ci.yml | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47517866..736bf130 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,13 @@ default: interruptible: true +workflow: + rules: + # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push" + when: never + + stages: - check - test @@ -57,9 +64,23 @@ test_audiotools_convert: - *print-common-info - python3 -m pytest -n auto tests/test_audiotools_convert.py +# run the test configs for the selection experiments +experiments: + stage: test + tags: + - linux + script: + - *print-common-info + - *get-codec-binaries + - python3 -m pytest -n auto tests/test_experiments.py + # run some test configs for item creation test_processing: stage: test + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + - if: $CI_PIPELINE_SOURCE == 'push' + when: never tags: - linux script: @@ -73,6 +94,7 @@ test_processing: lint: stage: analyze + needs: [] tags: - linux allow_failure: true @@ -81,6 +103,7 @@ lint: format: stage: analyze + needs: [] variables: ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix" ARTIFACT_FOLDER: "formatting-patch" @@ -103,15 +126,3 @@ format: when: on_failure name: "$ARTIFACT_BASE_NAME" expose_as: "formatting patch" - -experiments: - stage: test - tags: - - linux - #rules: - #- when: manual - needs: [] - script: - - *print-common-info - - *get-codec-binaries - - python3 -m pytest -n auto tests/test_experiments.py -- GitLab From 54539fb661200aae24fb277032793ef9850d01b9 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 12 May 2023 09:44:03 +0200 Subject: [PATCH 48/48] fix workflow --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 736bf130..e5da8fcf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,9 @@ workflow: # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push" when: never + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + - if: $CI_PIPELINE_SOURCE == 'push' + - if: $CI_PIPELINE_SOURCE == 'web' # for testing stages: -- GitLab