diff --git a/experiments/selection/BS1534-4a/config/BS1534-4a.yml b/experiments/selection/BS1534-4a/config/BS1534-4a.yml index 9da29696a1bb73cb798003e466450ec0cbca304e..917482b6ee3fe0ce814daba5f457fcb5ebc9e125 100644 --- a/experiments/selection/BS1534-4a/config/BS1534-4a.yml +++ b/experiments/selection/BS1534-4a/config/BS1534-4a.yml @@ -52,52 +52,52 @@ 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: ### 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 fb6d37f86b2e729414a473e7082d99efa540cf04..a549c07dcb83b4b7054ba034a24494b471cce1f9 100644 --- a/experiments/selection/BS1534-4b/config/BS1534-4b.yml +++ b/experiments/selection/BS1534-4b/config/BS1534-4b.yml @@ -52,44 +52,44 @@ 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: ### 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/experiments/selection/BS1534-5a/config/BS1534-5a.yml b/experiments/selection/BS1534-5a/config/BS1534-5a.yml index 2055da7c221bb55d9889d104654b4a72c7f63121..8ac50c057d45ebc0146a416612d5d57a2f9c3062 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 3702d6444c8e44f3876164248486cb403c371c38..50ca255304d181812bfd22d56aae9dce51afe33e 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 5ec17e3616a1d2ea3950cb6a438c6370d54d1dcf..4dfb1de7b76d799444d9dd2f819a5da2ae34b662 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 64224b7d2c8709462f01478ab585f47912ef94bd..6cab546921a3b6c72b6ff389c15d13f7151d318f 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 abaebaac5703322c6f23b8033018d5a091dc9cfc..fd071f99d0171616940fa5f26b78ce27eccaf422 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 5b28d3c6fdefe9d1e4d25fb1440ed6488e58392a..a8e69a007573b0285bdacd47dd24599b627c6d86 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 6d2679375cb55117d944bb5cca0fa436ed17810c..3b3ff2b525e474b316c080598b75baa9c743fc06 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 84e38e9cdde93d1ac430ae1f3ad11ee558420ecd..2d071a37fab21a160d4f6320699af73c6fd5ac24 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 03c07bbf13967d36c4126d37e0031e52041336a9..d886f0d6ad8c314da7d6bb8e0f691bac115f8c65 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 465db76de7c4a483c244f0efb3de1ec92cbc92fc..0a487e79e3ccfe73befde95c3f7cf9360e1ae29f 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 832c47c16eecf4dcf756dda19f5effde06aae3d8..b36a6cfba26a617984fb4dc4f5ad46632e2be0ce 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 b308075d8144d93eb401aa1f36cf3e348b64d536..812db776533304af49da4854ec3c9b19a065ceb4 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 41a8377c5c9193db2b0ce29ce7cc43151d2971e3..92f8bf5c9a4254e045f7a3f366b526b71deb9e2c 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 b2d3ac8bdda50c31dfa2851ee0ae7fe0d35084f6..a1db50c7cceea7a6dc648d1bfc403f84df448c01 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 42f258c117fecc5eebcb9d45cbeb59431f4e8895..81a89b537e621b11f8133c1e99916df78e7229d3 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 b6d73aa8887bc0c192197d8d5a99e61b9af6aa34..e9aa85440b589e1085780c70cab4fffdc2849f7c 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 cfcb54e0a186f90af3b35376f6aea45ba40ef898..6496116966e09091a593d3a744fd82ae7e107bdc 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 5e5bff478c8d555fe27fd4b648246ecc8af4b958..4c4c5429ccacb756fc51b173f36b3cac4311af10 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 d7507008a09795cb217c0af36088961f1d2490e9..3ab95d39e5000f22d87f04b9eb9ac5ab6304005a 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 e6e0c93fde588239e39b4dcadf7e23ff30c2b71e..d903c7ed556607772b45823740afd51c454d78b0 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 69ab33fccff5af43d57f9689e58b3ec46d5d3a86..6c1e483aa877bdb85671001d4292be6396a54f67 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 ca5dbe53f17acb811ece9476a612184e6826d184..f18ca64084d00d205409a1b01182f8f196852733 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 0ad4bc91b3209632ded5e561ac435b790d3295cc..5df21adc3e021f9cf3e519bca7793f85933723e7 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 84ad08a9e8fe2ae05ec42516ded029018e2292f0..eebf2f4e773efc7b16952f25ea3c26d1debed619 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 8b08bacbd1133bb216eacdf465debb90bd47fc7d..b5b9e6c3894abbdbb76d6dfe6cf8b0ee73c840e6 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 138dc708572c2e55959e8a9a0be4a53213352844..94be0bbd0994c8c271aca68e435817d5e970e9c7 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: diff --git a/ivas_processing_scripts/processing/chains.py b/ivas_processing_scripts/processing/chains.py index 3371c87fe28932471898b12526614dde43bdb7a9..c25dd06208eec9b482ca06dfa7e71704e09e1ec4 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 @@ -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, @@ -334,34 +334,17 @@ 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"] 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) @@ -410,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, diff --git a/ivas_processing_scripts/processing/evs.py b/ivas_processing_scripts/processing/evs.py index eb3cd929fe25c3d96ac3aa6d671563499afb8c95..d646e7a9e46042195f18332d37cce593a749cd45 100755 --- a/ivas_processing_scripts/processing/evs.py +++ b/ivas_processing_scripts/processing/evs.py @@ -173,31 +173,21 @@ 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 +242,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) diff --git a/ivas_processing_scripts/processing/ivas.py b/ivas_processing_scripts/processing/ivas.py index 3580df082e123ea3cda9398b616d953c988cee8c..fc7d756d554dbd7f332462c79a028b253c4f382a 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) diff --git a/tests/test_experiments.py b/tests/test_experiments.py index 8fe4bba279d69cb24a32314a5fab08bb9b97f7e3..a022e43d8f92ae2d2527d09888453ef21b22d1d3 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(