From 6e5dc7879bc29d38b516bf4694846085062eeddb Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 31 May 2023 12:48:05 +0200 Subject: [PATCH 1/6] remove sba_fmt from IVAS conditions and use cod:fmt key instead --- .../selection/BS1534-4a/config/BS1534-4a.yml | 6 +++--- .../selection/BS1534-4b/config/BS1534-4b.yml | 4 ++-- ivas_processing_scripts/processing/chains.py | 15 --------------- ivas_processing_scripts/processing/ivas.py | 16 ---------------- 4 files changed, 5 insertions(+), 36 deletions(-) diff --git a/experiments/selection/BS1534-4a/config/BS1534-4a.yml b/experiments/selection/BS1534-4a/config/BS1534-4a.yml index 9da29696..a16da8be 100644 --- a/experiments/selection/BS1534-4a/config/BS1534-4a.yml +++ b/experiments/selection/BS1534-4a/config/BS1534-4a.yml @@ -78,26 +78,26 @@ conditions_to_generate: ### IVAS condition ############################### c06: type: ivas - sba_fmt: "FOA" bitrates: - 96000 cod: + fmt: "FOA" dec: fmt: "HOA3" c07: type: ivas - sba_fmt: "FOA" bitrates: - 128000 cod: + fmt: "FOA" dec: fmt: "HOA3" c08: type: ivas - sba_fmt: "FOA" bitrates: - 160000 cod: + fmt: "FOA" dec: fmt: "HOA3" diff --git a/experiments/selection/BS1534-4b/config/BS1534-4b.yml b/experiments/selection/BS1534-4b/config/BS1534-4b.yml index fb6d37f8..30f9b927 100644 --- a/experiments/selection/BS1534-4b/config/BS1534-4b.yml +++ b/experiments/selection/BS1534-4b/config/BS1534-4b.yml @@ -78,18 +78,18 @@ conditions_to_generate: ### IVAS condition ############################### c06: type: ivas - sba_fmt: "HOA2" bitrates: - 160000 cod: + fmt: "HOA2" dec: fmt: "HOA3" c07: type: ivas - sba_fmt: "HOA2" bitrates: - 192000 cod: + fmt: "HOA2" dec: fmt: "HOA3" diff --git a/ivas_processing_scripts/processing/chains.py b/ivas_processing_scripts/processing/chains.py index 3371c87f..57e92317 100755 --- a/ivas_processing_scripts/processing/chains.py +++ b/ivas_processing_scripts/processing/chains.py @@ -347,21 +347,6 @@ def get_processing_chain( cod_cfg = cond_cfg["cod"] dec_cfg = cond_cfg["dec"] - if cond_cfg.get("sba_fmt"): - validate_sba_fmt(tmp_in_fmt, cond_cfg.get("sba_fmt")) - chain["processes"].append( - Postprocessing( - { - "in_fs": tmp_in_fs, - "in_fmt": tmp_in_fmt, - "out_fs": tmp_in_fs, - "out_fmt": cond_cfg.get("sba_fmt"), - }, - name="sba_fmt_rend", - ) - ) - tmp_in_fmt = cond_cfg.get("sba_fmt") - # 9.6 kbit/s NB for EVS LFE coding only applies to EVS conditions evs_lfe_9k6bps_nb = cond_cfg.get("evs_lfe_9k6bps_nb", None) diff --git a/ivas_processing_scripts/processing/ivas.py b/ivas_processing_scripts/processing/ivas.py index 3580df08..fc7d756d 100755 --- a/ivas_processing_scripts/processing/ivas.py +++ b/ivas_processing_scripts/processing/ivas.py @@ -350,22 +350,6 @@ class IVAS(Processing): raise ValueError(f"IVAS: Invalid input config: {fmt.name}.") -def validate_sba_fmt(in_fmt, sba_fmt): - in_audio = audio.fromtype(in_fmt) - sba_audio = audio.fromtype(sba_fmt) - if isinstance(in_audio, audio.SceneBasedAudio): - if not isinstance(sba_audio, audio.SceneBasedAudio) or ( - sba_audio.num_channels > in_audio.num_channels - ): - raise ValueError( - "SBA format for IVAS condition has to be SBA with lower or equal order than input signal" - ) - else: - if in_audio.name != sba_audio.name: - raise ValueError("Cannot specify SBA format for non SBA input formats") - return - - class IVAS_rend(Processing): def __init__(self, attrs): super().__init__(attrs) -- GitLab From 0df1c434c7fc240c0ba9ca85e8efabd152ec331a Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 31 May 2023 13:44:36 +0200 Subject: [PATCH 2/6] set same seed for random noise generation --- tests/test_experiments.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 8fe4bba2..a022e43d 100644 --- a/tests/test_experiments.py +++ b/tests/test_experiments.py @@ -34,7 +34,7 @@ import shutil from pathlib import Path import pytest -from numpy.random import random +from numpy.random import random, seed from create_items_p800 import create_items from ivas_processing_scripts import main as generate_test @@ -93,6 +93,9 @@ def setup_input_files_for_config(config, category=1): # create background noise files with white noise if "background_noise" in config.preprocessing_2: + # always set the same seed to have reproducible test noises + seed(1) + noise = random((48000 * 30, num_channels)) - 0.5 noise *= 2**15 - 1 bg_noise_path = Path( -- GitLab From 51566c378773b29fd211e5e132cc4c25287d45c6 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 31 May 2023 14:40:46 +0200 Subject: [PATCH 3/6] remove sba_fmt from EVS processing code --- ivas_processing_scripts/processing/chains.py | 4 +--- ivas_processing_scripts/processing/evs.py | 22 +++++--------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/ivas_processing_scripts/processing/chains.py b/ivas_processing_scripts/processing/chains.py index 57e92317..040fd303 100755 --- a/ivas_processing_scripts/processing/chains.py +++ b/ivas_processing_scripts/processing/chains.py @@ -35,7 +35,7 @@ from warnings import warn from ivas_processing_scripts.processing.config import TestConfig from ivas_processing_scripts.processing.evs import EVS -from ivas_processing_scripts.processing.ivas import IVAS, validate_sba_fmt +from ivas_processing_scripts.processing.ivas import IVAS from ivas_processing_scripts.processing.postprocessing import Postprocessing from ivas_processing_scripts.processing.preprocessing import Preprocessing from ivas_processing_scripts.processing.preprocessing_2 import Preprocessing2 @@ -334,14 +334,12 @@ def get_processing_chain( "tx": tx_cfg, "preamble": preamble, "evs_lfe_9k6bps_nb": evs_lfe_9k6bps_nb, - "sba_fmt": cond_cfg.get("sba_fmt", tmp_in_fmt), "use_windows_codec_binaries": cfg.use_windows_codec_binaries, } ) ) # update values to reflect decoder output tmp_in_fs = dec_cfg.get("fs", tmp_in_fs) - tmp_in_fmt = cond_cfg.get("sba_fmt", tmp_in_fmt) elif cond_cfg["type"] == "ivas": cod_cfg = cond_cfg["cod"] diff --git a/ivas_processing_scripts/processing/evs.py b/ivas_processing_scripts/processing/evs.py index eb3cd929..793150b4 100755 --- a/ivas_processing_scripts/processing/evs.py +++ b/ivas_processing_scripts/processing/evs.py @@ -173,31 +173,19 @@ class EVS(Processing): if not self.out_fs: self.out_fs = self.in_fs - # consider SBA format for condition - condition_fmt = audio.fromtype(self.sba_fmt) - if isinstance(self.in_fmt, audio.SceneBasedAudio): - if not isinstance(condition_fmt, audio.SceneBasedAudio) or ( - condition_fmt.num_channels > self.in_fmt.num_channels - ): - raise ValueError( - "SBA format for EVS condition has to be SBA with lower or equal order than input signal" - ) - is_planar = condition_fmt.is_planar - else: - if self.in_fmt.name != condition_fmt.name: - raise ValueError("Cannot specify SBA format for non SBA input formats") - is_planar = False + # flag for zeroing of channels for planar SBA formats + is_planar = isinstance(self.in_fmt, audio.SceneBasedAudio) and self.in_fmt.is_planar # Split the channels to prepare for multi-mono coding split_chan_files = [ - out_file.with_suffix(f".{i}.pcm") for i in range(condition_fmt.num_channels) + out_file.with_suffix(f".{i}.pcm") for i in range(self.in_fmt.num_channels) ] split_channels( in_file, split_chan_files, in_nchans=self.in_fmt.num_channels, - out_nchans=condition_fmt.num_channels, + out_nchans=self.in_fmt.num_channels, in_fs=self.in_fs, is_planar=is_planar, ) @@ -252,7 +240,7 @@ class EVS(Processing): ) copyfile(in_meta[idx], out_file_meta) # copy MASA metadata for MASA pass-through - if isinstance(condition_fmt, audio.MetadataAssistedSpatialAudio): + if isinstance(self.in_fmt, audio.MetadataAssistedSpatialAudio): md_file_in = in_file.parent / (in_file.name + ".met") md_file_out = out_file.parent / (out_file.name + ".met") copyfile(md_file_in, md_file_out) -- GitLab From 08583c506a9e76f3accc22e5d56dba4d21fe9ba4 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 31 May 2023 14:53:40 +0200 Subject: [PATCH 4/6] remove sba_fmt from configs as well --- .../selection/BS1534-4a/config/BS1534-4a.yml | 6 ++-- .../selection/BS1534-4b/config/BS1534-4b.yml | 6 ++-- .../selection/BS1534-5a/config/BS1534-5a.yml | 6 ++-- .../selection/BS1534-5b/config/BS1534-5b.yml | 4 +-- .../selection/P800-4/config/P800-4-cat1.yml | 30 +++++++++---------- .../selection/P800-4/config/P800-4-cat2.yml | 30 +++++++++---------- .../selection/P800-4/config/P800-4-cat3.yml | 30 +++++++++---------- .../selection/P800-4/config/P800-4-cat4.yml | 30 +++++++++---------- .../selection/P800-4/config/P800-4-cat5.yml | 30 +++++++++---------- .../selection/P800-4/config/P800-4-cat6.yml | 30 +++++++++---------- .../selection/P800-5/config/P800-5-cat1.yml | 30 +++++++++---------- .../selection/P800-5/config/P800-5-cat2.yml | 30 +++++++++---------- .../selection/P800-5/config/P800-5-cat3.yml | 30 +++++++++---------- .../selection/P800-5/config/P800-5-cat4.yml | 30 +++++++++---------- .../selection/P800-5/config/P800-5-cat5.yml | 30 +++++++++---------- .../selection/P800-5/config/P800-5-cat6.yml | 30 +++++++++---------- .../selection/P800-8/config/P800-8-cat1.yml | 21 ++++++------- .../selection/P800-8/config/P800-8-cat2.yml | 21 ++++++------- .../selection/P800-8/config/P800-8-cat3.yml | 21 ++++++------- .../selection/P800-8/config/P800-8-cat4.yml | 21 ++++++------- .../selection/P800-8/config/P800-8-cat5.yml | 21 ++++++------- .../selection/P800-8/config/P800-8-cat6.yml | 21 ++++++------- .../selection/P800-9/config/P800-9-cat1.yml | 24 +++++++-------- .../selection/P800-9/config/P800-9-cat2.yml | 24 +++++++-------- .../selection/P800-9/config/P800-9-cat3.yml | 24 +++++++-------- .../selection/P800-9/config/P800-9-cat4.yml | 24 +++++++-------- .../selection/P800-9/config/P800-9-cat5.yml | 24 +++++++-------- .../selection/P800-9/config/P800-9-cat6.yml | 24 +++++++-------- 28 files changed, 329 insertions(+), 323 deletions(-) diff --git a/experiments/selection/BS1534-4a/config/BS1534-4a.yml b/experiments/selection/BS1534-4a/config/BS1534-4a.yml index a16da8be..917482b6 100644 --- a/experiments/selection/BS1534-4a/config/BS1534-4a.yml +++ b/experiments/selection/BS1534-4a/config/BS1534-4a.yml @@ -52,26 +52,26 @@ conditions_to_generate: ### EVS condition ################################ c03: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c04: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c05: type: evs - sba_fmt: "FOA" bitrates: - 48000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: diff --git a/experiments/selection/BS1534-4b/config/BS1534-4b.yml b/experiments/selection/BS1534-4b/config/BS1534-4b.yml index 30f9b927..a549c07d 100644 --- a/experiments/selection/BS1534-4b/config/BS1534-4b.yml +++ b/experiments/selection/BS1534-4b/config/BS1534-4b.yml @@ -52,26 +52,26 @@ conditions_to_generate: ### EVS condition ################################ c03: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c04: type: evs - sba_fmt: "FOA" bitrates: - 48000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c05: type: evs - sba_fmt: "FOA" bitrates: - 64000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: diff --git a/experiments/selection/BS1534-5a/config/BS1534-5a.yml b/experiments/selection/BS1534-5a/config/BS1534-5a.yml index 2055da7c..8ac50c05 100644 --- a/experiments/selection/BS1534-5a/config/BS1534-5a.yml +++ b/experiments/selection/BS1534-5a/config/BS1534-5a.yml @@ -52,26 +52,26 @@ conditions_to_generate: ### EVS condition ################################ c03: type: evs - sba_fmt: "FOA" bitrates: - 48000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c04: type: evs - sba_fmt: "FOA" bitrates: - 64000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c05: type: evs - sba_fmt: "FOA" 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 3702d644..50ca2553 100644 --- a/experiments/selection/BS1534-5b/config/BS1534-5b.yml +++ b/experiments/selection/BS1534-5b/config/BS1534-5b.yml @@ -52,18 +52,18 @@ conditions_to_generate: ### EVS condition ################################ c03: type: evs - sba_fmt: "FOA" bitrates: - 96000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c04: type: evs - sba_fmt: "FOA" bitrates: - 128000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: diff --git a/experiments/selection/P800-4/config/P800-4-cat1.yml b/experiments/selection/P800-4/config/P800-4-cat1.yml index 5ec17e36..4dfb1de7 100644 --- a/experiments/selection/P800-4/config/P800-4-cat1.yml +++ b/experiments/selection/P800-4/config/P800-4-cat1.yml @@ -80,75 +80,75 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -156,10 +156,10 @@ conditions_to_generate: error_rate: 5 c18: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -167,10 +167,10 @@ conditions_to_generate: error_rate: 5 c19: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c20: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -211,10 +211,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-4/config/P800-4-cat2.yml b/experiments/selection/P800-4/config/P800-4-cat2.yml index 64224b7d..6cab5469 100644 --- a/experiments/selection/P800-4/config/P800-4-cat2.yml +++ b/experiments/selection/P800-4/config/P800-4-cat2.yml @@ -80,75 +80,75 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -156,10 +156,10 @@ conditions_to_generate: error_rate: 5 c18: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -167,10 +167,10 @@ conditions_to_generate: error_rate: 5 c19: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c20: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -211,10 +211,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-4/config/P800-4-cat3.yml b/experiments/selection/P800-4/config/P800-4-cat3.yml index abaebaac..fd071f99 100644 --- a/experiments/selection/P800-4/config/P800-4-cat3.yml +++ b/experiments/selection/P800-4/config/P800-4-cat3.yml @@ -80,75 +80,75 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -156,10 +156,10 @@ conditions_to_generate: error_rate: 5 c18: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -167,10 +167,10 @@ conditions_to_generate: error_rate: 5 c19: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c20: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -211,10 +211,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-4/config/P800-4-cat4.yml b/experiments/selection/P800-4/config/P800-4-cat4.yml index 5b28d3c6..a8e69a00 100644 --- a/experiments/selection/P800-4/config/P800-4-cat4.yml +++ b/experiments/selection/P800-4/config/P800-4-cat4.yml @@ -80,75 +80,75 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -156,10 +156,10 @@ conditions_to_generate: error_rate: 5 c18: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -167,10 +167,10 @@ conditions_to_generate: error_rate: 5 c19: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c20: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -211,10 +211,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-4/config/P800-4-cat5.yml b/experiments/selection/P800-4/config/P800-4-cat5.yml index 6d267937..3b3ff2b5 100644 --- a/experiments/selection/P800-4/config/P800-4-cat5.yml +++ b/experiments/selection/P800-4/config/P800-4-cat5.yml @@ -80,75 +80,75 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -156,10 +156,10 @@ conditions_to_generate: error_rate: 5 c18: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -167,10 +167,10 @@ conditions_to_generate: error_rate: 5 c19: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c20: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -211,10 +211,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-4/config/P800-4-cat6.yml b/experiments/selection/P800-4/config/P800-4-cat6.yml index 84e38e9c..2d071a37 100644 --- a/experiments/selection/P800-4/config/P800-4-cat6.yml +++ b/experiments/selection/P800-4/config/P800-4-cat6.yml @@ -80,75 +80,75 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -156,10 +156,10 @@ conditions_to_generate: error_rate: 5 c18: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -167,10 +167,10 @@ conditions_to_generate: error_rate: 5 c19: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c20: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -211,10 +211,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-5/config/P800-5-cat1.yml b/experiments/selection/P800-5/config/P800-5-cat1.yml index 03c07bbf..d886f0d6 100644 --- a/experiments/selection/P800-5/config/P800-5-cat1.yml +++ b/experiments/selection/P800-5/config/P800-5-cat1.yml @@ -80,122 +80,122 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c18: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-5/config/P800-5-cat2.yml b/experiments/selection/P800-5/config/P800-5-cat2.yml index 465db76d..0a487e79 100644 --- a/experiments/selection/P800-5/config/P800-5-cat2.yml +++ b/experiments/selection/P800-5/config/P800-5-cat2.yml @@ -80,122 +80,122 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c18: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-5/config/P800-5-cat3.yml b/experiments/selection/P800-5/config/P800-5-cat3.yml index 832c47c1..b36a6cfb 100644 --- a/experiments/selection/P800-5/config/P800-5-cat3.yml +++ b/experiments/selection/P800-5/config/P800-5-cat3.yml @@ -80,122 +80,122 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c18: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-5/config/P800-5-cat4.yml b/experiments/selection/P800-5/config/P800-5-cat4.yml index b308075d..812db776 100644 --- a/experiments/selection/P800-5/config/P800-5-cat4.yml +++ b/experiments/selection/P800-5/config/P800-5-cat4.yml @@ -80,122 +80,122 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c18: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-5/config/P800-5-cat5.yml b/experiments/selection/P800-5/config/P800-5-cat5.yml index 41a8377c..92f8bf5c 100644 --- a/experiments/selection/P800-5/config/P800-5-cat5.yml +++ b/experiments/selection/P800-5/config/P800-5-cat5.yml @@ -80,122 +80,122 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c18: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-5/config/P800-5-cat6.yml b/experiments/selection/P800-5/config/P800-5-cat6.yml index b2d3ac8b..a1db50c7 100644 --- a/experiments/selection/P800-5/config/P800-5-cat6.yml +++ b/experiments/selection/P800-5/config/P800-5-cat6.yml @@ -80,122 +80,122 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c16: type: evs - sba_fmt: "FOA" bitrates: - 32000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c17: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c18: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 13200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-8/config/P800-8-cat1.yml b/experiments/selection/P800-8/config/P800-8-cat1.yml index 42f258c1..81a89b53 100644 --- a/experiments/selection/P800-8/config/P800-8-cat1.yml +++ b/experiments/selection/P800-8/config/P800-8-cat1.yml @@ -77,50 +77,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: @@ -166,10 +166,10 @@ conditions_to_generate: c20: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: tx: @@ -177,10 +177,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -188,10 +188,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -199,10 +199,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -213,6 +213,7 @@ conditions_to_generate: bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-8/config/P800-8-cat2.yml b/experiments/selection/P800-8/config/P800-8-cat2.yml index b6d73aa8..e9aa8544 100644 --- a/experiments/selection/P800-8/config/P800-8-cat2.yml +++ b/experiments/selection/P800-8/config/P800-8-cat2.yml @@ -78,50 +78,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: @@ -167,10 +167,10 @@ conditions_to_generate: c20: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -214,6 +214,7 @@ conditions_to_generate: bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-8/config/P800-8-cat3.yml b/experiments/selection/P800-8/config/P800-8-cat3.yml index cfcb54e0..64961169 100644 --- a/experiments/selection/P800-8/config/P800-8-cat3.yml +++ b/experiments/selection/P800-8/config/P800-8-cat3.yml @@ -78,50 +78,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: @@ -167,10 +167,10 @@ conditions_to_generate: c20: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -214,6 +214,7 @@ conditions_to_generate: bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-8/config/P800-8-cat4.yml b/experiments/selection/P800-8/config/P800-8-cat4.yml index 5e5bff47..4c4c5429 100644 --- a/experiments/selection/P800-8/config/P800-8-cat4.yml +++ b/experiments/selection/P800-8/config/P800-8-cat4.yml @@ -78,50 +78,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: @@ -167,10 +167,10 @@ conditions_to_generate: c20: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -214,6 +214,7 @@ conditions_to_generate: bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-8/config/P800-8-cat5.yml b/experiments/selection/P800-8/config/P800-8-cat5.yml index d7507008..3ab95d39 100644 --- a/experiments/selection/P800-8/config/P800-8-cat5.yml +++ b/experiments/selection/P800-8/config/P800-8-cat5.yml @@ -78,50 +78,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: @@ -167,10 +167,10 @@ conditions_to_generate: c20: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -214,6 +214,7 @@ conditions_to_generate: bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-8/config/P800-8-cat6.yml b/experiments/selection/P800-8/config/P800-8-cat6.yml index e6e0c93f..d903c7ed 100644 --- a/experiments/selection/P800-8/config/P800-8-cat6.yml +++ b/experiments/selection/P800-8/config/P800-8-cat6.yml @@ -78,50 +78,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c15: @@ -167,10 +167,10 @@ conditions_to_generate: c20: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: tx: @@ -178,10 +178,10 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -189,10 +189,10 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -200,10 +200,10 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: @@ -214,6 +214,7 @@ conditions_to_generate: bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: tx: diff --git a/experiments/selection/P800-9/config/P800-9-cat1.yml b/experiments/selection/P800-9/config/P800-9-cat1.yml index 69ab33fc..6c1e483a 100644 --- a/experiments/selection/P800-9/config/P800-9-cat1.yml +++ b/experiments/selection/P800-9/config/P800-9-cat1.yml @@ -77,50 +77,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: @@ -151,50 +151,50 @@ conditions_to_generate: c18: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-9/config/P800-9-cat2.yml b/experiments/selection/P800-9/config/P800-9-cat2.yml index ca5dbe53..f18ca640 100644 --- a/experiments/selection/P800-9/config/P800-9-cat2.yml +++ b/experiments/selection/P800-9/config/P800-9-cat2.yml @@ -77,50 +77,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: @@ -151,50 +151,50 @@ conditions_to_generate: c18: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-9/config/P800-9-cat3.yml b/experiments/selection/P800-9/config/P800-9-cat3.yml index 0ad4bc91..5df21adc 100644 --- a/experiments/selection/P800-9/config/P800-9-cat3.yml +++ b/experiments/selection/P800-9/config/P800-9-cat3.yml @@ -77,50 +77,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: @@ -151,50 +151,50 @@ conditions_to_generate: c18: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-9/config/P800-9-cat4.yml b/experiments/selection/P800-9/config/P800-9-cat4.yml index 84ad08a9..eebf2f4e 100644 --- a/experiments/selection/P800-9/config/P800-9-cat4.yml +++ b/experiments/selection/P800-9/config/P800-9-cat4.yml @@ -77,50 +77,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: @@ -151,50 +151,50 @@ conditions_to_generate: c18: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-9/config/P800-9-cat5.yml b/experiments/selection/P800-9/config/P800-9-cat5.yml index 8b08bacb..b5b9e6c3 100644 --- a/experiments/selection/P800-9/config/P800-9-cat5.yml +++ b/experiments/selection/P800-9/config/P800-9-cat5.yml @@ -77,50 +77,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: @@ -151,50 +151,50 @@ conditions_to_generate: c18: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: diff --git a/experiments/selection/P800-9/config/P800-9-cat6.yml b/experiments/selection/P800-9/config/P800-9-cat6.yml index 138dc708..94be0bbd 100644 --- a/experiments/selection/P800-9/config/P800-9-cat6.yml +++ b/experiments/selection/P800-9/config/P800-9-cat6.yml @@ -77,50 +77,50 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-max_band", "FB"] dec: c10: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c11: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c12: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c13: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: c14: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-max_band", "FB"] dec: @@ -151,50 +151,50 @@ conditions_to_generate: c18: type: evs - sba_fmt: "PLANARFOA" bitrates: - 7200 cod: + fmt: "PLANARFOA" opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs - sba_fmt: "FOA" bitrates: - 7200 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs - sba_fmt: "FOA" bitrates: - 8000 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs - sba_fmt: "FOA" bitrates: - 9600 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs - sba_fmt: "FOA" bitrates: - 16400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs - sba_fmt: "FOA" bitrates: - 24400 cod: + fmt: "FOA" opts: ["-dtx", "-max_band", "FB"] dec: -- GitLab From 4a280a57458e6cffb75efb024968c1bb92ffbe9d Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 31 May 2023 15:24:33 +0200 Subject: [PATCH 5/6] apply formatter --- ivas_processing_scripts/processing/evs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ivas_processing_scripts/processing/evs.py b/ivas_processing_scripts/processing/evs.py index 793150b4..d646e7a9 100755 --- a/ivas_processing_scripts/processing/evs.py +++ b/ivas_processing_scripts/processing/evs.py @@ -174,7 +174,9 @@ class EVS(Processing): self.out_fs = self.in_fs # flag for zeroing of channels for planar SBA formats - is_planar = isinstance(self.in_fmt, audio.SceneBasedAudio) and self.in_fmt.is_planar + is_planar = ( + isinstance(self.in_fmt, audio.SceneBasedAudio) and self.in_fmt.is_planar + ) # Split the channels to prepare for multi-mono coding split_chan_files = [ -- GitLab From 8fb96614ac6a634887bb2e3bf484215572a492d1 Mon Sep 17 00:00:00 2001 From: knj Date: Thu, 1 Jun 2023 10:07:44 +0200 Subject: [PATCH 6/6] use postprocessing instead of preprocessing --- ivas_processing_scripts/processing/chains.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ivas_processing_scripts/processing/chains.py b/ivas_processing_scripts/processing/chains.py index 040fd303..c25dd062 100755 --- a/ivas_processing_scripts/processing/chains.py +++ b/ivas_processing_scripts/processing/chains.py @@ -307,7 +307,7 @@ def get_processing_chain( # if the encoding format differs from the format after the preprocessing, add format conversion stuff if (cod_fmt := cod_cfg.get("fmt", tmp_in_fmt)) != tmp_in_fmt: chain["processes"].append( - Preprocessing( + Postprocessing( { "in_fs": tmp_in_fs, "in_fmt": tmp_in_fmt, @@ -393,7 +393,7 @@ def get_processing_chain( # if the encoding format differs from the format after the preprocessing, add format conversion stuff if (cod_fmt := cod_cfg.get("fmt", tmp_in_fmt)) != tmp_in_fmt: chain["processes"].append( - Preprocessing( + Postprocessing( { "in_fs": tmp_in_fs, "in_fmt": tmp_in_fmt, -- GitLab