diff --git a/README.md b/README.md index 3a74688dd51693742ede87c986aeef93cb9cd3bf..16553978c5a951c99a0469fa0b2ed0ff3e6b2d3c 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 37ca8024e498b26ea6dc42bc803ea0bcc7125aa6..c6490c8fab25738975074acd5bcade0130753b05 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/BS1534-4a/config/BS1534-4a.yml b/experiments/selection/BS1534-4a/config/BS1534-4a.yml index c668e106f7df9d0f38b868747977aac77042b541..cd7d05db6c900a1faa88eca5e795006f9392745c 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 9a7b5788f3ea3032cc25189b241a7ccbc6a2bad7..ac770a32cfa03d9d64e73570b3c5ae01e8a58a91 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 68430de55cae9f30b0a7d10f51d73aa5db3d3383..e9e48f8b898fdb838167a6b8e062245adf08a995 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 5575e50de27d87f94681d8f404b10890e22ecf1e..eeb4c4dd2da3fb6a90ea491e171ff0c71b4ac568 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 af306c40b23b3be197f8b66e9cce142f9c19a1bb..d48a900ec4a73922a4d3f1dbb2f2b0160a74a5d7 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 a146020be48f90b287362ebe4839dc0d62e60ff3..de93f64d2d9266f936c584076cfe56a930d9a396 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_format: "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: diff --git a/ivas_processing_scripts/processing/chains.py b/ivas_processing_scripts/processing/chains.py index f62c696a406fe019aefbb28e9343152ec51380d7..e65c0b5e71e0ea8874723f37c41a1807060fef4f 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 d70e15aecd6397502e9847ab2409adae3703c1d6..d828b6e29b06c61c8dcd23bf93127534d1792d16 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 679e57c4d988efff4ebbd88eb48080e25a3bda4e..da6bfe2251935afddef095823ec7cd01facac209 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