From f0a33da833c2b266c7b308014513f8d2ee5e6c5c Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 17 May 2023 16:28:56 +0200 Subject: [PATCH 1/2] rename sba_format to sba_fmt --- README.md | 4 ++-- examples/TEMPLATE.yml | 2 +- experiments/selection/P800-5/config/P800-5.yml | 2 +- ivas_processing_scripts/processing/chains.py | 4 ++-- ivas_processing_scripts/processing/evs.py | 2 +- tests/data/test_SBA.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3a74688d..16553978 100755 --- a/README.md +++ b/README.md @@ -400,7 +400,7 @@ conditions_to_generate: ### Decoder output sampling rate; default = null (same as input) # fs: 48000 ### Option to use SBA format of lower or same order (planar also possible) for SBA input formats - # sba_format: "PLANARFOA" + # sba_fmt: "PLANARFOA" ``` @@ -474,7 +474,7 @@ For the encoding stage `cod` and the decoding stage `dec`, the path to the IVAS_ Additionally some resampling can be applied by using the key `fs` followed by the desired sampling rate. The general bitstream processing configuration can be locally overwritten for each EVS and IVAS condition with the key `tx`. The additional key `evs_lfe_9k6bps_nb` is only available for EVS conditions and ensures a bitrate of 9.6kbps and narrow band processing of the LFE channel(s). -Also only available for EVS conditions is the `sba_format` key where a SBA format of lower order than the input can be specified for SBA input formats. +Also only available for EVS conditions is the `sba_fmt` key where a SBA format of lower order than the input can be specified for SBA input formats. #### IVAS The configuration of the IVAS condition is similar to the EVS condition. However, only one bitrate for all channels (and metadata) can be specified. In addition to that, the encoder and decoder take some additional arguments defined by the key `opts`. diff --git a/examples/TEMPLATE.yml b/examples/TEMPLATE.yml index 37ca8024..c6490c8f 100755 --- a/examples/TEMPLATE.yml +++ b/examples/TEMPLATE.yml @@ -270,7 +270,7 @@ conditions_to_generate: # tx: ### For possible arguments see overall bitstream modification ### Option to use SBA format of lower or same order (planar also possible) for SBA input formats - # sba_format: "PLANARFOA" + # sba_fmt: "PLANARFOA" ################################################ ### Post-processing diff --git a/experiments/selection/P800-5/config/P800-5.yml b/experiments/selection/P800-5/config/P800-5.yml index a146020b..71e5b7c0 100644 --- a/experiments/selection/P800-5/config/P800-5.yml +++ b/experiments/selection/P800-5/config/P800-5.yml @@ -81,7 +81,7 @@ conditions_to_generate: - 7200 cod: opts: ["-max_band", "FB"] - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" c10: type: evs bitrates: diff --git a/ivas_processing_scripts/processing/chains.py b/ivas_processing_scripts/processing/chains.py index f62c696a..e65c0b5e 100755 --- a/ivas_processing_scripts/processing/chains.py +++ b/ivas_processing_scripts/processing/chains.py @@ -320,13 +320,13 @@ def get_processing_chain( "tx": tx_cfg, "preamble": preamble, "evs_lfe_9k6bps_nb": evs_lfe_9k6bps_nb, - "sba_format": cond_cfg.get("sba_format", tmp_in_fmt), + "sba_fmt": cond_cfg.get("sba_fmt", tmp_in_fmt), } ) ) # update values to reflect decoder output tmp_in_fs = dec_cfg.get("fs", tmp_in_fs) - tmp_in_fmt = cond_cfg.get("sba_format", cfg.input["fmt"]) + tmp_in_fmt = cond_cfg.get("sba_fmt", cfg.input["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 d70e15ae..d828b6e2 100755 --- a/ivas_processing_scripts/processing/evs.py +++ b/ivas_processing_scripts/processing/evs.py @@ -168,7 +168,7 @@ class EVS(Processing): self.out_fs = self.in_fs # consider SBA format for condition - condition_fmt = audio.fromtype(self.sba_format) + 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 diff --git a/tests/data/test_SBA.yml b/tests/data/test_SBA.yml index 679e57c4..da6bfe22 100644 --- a/tests/data/test_SBA.yml +++ b/tests/data/test_SBA.yml @@ -265,7 +265,7 @@ conditions_to_generate: ### For possible arguments see overall bitstream modification type: "JBM" error_profile: 3 - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" ################################################ ### Post-processing -- GitLab From e2c147d1136f8c780f9a32e33346f01adaf8b726 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 17 May 2023 16:30:47 +0200 Subject: [PATCH 2/2] add sba_fmt to config-files, in order to have a proper FOA config for EVS --- .../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 | 6 +++--- experiments/selection/P800-4/config/P800-4.yml | 14 ++++++++++++++ experiments/selection/P800-5/config/P800-5.yml | 15 ++++++++++++++- 6 files changed, 40 insertions(+), 13 deletions(-) diff --git a/experiments/selection/BS1534-4a/config/BS1534-4a.yml b/experiments/selection/BS1534-4a/config/BS1534-4a.yml index c668e106..cd7d05db 100644 --- a/experiments/selection/BS1534-4a/config/BS1534-4a.yml +++ b/experiments/selection/BS1534-4a/config/BS1534-4a.yml @@ -51,26 +51,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 9a7b5788..ac770a32 100644 --- a/experiments/selection/BS1534-4b/config/BS1534-4b.yml +++ b/experiments/selection/BS1534-4b/config/BS1534-4b.yml @@ -51,26 +51,26 @@ conditions_to_generate: ### EVS condition ################################ c03: type: evs + sba_fmt: "FOA" bitrates: - 24400 cod: - fmt: "HOA2" opts: ["-max_band", "FB"] dec: c04: type: evs + sba_fmt: "FOA" bitrates: - 32000 cod: - fmt: "HOA2" opts: ["-max_band", "FB"] dec: c05: type: evs + sba_fmt: "FOA" bitrates: - 48000 cod: - fmt: "HOA2" 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 68430de5..e9e48f8b 100644 --- a/experiments/selection/BS1534-5a/config/BS1534-5a.yml +++ b/experiments/selection/BS1534-5a/config/BS1534-5a.yml @@ -51,26 +51,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 5575e50d..eeb4c4dd 100644 --- a/experiments/selection/BS1534-5b/config/BS1534-5b.yml +++ b/experiments/selection/BS1534-5b/config/BS1534-5b.yml @@ -51,26 +51,26 @@ 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: c05: type: evs + sba_fmt: "FOA" bitrates: - 96000 cod: - fmt: "FOA" opts: ["-max_band", "FB"] dec: diff --git a/experiments/selection/P800-4/config/P800-4.yml b/experiments/selection/P800-4/config/P800-4.yml index af306c40..d48a900e 100644 --- a/experiments/selection/P800-4/config/P800-4.yml +++ b/experiments/selection/P800-4/config/P800-4.yml @@ -72,6 +72,7 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -79,6 +80,7 @@ conditions_to_generate: dec: c10: type: evs + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -86,6 +88,7 @@ conditions_to_generate: dec: c11: type: evs + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -93,6 +96,7 @@ conditions_to_generate: dec: c12: type: evs + sba_fmt: "FOA" bitrates: - 13200 cod: @@ -100,6 +104,7 @@ conditions_to_generate: dec: c13: type: evs + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -107,6 +112,7 @@ conditions_to_generate: dec: c14: type: evs + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -114,6 +120,7 @@ conditions_to_generate: dec: c15: type: evs + sba_fmt: "FOA" bitrates: - 32000 cod: @@ -121,6 +128,7 @@ conditions_to_generate: dec: c16: type: evs + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -131,6 +139,7 @@ conditions_to_generate: error_rate: 5 c17: type: evs + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -141,6 +150,7 @@ conditions_to_generate: error_rate: 5 c18: type: evs + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -151,6 +161,7 @@ conditions_to_generate: error_rate: 5 c19: type: evs + sba_fmt: "FOA" bitrates: - 13200 cod: @@ -161,6 +172,7 @@ conditions_to_generate: error_rate: 5 c20: type: evs + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -171,6 +183,7 @@ conditions_to_generate: error_rate: 5 c21: type: evs + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -181,6 +194,7 @@ conditions_to_generate: error_rate: 5 c22: type: evs + sba_fmt: "FOA" bitrates: - 32000 cod: diff --git a/experiments/selection/P800-5/config/P800-5.yml b/experiments/selection/P800-5/config/P800-5.yml index 71e5b7c0..de93f64d 100644 --- a/experiments/selection/P800-5/config/P800-5.yml +++ b/experiments/selection/P800-5/config/P800-5.yml @@ -77,13 +77,14 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] - sba_fmt: "PLANARFOA" c10: type: evs + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -91,6 +92,7 @@ conditions_to_generate: dec: c11: type: evs + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -98,6 +100,7 @@ conditions_to_generate: dec: c12: type: evs + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -105,6 +108,7 @@ conditions_to_generate: dec: c13: type: evs + sba_fmt: "FOA" bitrates: - 13200 cod: @@ -112,6 +116,7 @@ conditions_to_generate: dec: c14: type: evs + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -119,6 +124,7 @@ conditions_to_generate: dec: c15: type: evs + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -126,6 +132,7 @@ conditions_to_generate: dec: c16: type: evs + sba_fmt: "FOA" bitrates: - 32000 cod: @@ -133,6 +140,7 @@ conditions_to_generate: dec: c17: type: evs + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -140,6 +148,7 @@ conditions_to_generate: dec: c18: type: evs + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -147,6 +156,7 @@ conditions_to_generate: dec: c19: type: evs + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -154,6 +164,7 @@ conditions_to_generate: dec: c20: type: evs + sba_fmt: "FOA" bitrates: - 13200 cod: @@ -161,6 +172,7 @@ conditions_to_generate: dec: c21: type: evs + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -168,6 +180,7 @@ conditions_to_generate: dec: c22: type: evs + sba_fmt: "FOA" bitrates: - 24400 cod: -- GitLab