From babff28cea0fe8fb6839b2cd060a3cc1883bf5e5 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 10:29:13 +0200 Subject: [PATCH 01/22] update P800-1 configs --- .../selection/P800-1/config/P800-1-cat1.yml | 45 +++++++++++++------ .../selection/P800-1/config/P800-1-cat2.yml | 45 +++++++++++++------ .../selection/P800-1/config/P800-1-cat3.yml | 45 +++++++++++++------ .../selection/P800-1/config/P800-1-cat4.yml | 45 +++++++++++++------ .../selection/P800-1/config/P800-1-cat5.yml | 45 +++++++++++++------ .../selection/P800-1/config/P800-1-cat6.yml | 45 +++++++++++++------ 6 files changed, 192 insertions(+), 78 deletions(-) diff --git a/experiments/selection/P800-1/config/P800-1-cat1.yml b/experiments/selection/P800-1/config/P800-1-cat1.yml index 9328f516..af8e8e34 100644 --- a/experiments/selection/P800-1/config/P800-1-cat1.yml +++ b/experiments/selection/P800-1/config/P800-1-cat1.yml @@ -120,6 +120,7 @@ conditions_to_generate: cod: opts: ["-max_band", "SWB"] dec: + c16: type: evs bitrates: @@ -191,8 +192,26 @@ conditions_to_generate: type: "FER" error_rate: 5 - ### IVAS condition ############################### c23: + type: evs + bitrates: + - 13200 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + c24: + type: evs + bitrates: + - 8000 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + tx: + type: "FER" + error_rate: 5 + + ### IVAS condition ############################### + c25: type: ivas bitrates: - 13200 @@ -200,7 +219,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c26: type: ivas bitrates: - 16400 @@ -208,7 +227,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c27: type: ivas bitrates: - 24400 @@ -216,7 +235,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c28: type: ivas bitrates: - 32000 @@ -224,7 +243,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c29: type: ivas bitrates: - 48000 @@ -232,7 +251,8 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + + c30: type: ivas bitrates: - 13200 @@ -243,7 +263,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -254,7 +274,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -265,7 +285,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -276,7 +296,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -288,7 +308,7 @@ conditions_to_generate: type: "FER" error_rate: 5 - c33: + c35: type: ivas bitrates: - 24400 @@ -296,8 +316,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - - c34: + c36: type: ivas bitrates: - 13200 diff --git a/experiments/selection/P800-1/config/P800-1-cat2.yml b/experiments/selection/P800-1/config/P800-1-cat2.yml index 36ff7694..f917f7e2 100644 --- a/experiments/selection/P800-1/config/P800-1-cat2.yml +++ b/experiments/selection/P800-1/config/P800-1-cat2.yml @@ -119,6 +119,7 @@ conditions_to_generate: cod: opts: ["-max_band", "SWB"] dec: + c16: type: evs bitrates: @@ -190,8 +191,26 @@ conditions_to_generate: type: "FER" error_rate: 5 - ### IVAS condition ############################### c23: + type: evs + bitrates: + - 13200 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + c24: + type: evs + bitrates: + - 8000 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + tx: + type: "FER" + error_rate: 5 + + ### IVAS condition ############################### + c25: type: ivas bitrates: - 13200 @@ -199,7 +218,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c26: type: ivas bitrates: - 16400 @@ -207,7 +226,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c27: type: ivas bitrates: - 24400 @@ -215,7 +234,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c28: type: ivas bitrates: - 32000 @@ -223,7 +242,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c29: type: ivas bitrates: - 48000 @@ -231,7 +250,8 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + + c30: type: ivas bitrates: - 13200 @@ -242,7 +262,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -253,7 +273,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -264,7 +284,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -275,7 +295,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -287,7 +307,7 @@ conditions_to_generate: type: "FER" error_rate: 5 - c33: + c35: type: ivas bitrates: - 24400 @@ -295,8 +315,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - - c34: + c36: type: ivas bitrates: - 13200 diff --git a/experiments/selection/P800-1/config/P800-1-cat3.yml b/experiments/selection/P800-1/config/P800-1-cat3.yml index 82073c22..3f0d7754 100644 --- a/experiments/selection/P800-1/config/P800-1-cat3.yml +++ b/experiments/selection/P800-1/config/P800-1-cat3.yml @@ -119,6 +119,7 @@ conditions_to_generate: cod: opts: ["-max_band", "SWB"] dec: + c16: type: evs bitrates: @@ -190,8 +191,26 @@ conditions_to_generate: type: "FER" error_rate: 5 - ### IVAS condition ############################### c23: + type: evs + bitrates: + - 13200 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + c24: + type: evs + bitrates: + - 8000 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + tx: + type: "FER" + error_rate: 5 + + ### IVAS condition ############################### + c25: type: ivas bitrates: - 13200 @@ -199,7 +218,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c26: type: ivas bitrates: - 16400 @@ -207,7 +226,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c27: type: ivas bitrates: - 24400 @@ -215,7 +234,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c28: type: ivas bitrates: - 32000 @@ -223,7 +242,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c29: type: ivas bitrates: - 48000 @@ -231,7 +250,8 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + + c30: type: ivas bitrates: - 13200 @@ -242,7 +262,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -253,7 +273,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -264,7 +284,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -275,7 +295,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -287,7 +307,7 @@ conditions_to_generate: type: "FER" error_rate: 5 - c33: + c35: type: ivas bitrates: - 24400 @@ -295,8 +315,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - - c34: + c36: type: ivas bitrates: - 13200 diff --git a/experiments/selection/P800-1/config/P800-1-cat4.yml b/experiments/selection/P800-1/config/P800-1-cat4.yml index 833568f2..92e14190 100644 --- a/experiments/selection/P800-1/config/P800-1-cat4.yml +++ b/experiments/selection/P800-1/config/P800-1-cat4.yml @@ -119,6 +119,7 @@ conditions_to_generate: cod: opts: ["-max_band", "SWB"] dec: + c16: type: evs bitrates: @@ -190,8 +191,26 @@ conditions_to_generate: type: "FER" error_rate: 5 - ### IVAS condition ############################### c23: + type: evs + bitrates: + - 13200 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + c24: + type: evs + bitrates: + - 8000 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + tx: + type: "FER" + error_rate: 5 + + ### IVAS condition ############################### + c25: type: ivas bitrates: - 13200 @@ -199,7 +218,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c26: type: ivas bitrates: - 16400 @@ -207,7 +226,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c27: type: ivas bitrates: - 24400 @@ -215,7 +234,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c28: type: ivas bitrates: - 32000 @@ -223,7 +242,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c29: type: ivas bitrates: - 48000 @@ -231,7 +250,8 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + + c30: type: ivas bitrates: - 13200 @@ -242,7 +262,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -253,7 +273,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -264,7 +284,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -275,7 +295,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -287,7 +307,7 @@ conditions_to_generate: type: "FER" error_rate: 5 - c33: + c35: type: ivas bitrates: - 24400 @@ -295,8 +315,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - - c34: + c36: type: ivas bitrates: - 13200 diff --git a/experiments/selection/P800-1/config/P800-1-cat5.yml b/experiments/selection/P800-1/config/P800-1-cat5.yml index 5ecf94b8..3a34bd80 100644 --- a/experiments/selection/P800-1/config/P800-1-cat5.yml +++ b/experiments/selection/P800-1/config/P800-1-cat5.yml @@ -119,6 +119,7 @@ conditions_to_generate: cod: opts: ["-max_band", "SWB"] dec: + c16: type: evs bitrates: @@ -190,8 +191,26 @@ conditions_to_generate: type: "FER" error_rate: 5 - ### IVAS condition ############################### c23: + type: evs + bitrates: + - 13200 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + c24: + type: evs + bitrates: + - 8000 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + tx: + type: "FER" + error_rate: 5 + + ### IVAS condition ############################### + c25: type: ivas bitrates: - 13200 @@ -199,7 +218,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c26: type: ivas bitrates: - 16400 @@ -207,7 +226,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c27: type: ivas bitrates: - 24400 @@ -215,7 +234,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c28: type: ivas bitrates: - 32000 @@ -223,7 +242,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c29: type: ivas bitrates: - 48000 @@ -231,7 +250,8 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + + c30: type: ivas bitrates: - 13200 @@ -242,7 +262,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -253,7 +273,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -264,7 +284,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -275,7 +295,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -287,7 +307,7 @@ conditions_to_generate: type: "FER" error_rate: 5 - c33: + c35: type: ivas bitrates: - 24400 @@ -295,8 +315,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - - c34: + c36: type: ivas bitrates: - 13200 diff --git a/experiments/selection/P800-1/config/P800-1-cat6.yml b/experiments/selection/P800-1/config/P800-1-cat6.yml index bd0c8007..b3e293d4 100644 --- a/experiments/selection/P800-1/config/P800-1-cat6.yml +++ b/experiments/selection/P800-1/config/P800-1-cat6.yml @@ -119,6 +119,7 @@ conditions_to_generate: cod: opts: ["-max_band", "SWB"] dec: + c16: type: evs bitrates: @@ -190,8 +191,26 @@ conditions_to_generate: type: "FER" error_rate: 5 - ### IVAS condition ############################### c23: + type: evs + bitrates: + - 13200 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + c24: + type: evs + bitrates: + - 8000 + cod: + opts: ["-dtx", "-max_band", "SWB"] + dec: + tx: + type: "FER" + error_rate: 5 + + ### IVAS condition ############################### + c25: type: ivas bitrates: - 13200 @@ -199,7 +218,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c26: type: ivas bitrates: - 16400 @@ -207,7 +226,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c27: type: ivas bitrates: - 24400 @@ -215,7 +234,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c28: type: ivas bitrates: - 32000 @@ -223,7 +242,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c29: type: ivas bitrates: - 48000 @@ -231,7 +250,8 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + + c30: type: ivas bitrates: - 13200 @@ -242,7 +262,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -253,7 +273,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -264,7 +284,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -275,7 +295,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -287,7 +307,7 @@ conditions_to_generate: type: "FER" error_rate: 5 - c33: + c35: type: ivas bitrates: - 24400 @@ -295,8 +315,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - - c34: + c36: type: ivas bitrates: - 13200 -- GitLab From f3298695b4bda18ed51ace3a1e18c10590b5e5d2 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 10:36:29 +0200 Subject: [PATCH 02/22] adapt P800-2 --- .../selection/P800-2/config/P800-2-cat1.yml | 83 ++++++++++++------- .../selection/P800-2/config/P800-2-cat2.yml | 83 ++++++++++++------- .../selection/P800-2/config/P800-2-cat3.yml | 83 ++++++++++++------- .../selection/P800-2/config/P800-2-cat4.yml | 83 ++++++++++++------- .../selection/P800-2/config/P800-2-cat5.yml | 83 ++++++++++++------- .../selection/P800-2/config/P800-2-cat6.yml | 83 ++++++++++++------- 6 files changed, 312 insertions(+), 186 deletions(-) diff --git a/experiments/selection/P800-2/config/P800-2-cat1.yml b/experiments/selection/P800-2/config/P800-2-cat1.yml index fe85d7df..1b0fdbfb 100644 --- a/experiments/selection/P800-2/config/P800-2-cat1.yml +++ b/experiments/selection/P800-2/config/P800-2-cat1.yml @@ -57,119 +57,132 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 32 c03: type: mnru - q: 24 + q: 27 c04: type: mnru - q: 20 + q: 22 c05: type: mnru - q: 16 + q: 17 c06: - type: esdru - alpha: 0.7 + type: mnru + q: 12 c07: type: esdru - alpha: 0.4 + alpha: 0.7 c08: + type: esdru + alpha: 0.5 + c09: + type: esdru + alpha: 0.3 + c10: type: esdru alpha: 0.1 ### EVS condition ################################ - c09: + c11: type: evs bitrates: - 7200 cod: opts: ["-max_band", "SWB"] dec: - c10: + c12: type: evs bitrates: - 8000 cod: opts: ["-max_band", "SWB"] dec: - c11: + c13: type: evs bitrates: - 9600 cod: opts: ["-max_band", "SWB"] dec: - c12: + c14: type: evs bitrates: - 13200 cod: opts: ["-max_band", "SWB"] dec: - c13: + c15: type: evs bitrates: - 16400 cod: opts: ["-max_band", "SWB"] dec: - c14: + c16: type: evs bitrates: - 24400 cod: opts: ["-max_band", "SWB"] dec: - c15: + c17: type: evs bitrates: - 32000 cod: opts: ["-max_band", "SWB"] dec: - c16: + c18: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "SWB"] + dec: + c19: type: evs bitrates: - 7200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c17: + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c18: + c21: type: evs bitrates: - 9600 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c19: + c22: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c20: + c23: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c21: + c24: type: evs bitrates: - 24400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c22: + c25: type: evs bitrates: - 32000 @@ -178,7 +191,7 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c26: type: ivas bitrates: - 13200 @@ -186,7 +199,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c27: type: ivas bitrates: - 16400 @@ -194,7 +207,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c28: type: ivas bitrates: - 24400 @@ -202,7 +215,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c29: type: ivas bitrates: - 32000 @@ -210,7 +223,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c30: type: ivas bitrates: - 48000 @@ -218,7 +231,15 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + c31: + type: ivas + bitrates: + - 64000 + cod: + opts: ["-max_band", "SWB"] + dec: + fmt: "STEREO" + c32: type: ivas bitrates: - 13200 @@ -226,7 +247,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c29: + c33: type: ivas bitrates: - 16400 @@ -234,7 +255,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c30: + c34: type: ivas bitrates: - 24400 @@ -242,7 +263,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c31: + c35: type: ivas bitrates: - 32000 @@ -250,7 +271,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c32: + c36: type: ivas bitrates: - 48000 diff --git a/experiments/selection/P800-2/config/P800-2-cat2.yml b/experiments/selection/P800-2/config/P800-2-cat2.yml index 6bf6ce55..edb22a77 100644 --- a/experiments/selection/P800-2/config/P800-2-cat2.yml +++ b/experiments/selection/P800-2/config/P800-2-cat2.yml @@ -55,119 +55,132 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 32 c03: type: mnru - q: 24 + q: 27 c04: type: mnru - q: 20 + q: 22 c05: type: mnru - q: 16 + q: 17 c06: - type: esdru - alpha: 0.7 + type: mnru + q: 12 c07: type: esdru - alpha: 0.4 + alpha: 0.7 c08: + type: esdru + alpha: 0.5 + c09: + type: esdru + alpha: 0.3 + c10: type: esdru alpha: 0.1 ### EVS condition ################################ - c09: + c11: type: evs bitrates: - 7200 cod: opts: ["-max_band", "SWB"] dec: - c10: + c12: type: evs bitrates: - 8000 cod: opts: ["-max_band", "SWB"] dec: - c11: + c13: type: evs bitrates: - 9600 cod: opts: ["-max_band", "SWB"] dec: - c12: + c14: type: evs bitrates: - 13200 cod: opts: ["-max_band", "SWB"] dec: - c13: + c15: type: evs bitrates: - 16400 cod: opts: ["-max_band", "SWB"] dec: - c14: + c16: type: evs bitrates: - 24400 cod: opts: ["-max_band", "SWB"] dec: - c15: + c17: type: evs bitrates: - 32000 cod: opts: ["-max_band", "SWB"] dec: - c16: + c18: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "SWB"] + dec: + c19: type: evs bitrates: - 7200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c17: + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c18: + c21: type: evs bitrates: - 9600 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c19: + c22: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c20: + c23: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c21: + c24: type: evs bitrates: - 24400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c22: + c25: type: evs bitrates: - 32000 @@ -176,7 +189,7 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c26: type: ivas bitrates: - 13200 @@ -184,7 +197,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c27: type: ivas bitrates: - 16400 @@ -192,7 +205,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c28: type: ivas bitrates: - 24400 @@ -200,7 +213,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c29: type: ivas bitrates: - 32000 @@ -208,7 +221,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c30: type: ivas bitrates: - 48000 @@ -216,7 +229,15 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + c31: + type: ivas + bitrates: + - 64000 + cod: + opts: ["-max_band", "SWB"] + dec: + fmt: "STEREO" + c32: type: ivas bitrates: - 13200 @@ -224,7 +245,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c29: + c33: type: ivas bitrates: - 16400 @@ -232,7 +253,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c30: + c34: type: ivas bitrates: - 24400 @@ -240,7 +261,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c31: + c35: type: ivas bitrates: - 32000 @@ -248,7 +269,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c32: + c36: type: ivas bitrates: - 48000 diff --git a/experiments/selection/P800-2/config/P800-2-cat3.yml b/experiments/selection/P800-2/config/P800-2-cat3.yml index 50f1ad5e..1ba06715 100644 --- a/experiments/selection/P800-2/config/P800-2-cat3.yml +++ b/experiments/selection/P800-2/config/P800-2-cat3.yml @@ -55,119 +55,132 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 32 c03: type: mnru - q: 24 + q: 27 c04: type: mnru - q: 20 + q: 22 c05: type: mnru - q: 16 + q: 17 c06: - type: esdru - alpha: 0.7 + type: mnru + q: 12 c07: type: esdru - alpha: 0.4 + alpha: 0.7 c08: + type: esdru + alpha: 0.5 + c09: + type: esdru + alpha: 0.3 + c10: type: esdru alpha: 0.1 ### EVS condition ################################ - c09: + c11: type: evs bitrates: - 7200 cod: opts: ["-max_band", "SWB"] dec: - c10: + c12: type: evs bitrates: - 8000 cod: opts: ["-max_band", "SWB"] dec: - c11: + c13: type: evs bitrates: - 9600 cod: opts: ["-max_band", "SWB"] dec: - c12: + c14: type: evs bitrates: - 13200 cod: opts: ["-max_band", "SWB"] dec: - c13: + c15: type: evs bitrates: - 16400 cod: opts: ["-max_band", "SWB"] dec: - c14: + c16: type: evs bitrates: - 24400 cod: opts: ["-max_band", "SWB"] dec: - c15: + c17: type: evs bitrates: - 32000 cod: opts: ["-max_band", "SWB"] dec: - c16: + c18: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "SWB"] + dec: + c19: type: evs bitrates: - 7200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c17: + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c18: + c21: type: evs bitrates: - 9600 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c19: + c22: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c20: + c23: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c21: + c24: type: evs bitrates: - 24400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c22: + c25: type: evs bitrates: - 32000 @@ -176,7 +189,7 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c26: type: ivas bitrates: - 13200 @@ -184,7 +197,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c27: type: ivas bitrates: - 16400 @@ -192,7 +205,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c28: type: ivas bitrates: - 24400 @@ -200,7 +213,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c29: type: ivas bitrates: - 32000 @@ -208,7 +221,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c30: type: ivas bitrates: - 48000 @@ -216,7 +229,15 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + c31: + type: ivas + bitrates: + - 64000 + cod: + opts: ["-max_band", "SWB"] + dec: + fmt: "STEREO" + c32: type: ivas bitrates: - 13200 @@ -224,7 +245,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c29: + c33: type: ivas bitrates: - 16400 @@ -232,7 +253,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c30: + c34: type: ivas bitrates: - 24400 @@ -240,7 +261,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c31: + c35: type: ivas bitrates: - 32000 @@ -248,7 +269,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c32: + c36: type: ivas bitrates: - 48000 diff --git a/experiments/selection/P800-2/config/P800-2-cat4.yml b/experiments/selection/P800-2/config/P800-2-cat4.yml index 76fadb71..7ab8a425 100644 --- a/experiments/selection/P800-2/config/P800-2-cat4.yml +++ b/experiments/selection/P800-2/config/P800-2-cat4.yml @@ -55,119 +55,132 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 32 c03: type: mnru - q: 24 + q: 27 c04: type: mnru - q: 20 + q: 22 c05: type: mnru - q: 16 + q: 17 c06: - type: esdru - alpha: 0.7 + type: mnru + q: 12 c07: type: esdru - alpha: 0.4 + alpha: 0.7 c08: + type: esdru + alpha: 0.5 + c09: + type: esdru + alpha: 0.3 + c10: type: esdru alpha: 0.1 ### EVS condition ################################ - c09: + c11: type: evs bitrates: - 7200 cod: opts: ["-max_band", "SWB"] dec: - c10: + c12: type: evs bitrates: - 8000 cod: opts: ["-max_band", "SWB"] dec: - c11: + c13: type: evs bitrates: - 9600 cod: opts: ["-max_band", "SWB"] dec: - c12: + c14: type: evs bitrates: - 13200 cod: opts: ["-max_band", "SWB"] dec: - c13: + c15: type: evs bitrates: - 16400 cod: opts: ["-max_band", "SWB"] dec: - c14: + c16: type: evs bitrates: - 24400 cod: opts: ["-max_band", "SWB"] dec: - c15: + c17: type: evs bitrates: - 32000 cod: opts: ["-max_band", "SWB"] dec: - c16: + c18: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "SWB"] + dec: + c19: type: evs bitrates: - 7200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c17: + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c18: + c21: type: evs bitrates: - 9600 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c19: + c22: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c20: + c23: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c21: + c24: type: evs bitrates: - 24400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c22: + c25: type: evs bitrates: - 32000 @@ -176,7 +189,7 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c26: type: ivas bitrates: - 13200 @@ -184,7 +197,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c27: type: ivas bitrates: - 16400 @@ -192,7 +205,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c28: type: ivas bitrates: - 24400 @@ -200,7 +213,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c29: type: ivas bitrates: - 32000 @@ -208,7 +221,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c30: type: ivas bitrates: - 48000 @@ -216,7 +229,15 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + c31: + type: ivas + bitrates: + - 64000 + cod: + opts: ["-max_band", "SWB"] + dec: + fmt: "STEREO" + c32: type: ivas bitrates: - 13200 @@ -224,7 +245,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c29: + c33: type: ivas bitrates: - 16400 @@ -232,7 +253,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c30: + c34: type: ivas bitrates: - 24400 @@ -240,7 +261,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c31: + c35: type: ivas bitrates: - 32000 @@ -248,7 +269,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c32: + c36: type: ivas bitrates: - 48000 diff --git a/experiments/selection/P800-2/config/P800-2-cat5.yml b/experiments/selection/P800-2/config/P800-2-cat5.yml index 868417e0..51cadd20 100644 --- a/experiments/selection/P800-2/config/P800-2-cat5.yml +++ b/experiments/selection/P800-2/config/P800-2-cat5.yml @@ -55,119 +55,132 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 32 c03: type: mnru - q: 24 + q: 27 c04: type: mnru - q: 20 + q: 22 c05: type: mnru - q: 16 + q: 17 c06: - type: esdru - alpha: 0.7 + type: mnru + q: 12 c07: type: esdru - alpha: 0.4 + alpha: 0.7 c08: + type: esdru + alpha: 0.5 + c09: + type: esdru + alpha: 0.3 + c10: type: esdru alpha: 0.1 ### EVS condition ################################ - c09: + c11: type: evs bitrates: - 7200 cod: opts: ["-max_band", "SWB"] dec: - c10: + c12: type: evs bitrates: - 8000 cod: opts: ["-max_band", "SWB"] dec: - c11: + c13: type: evs bitrates: - 9600 cod: opts: ["-max_band", "SWB"] dec: - c12: + c14: type: evs bitrates: - 13200 cod: opts: ["-max_band", "SWB"] dec: - c13: + c15: type: evs bitrates: - 16400 cod: opts: ["-max_band", "SWB"] dec: - c14: + c16: type: evs bitrates: - 24400 cod: opts: ["-max_band", "SWB"] dec: - c15: + c17: type: evs bitrates: - 32000 cod: opts: ["-max_band", "SWB"] dec: - c16: + c18: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "SWB"] + dec: + c19: type: evs bitrates: - 7200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c17: + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c18: + c21: type: evs bitrates: - 9600 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c19: + c22: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c20: + c23: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c21: + c24: type: evs bitrates: - 24400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c22: + c25: type: evs bitrates: - 32000 @@ -176,7 +189,7 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c26: type: ivas bitrates: - 13200 @@ -184,7 +197,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c27: type: ivas bitrates: - 16400 @@ -192,7 +205,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c28: type: ivas bitrates: - 24400 @@ -200,7 +213,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c29: type: ivas bitrates: - 32000 @@ -208,7 +221,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c30: type: ivas bitrates: - 48000 @@ -216,7 +229,15 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + c31: + type: ivas + bitrates: + - 64000 + cod: + opts: ["-max_band", "SWB"] + dec: + fmt: "STEREO" + c32: type: ivas bitrates: - 13200 @@ -224,7 +245,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c29: + c33: type: ivas bitrates: - 16400 @@ -232,7 +253,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c30: + c34: type: ivas bitrates: - 24400 @@ -240,7 +261,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c31: + c35: type: ivas bitrates: - 32000 @@ -248,7 +269,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c32: + c36: type: ivas bitrates: - 48000 diff --git a/experiments/selection/P800-2/config/P800-2-cat6.yml b/experiments/selection/P800-2/config/P800-2-cat6.yml index d06e0ed5..66f745c8 100644 --- a/experiments/selection/P800-2/config/P800-2-cat6.yml +++ b/experiments/selection/P800-2/config/P800-2-cat6.yml @@ -55,119 +55,132 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 32 c03: type: mnru - q: 24 + q: 27 c04: type: mnru - q: 20 + q: 22 c05: type: mnru - q: 16 + q: 17 c06: - type: esdru - alpha: 0.7 + type: mnru + q: 12 c07: type: esdru - alpha: 0.4 + alpha: 0.7 c08: + type: esdru + alpha: 0.5 + c09: + type: esdru + alpha: 0.3 + c10: type: esdru alpha: 0.1 ### EVS condition ################################ - c09: + c11: type: evs bitrates: - 7200 cod: opts: ["-max_band", "SWB"] dec: - c10: + c12: type: evs bitrates: - 8000 cod: opts: ["-max_band", "SWB"] dec: - c11: + c13: type: evs bitrates: - 9600 cod: opts: ["-max_band", "SWB"] dec: - c12: + c14: type: evs bitrates: - 13200 cod: opts: ["-max_band", "SWB"] dec: - c13: + c15: type: evs bitrates: - 16400 cod: opts: ["-max_band", "SWB"] dec: - c14: + c16: type: evs bitrates: - 24400 cod: opts: ["-max_band", "SWB"] dec: - c15: + c17: type: evs bitrates: - 32000 cod: opts: ["-max_band", "SWB"] dec: - c16: + c18: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "SWB"] + dec: + c19: type: evs bitrates: - 7200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c17: + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c18: + c21: type: evs bitrates: - 9600 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c19: + c22: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c20: + c23: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c21: + c24: type: evs bitrates: - 24400 cod: opts: ["-dtx", "-max_band", "SWB"] dec: - c22: + c25: type: evs bitrates: - 32000 @@ -176,7 +189,7 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c26: type: ivas bitrates: - 13200 @@ -184,7 +197,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c24: + c27: type: ivas bitrates: - 16400 @@ -192,7 +205,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c25: + c28: type: ivas bitrates: - 24400 @@ -200,7 +213,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c26: + c29: type: ivas bitrates: - 32000 @@ -208,7 +221,7 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c27: + c30: type: ivas bitrates: - 48000 @@ -216,7 +229,15 @@ conditions_to_generate: opts: ["-max_band", "SWB"] dec: fmt: "STEREO" - c28: + c31: + type: ivas + bitrates: + - 64000 + cod: + opts: ["-max_band", "SWB"] + dec: + fmt: "STEREO" + c32: type: ivas bitrates: - 13200 @@ -224,7 +245,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c29: + c33: type: ivas bitrates: - 16400 @@ -232,7 +253,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c30: + c34: type: ivas bitrates: - 24400 @@ -240,7 +261,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c31: + c35: type: ivas bitrates: - 32000 @@ -248,7 +269,7 @@ conditions_to_generate: opts: ["-dtx", "-max_band", "SWB"] dec: fmt: "STEREO" - c32: + c36: type: ivas bitrates: - 48000 -- GitLab From 34be3794e49267d0afe9de310ed670031a01eb15 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 10:43:57 +0200 Subject: [PATCH 03/22] adapt P800-3 --- .../selection/P800-3/config/P800-3-cat1.yml | 58 ++++++++++++------- .../selection/P800-3/config/P800-3-cat2.yml | 58 ++++++++++++------- .../selection/P800-3/config/P800-3-cat3.yml | 58 ++++++++++++------- .../selection/P800-3/config/P800-3-cat4.yml | 58 ++++++++++++------- .../selection/P800-3/config/P800-3-cat5.yml | 58 ++++++++++++------- .../selection/P800-3/config/P800-3-cat6.yml | 58 ++++++++++++------- 6 files changed, 222 insertions(+), 126 deletions(-) diff --git a/experiments/selection/P800-3/config/P800-3-cat1.yml b/experiments/selection/P800-3/config/P800-3-cat1.yml index bd5e5dcf..a5b5c284 100644 --- a/experiments/selection/P800-3/config/P800-3-cat1.yml +++ b/experiments/selection/P800-3/config/P800-3-cat1.yml @@ -48,10 +48,10 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 27 c03: type: mnru - q: 23 + q: 22 c04: type: mnru q: 17 @@ -119,6 +119,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c16: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 7200 @@ -128,7 +136,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 8000 @@ -138,7 +146,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 9600 @@ -148,7 +156,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs bitrates: - 13200 @@ -158,7 +166,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs bitrates: - 16400 @@ -168,7 +176,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs bitrates: - 24400 @@ -178,7 +186,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs bitrates: - 32000 @@ -190,42 +198,50 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "STEREO" - c24: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "STEREO" - c25: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "STEREO" - c26: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "STEREO" - c27: + c28: type: ivas bitrates: - 48000 cod: dec: fmt: "STEREO" - c28: + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "STEREO" + + c30: type: ivas bitrates: - 13200 @@ -235,7 +251,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -245,7 +261,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -255,7 +271,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -265,7 +281,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -275,8 +291,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - - c33: + + c35: type: ivas bitrates: - 24400 @@ -285,7 +301,7 @@ conditions_to_generate: dec: fmt: "STEREO" - c34: + c36: type: ivas bitrates: - 13200 diff --git a/experiments/selection/P800-3/config/P800-3-cat2.yml b/experiments/selection/P800-3/config/P800-3-cat2.yml index 1b7cb18d..64b1cd46 100644 --- a/experiments/selection/P800-3/config/P800-3-cat2.yml +++ b/experiments/selection/P800-3/config/P800-3-cat2.yml @@ -47,10 +47,10 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 27 c03: type: mnru - q: 23 + q: 22 c04: type: mnru q: 17 @@ -118,6 +118,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c16: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 7200 @@ -127,7 +135,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 8000 @@ -137,7 +145,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 9600 @@ -147,7 +155,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs bitrates: - 13200 @@ -157,7 +165,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs bitrates: - 16400 @@ -167,7 +175,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs bitrates: - 24400 @@ -177,7 +185,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs bitrates: - 32000 @@ -189,42 +197,50 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "STEREO" - c24: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "STEREO" - c25: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "STEREO" - c26: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "STEREO" - c27: + c28: type: ivas bitrates: - 48000 cod: dec: fmt: "STEREO" - c28: + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "STEREO" + + c30: type: ivas bitrates: - 13200 @@ -234,7 +250,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -244,7 +260,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -254,7 +270,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -264,7 +280,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -274,8 +290,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - - c33: + + c35: type: ivas bitrates: - 24400 @@ -284,7 +300,7 @@ conditions_to_generate: dec: fmt: "STEREO" - c34: + c36: type: ivas bitrates: - 13200 diff --git a/experiments/selection/P800-3/config/P800-3-cat3.yml b/experiments/selection/P800-3/config/P800-3-cat3.yml index 5fd2d0c8..d7aee34d 100644 --- a/experiments/selection/P800-3/config/P800-3-cat3.yml +++ b/experiments/selection/P800-3/config/P800-3-cat3.yml @@ -47,10 +47,10 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 27 c03: type: mnru - q: 23 + q: 22 c04: type: mnru q: 17 @@ -118,6 +118,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c16: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 7200 @@ -127,7 +135,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 8000 @@ -137,7 +145,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 9600 @@ -147,7 +155,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs bitrates: - 13200 @@ -157,7 +165,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs bitrates: - 16400 @@ -167,7 +175,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs bitrates: - 24400 @@ -177,7 +185,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs bitrates: - 32000 @@ -189,42 +197,50 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "STEREO" - c24: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "STEREO" - c25: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "STEREO" - c26: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "STEREO" - c27: + c28: type: ivas bitrates: - 48000 cod: dec: fmt: "STEREO" - c28: + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "STEREO" + + c30: type: ivas bitrates: - 13200 @@ -234,7 +250,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -244,7 +260,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -254,7 +270,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -264,7 +280,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -274,8 +290,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - - c33: + + c35: type: ivas bitrates: - 24400 @@ -284,7 +300,7 @@ conditions_to_generate: dec: fmt: "STEREO" - c34: + c36: type: ivas bitrates: - 13200 diff --git a/experiments/selection/P800-3/config/P800-3-cat4.yml b/experiments/selection/P800-3/config/P800-3-cat4.yml index 274fd2cb..ae2b91d0 100644 --- a/experiments/selection/P800-3/config/P800-3-cat4.yml +++ b/experiments/selection/P800-3/config/P800-3-cat4.yml @@ -47,10 +47,10 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 27 c03: type: mnru - q: 23 + q: 22 c04: type: mnru q: 17 @@ -118,6 +118,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c16: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 7200 @@ -127,7 +135,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 8000 @@ -137,7 +145,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 9600 @@ -147,7 +155,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs bitrates: - 13200 @@ -157,7 +165,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs bitrates: - 16400 @@ -167,7 +175,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs bitrates: - 24400 @@ -177,7 +185,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs bitrates: - 32000 @@ -189,42 +197,50 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "STEREO" - c24: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "STEREO" - c25: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "STEREO" - c26: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "STEREO" - c27: + c28: type: ivas bitrates: - 48000 cod: dec: fmt: "STEREO" - c28: + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "STEREO" + + c30: type: ivas bitrates: - 13200 @@ -234,7 +250,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -244,7 +260,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -254,7 +270,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -264,7 +280,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -274,8 +290,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - - c33: + + c35: type: ivas bitrates: - 24400 @@ -284,7 +300,7 @@ conditions_to_generate: dec: fmt: "STEREO" - c34: + c36: type: ivas bitrates: - 13200 diff --git a/experiments/selection/P800-3/config/P800-3-cat5.yml b/experiments/selection/P800-3/config/P800-3-cat5.yml index 8280b767..a922d2d1 100644 --- a/experiments/selection/P800-3/config/P800-3-cat5.yml +++ b/experiments/selection/P800-3/config/P800-3-cat5.yml @@ -47,10 +47,10 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 27 c03: type: mnru - q: 23 + q: 22 c04: type: mnru q: 17 @@ -118,6 +118,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c16: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 7200 @@ -127,7 +135,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 8000 @@ -137,7 +145,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 9600 @@ -147,7 +155,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs bitrates: - 13200 @@ -157,7 +165,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs bitrates: - 16400 @@ -167,7 +175,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs bitrates: - 24400 @@ -177,7 +185,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs bitrates: - 32000 @@ -189,42 +197,50 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "STEREO" - c24: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "STEREO" - c25: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "STEREO" - c26: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "STEREO" - c27: + c28: type: ivas bitrates: - 48000 cod: dec: fmt: "STEREO" - c28: + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "STEREO" + + c30: type: ivas bitrates: - 13200 @@ -234,7 +250,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -244,7 +260,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -254,7 +270,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -264,7 +280,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -274,8 +290,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - - c33: + + c35: type: ivas bitrates: - 24400 @@ -284,7 +300,7 @@ conditions_to_generate: dec: fmt: "STEREO" - c34: + c36: type: ivas bitrates: - 13200 diff --git a/experiments/selection/P800-3/config/P800-3-cat6.yml b/experiments/selection/P800-3/config/P800-3-cat6.yml index c8014701..3479ad06 100644 --- a/experiments/selection/P800-3/config/P800-3-cat6.yml +++ b/experiments/selection/P800-3/config/P800-3-cat6.yml @@ -47,10 +47,10 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 27 c03: type: mnru - q: 23 + q: 22 c04: type: mnru q: 17 @@ -118,6 +118,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c16: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 7200 @@ -127,7 +135,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 8000 @@ -137,7 +145,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 9600 @@ -147,7 +155,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs bitrates: - 13200 @@ -157,7 +165,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs bitrates: - 16400 @@ -167,7 +175,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs bitrates: - 24400 @@ -177,7 +185,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs bitrates: - 32000 @@ -189,42 +197,50 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "STEREO" - c24: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "STEREO" - c25: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "STEREO" - c26: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "STEREO" - c27: + c28: type: ivas bitrates: - 48000 cod: dec: fmt: "STEREO" - c28: + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "STEREO" + + c30: type: ivas bitrates: - 13200 @@ -234,7 +250,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 16400 @@ -244,7 +260,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 24400 @@ -254,7 +270,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + c33: type: ivas bitrates: - 32000 @@ -264,7 +280,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c32: + c34: type: ivas bitrates: - 48000 @@ -274,8 +290,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - - c33: + + c35: type: ivas bitrates: - 24400 @@ -284,7 +300,7 @@ conditions_to_generate: dec: fmt: "STEREO" - c34: + c36: type: ivas bitrates: - 13200 -- GitLab From c6081b755aa70410db986cb787e4a618f0ef33be Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 10:49:14 +0200 Subject: [PATCH 04/22] adapt P800-4 --- .../selection/P800-4/config/P800-4-cat1.yml | 66 +++++++++---------- .../selection/P800-4/config/P800-4-cat2.yml | 66 +++++++++---------- .../selection/P800-4/config/P800-4-cat3.yml | 66 +++++++++---------- .../selection/P800-4/config/P800-4-cat4.yml | 66 +++++++++---------- .../selection/P800-4/config/P800-4-cat5.yml | 66 +++++++++---------- .../selection/P800-4/config/P800-4-cat6.yml | 66 +++++++++---------- 6 files changed, 198 insertions(+), 198 deletions(-) diff --git a/experiments/selection/P800-4/config/P800-4-cat1.yml b/experiments/selection/P800-4/config/P800-4-cat1.yml index 9705a5f2..efb62c8f 100644 --- a/experiments/selection/P800-4/config/P800-4-cat1.yml +++ b/experiments/selection/P800-4/config/P800-4-cat1.yml @@ -55,13 +55,13 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 @@ -75,7 +75,7 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -85,7 +85,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-max_band", "FB"] dec: @@ -93,7 +93,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-max_band", "FB"] dec: @@ -101,7 +101,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-max_band", "FB"] dec: @@ -109,7 +109,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-max_band", "FB"] dec: @@ -117,7 +117,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-max_band", "FB"] dec: @@ -125,11 +125,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 32000 + - 24400 cod: opts: ["-max_band", "FB"] dec: c16: + type: evs + sba_fmt: "FOA" + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs sba_fmt: "FOA" bitrates: @@ -140,7 +149,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs sba_fmt: "FOA" bitrates: @@ -151,7 +160,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs sba_fmt: "FOA" bitrates: @@ -162,7 +171,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs sba_fmt: "FOA" bitrates: @@ -173,7 +182,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs sba_fmt: "FOA" bitrates: @@ -184,7 +193,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs sba_fmt: "FOA" bitrates: @@ -195,7 +204,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs sba_fmt: "FOA" bitrates: @@ -208,65 +217,56 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" c24: type: ivas bitrates: - - 24400 + - 16400 cod: dec: fmt: "FOA" c25: type: ivas bitrates: - - 32000 + - 24400 cod: dec: fmt: "FOA" c26: type: ivas bitrates: - - 48000 + - 32000 cod: dec: fmt: "FOA" c27: type: ivas bitrates: - - 64000 + - 48000 cod: dec: fmt: "FOA" c28: type: ivas bitrates: - - 80000 + - 64000 cod: dec: fmt: "FOA" c29: type: ivas bitrates: - - 96000 + - 80000 cod: dec: fmt: "FOA" c30: type: ivas bitrates: - - 16400 + - 96000 cod: dec: fmt: "FOA" - tx: - type: "FER" - error_rate: 5 + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-4/config/P800-4-cat2.yml b/experiments/selection/P800-4/config/P800-4-cat2.yml index 0cae6429..1639f9c5 100644 --- a/experiments/selection/P800-4/config/P800-4-cat2.yml +++ b/experiments/selection/P800-4/config/P800-4-cat2.yml @@ -53,13 +53,13 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 @@ -73,7 +73,7 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -83,7 +83,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-max_band", "FB"] dec: @@ -91,7 +91,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-max_band", "FB"] dec: @@ -99,7 +99,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-max_band", "FB"] dec: @@ -107,7 +107,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-max_band", "FB"] dec: @@ -115,7 +115,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-max_band", "FB"] dec: @@ -123,11 +123,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 32000 + - 24400 cod: opts: ["-max_band", "FB"] dec: c16: + type: evs + sba_fmt: "FOA" + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs sba_fmt: "FOA" bitrates: @@ -138,7 +147,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs sba_fmt: "FOA" bitrates: @@ -149,7 +158,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs sba_fmt: "FOA" bitrates: @@ -160,7 +169,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs sba_fmt: "FOA" bitrates: @@ -171,7 +180,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs sba_fmt: "FOA" bitrates: @@ -182,7 +191,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs sba_fmt: "FOA" bitrates: @@ -193,7 +202,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs sba_fmt: "FOA" bitrates: @@ -206,65 +215,56 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" c24: type: ivas bitrates: - - 24400 + - 16400 cod: dec: fmt: "FOA" c25: type: ivas bitrates: - - 32000 + - 24400 cod: dec: fmt: "FOA" c26: type: ivas bitrates: - - 48000 + - 32000 cod: dec: fmt: "FOA" c27: type: ivas bitrates: - - 64000 + - 48000 cod: dec: fmt: "FOA" c28: type: ivas bitrates: - - 80000 + - 64000 cod: dec: fmt: "FOA" c29: type: ivas bitrates: - - 96000 + - 80000 cod: dec: fmt: "FOA" c30: type: ivas bitrates: - - 16400 + - 96000 cod: dec: fmt: "FOA" - tx: - type: "FER" - error_rate: 5 + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-4/config/P800-4-cat3.yml b/experiments/selection/P800-4/config/P800-4-cat3.yml index 7a5726ec..aa87e060 100644 --- a/experiments/selection/P800-4/config/P800-4-cat3.yml +++ b/experiments/selection/P800-4/config/P800-4-cat3.yml @@ -53,13 +53,13 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 @@ -73,7 +73,7 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -83,7 +83,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-max_band", "FB"] dec: @@ -91,7 +91,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-max_band", "FB"] dec: @@ -99,7 +99,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-max_band", "FB"] dec: @@ -107,7 +107,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-max_band", "FB"] dec: @@ -115,7 +115,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-max_band", "FB"] dec: @@ -123,11 +123,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 32000 + - 24400 cod: opts: ["-max_band", "FB"] dec: c16: + type: evs + sba_fmt: "FOA" + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs sba_fmt: "FOA" bitrates: @@ -138,7 +147,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs sba_fmt: "FOA" bitrates: @@ -149,7 +158,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs sba_fmt: "FOA" bitrates: @@ -160,7 +169,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs sba_fmt: "FOA" bitrates: @@ -171,7 +180,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs sba_fmt: "FOA" bitrates: @@ -182,7 +191,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs sba_fmt: "FOA" bitrates: @@ -193,7 +202,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs sba_fmt: "FOA" bitrates: @@ -206,65 +215,56 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" c24: type: ivas bitrates: - - 24400 + - 16400 cod: dec: fmt: "FOA" c25: type: ivas bitrates: - - 32000 + - 24400 cod: dec: fmt: "FOA" c26: type: ivas bitrates: - - 48000 + - 32000 cod: dec: fmt: "FOA" c27: type: ivas bitrates: - - 64000 + - 48000 cod: dec: fmt: "FOA" c28: type: ivas bitrates: - - 80000 + - 64000 cod: dec: fmt: "FOA" c29: type: ivas bitrates: - - 96000 + - 80000 cod: dec: fmt: "FOA" c30: type: ivas bitrates: - - 16400 + - 96000 cod: dec: fmt: "FOA" - tx: - type: "FER" - error_rate: 5 + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-4/config/P800-4-cat4.yml b/experiments/selection/P800-4/config/P800-4-cat4.yml index a4b0ee9b..9253e4b9 100644 --- a/experiments/selection/P800-4/config/P800-4-cat4.yml +++ b/experiments/selection/P800-4/config/P800-4-cat4.yml @@ -53,13 +53,13 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 @@ -73,7 +73,7 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -83,7 +83,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-max_band", "FB"] dec: @@ -91,7 +91,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-max_band", "FB"] dec: @@ -99,7 +99,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-max_band", "FB"] dec: @@ -107,7 +107,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-max_band", "FB"] dec: @@ -115,7 +115,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-max_band", "FB"] dec: @@ -123,11 +123,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 32000 + - 24400 cod: opts: ["-max_band", "FB"] dec: c16: + type: evs + sba_fmt: "FOA" + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs sba_fmt: "FOA" bitrates: @@ -138,7 +147,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs sba_fmt: "FOA" bitrates: @@ -149,7 +158,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs sba_fmt: "FOA" bitrates: @@ -160,7 +169,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs sba_fmt: "FOA" bitrates: @@ -171,7 +180,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs sba_fmt: "FOA" bitrates: @@ -182,7 +191,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs sba_fmt: "FOA" bitrates: @@ -193,7 +202,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs sba_fmt: "FOA" bitrates: @@ -206,65 +215,56 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" c24: type: ivas bitrates: - - 24400 + - 16400 cod: dec: fmt: "FOA" c25: type: ivas bitrates: - - 32000 + - 24400 cod: dec: fmt: "FOA" c26: type: ivas bitrates: - - 48000 + - 32000 cod: dec: fmt: "FOA" c27: type: ivas bitrates: - - 64000 + - 48000 cod: dec: fmt: "FOA" c28: type: ivas bitrates: - - 80000 + - 64000 cod: dec: fmt: "FOA" c29: type: ivas bitrates: - - 96000 + - 80000 cod: dec: fmt: "FOA" c30: type: ivas bitrates: - - 16400 + - 96000 cod: dec: fmt: "FOA" - tx: - type: "FER" - error_rate: 5 + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-4/config/P800-4-cat5.yml b/experiments/selection/P800-4/config/P800-4-cat5.yml index 3e895845..3062dfb6 100644 --- a/experiments/selection/P800-4/config/P800-4-cat5.yml +++ b/experiments/selection/P800-4/config/P800-4-cat5.yml @@ -53,13 +53,13 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 @@ -73,7 +73,7 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -83,7 +83,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-max_band", "FB"] dec: @@ -91,7 +91,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-max_band", "FB"] dec: @@ -99,7 +99,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-max_band", "FB"] dec: @@ -107,7 +107,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-max_band", "FB"] dec: @@ -115,7 +115,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-max_band", "FB"] dec: @@ -123,11 +123,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 32000 + - 24400 cod: opts: ["-max_band", "FB"] dec: c16: + type: evs + sba_fmt: "FOA" + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs sba_fmt: "FOA" bitrates: @@ -138,7 +147,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs sba_fmt: "FOA" bitrates: @@ -149,7 +158,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs sba_fmt: "FOA" bitrates: @@ -160,7 +169,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs sba_fmt: "FOA" bitrates: @@ -171,7 +180,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs sba_fmt: "FOA" bitrates: @@ -182,7 +191,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs sba_fmt: "FOA" bitrates: @@ -193,7 +202,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs sba_fmt: "FOA" bitrates: @@ -206,65 +215,56 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" c24: type: ivas bitrates: - - 24400 + - 16400 cod: dec: fmt: "FOA" c25: type: ivas bitrates: - - 32000 + - 24400 cod: dec: fmt: "FOA" c26: type: ivas bitrates: - - 48000 + - 32000 cod: dec: fmt: "FOA" c27: type: ivas bitrates: - - 64000 + - 48000 cod: dec: fmt: "FOA" c28: type: ivas bitrates: - - 80000 + - 64000 cod: dec: fmt: "FOA" c29: type: ivas bitrates: - - 96000 + - 80000 cod: dec: fmt: "FOA" c30: type: ivas bitrates: - - 16400 + - 96000 cod: dec: fmt: "FOA" - tx: - type: "FER" - error_rate: 5 + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-4/config/P800-4-cat6.yml b/experiments/selection/P800-4/config/P800-4-cat6.yml index 4ccbfe67..a390497e 100644 --- a/experiments/selection/P800-4/config/P800-4-cat6.yml +++ b/experiments/selection/P800-4/config/P800-4-cat6.yml @@ -53,13 +53,13 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 @@ -73,7 +73,7 @@ conditions_to_generate: ### EVS condition ################################ c09: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -83,7 +83,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-max_band", "FB"] dec: @@ -91,7 +91,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-max_band", "FB"] dec: @@ -99,7 +99,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-max_band", "FB"] dec: @@ -107,7 +107,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-max_band", "FB"] dec: @@ -115,7 +115,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-max_band", "FB"] dec: @@ -123,11 +123,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 32000 + - 24400 cod: opts: ["-max_band", "FB"] dec: c16: + type: evs + sba_fmt: "FOA" + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs sba_fmt: "FOA" bitrates: @@ -138,7 +147,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs sba_fmt: "FOA" bitrates: @@ -149,7 +158,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs sba_fmt: "FOA" bitrates: @@ -160,7 +169,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c19: + c20: type: evs sba_fmt: "FOA" bitrates: @@ -171,7 +180,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c20: + c21: type: evs sba_fmt: "FOA" bitrates: @@ -182,7 +191,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c21: + c22: type: evs sba_fmt: "FOA" bitrates: @@ -193,7 +202,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c22: + c23: type: evs sba_fmt: "FOA" bitrates: @@ -206,65 +215,56 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c23: - type: ivas - bitrates: - - 16400 - cod: - dec: - fmt: "FOA" c24: type: ivas bitrates: - - 24400 + - 16400 cod: dec: fmt: "FOA" c25: type: ivas bitrates: - - 32000 + - 24400 cod: dec: fmt: "FOA" c26: type: ivas bitrates: - - 48000 + - 32000 cod: dec: fmt: "FOA" c27: type: ivas bitrates: - - 64000 + - 48000 cod: dec: fmt: "FOA" c28: type: ivas bitrates: - - 80000 + - 64000 cod: dec: fmt: "FOA" c29: type: ivas bitrates: - - 96000 + - 80000 cod: dec: fmt: "FOA" c30: type: ivas bitrates: - - 16400 + - 96000 cod: dec: fmt: "FOA" - tx: - type: "FER" - error_rate: 5 + c31: type: ivas bitrates: -- GitLab From 4c8913459d76a061954809660f060d5828eff7e7 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 10:53:14 +0200 Subject: [PATCH 05/22] adapt P800-5 --- .../selection/P800-5/config/P800-5-cat1.yml | 39 ++++++++++--------- .../selection/P800-5/config/P800-5-cat2.yml | 39 ++++++++++--------- .../selection/P800-5/config/P800-5-cat3.yml | 39 ++++++++++--------- .../selection/P800-5/config/P800-5-cat4.yml | 39 ++++++++++--------- .../selection/P800-5/config/P800-5-cat5.yml | 39 ++++++++++--------- .../selection/P800-5/config/P800-5-cat6.yml | 39 ++++++++++--------- 6 files changed, 126 insertions(+), 108 deletions(-) diff --git a/experiments/selection/P800-5/config/P800-5-cat1.yml b/experiments/selection/P800-5/config/P800-5-cat1.yml index 5bba5143..f26f5c34 100644 --- a/experiments/selection/P800-5/config/P800-5-cat1.yml +++ b/experiments/selection/P800-5/config/P800-5-cat1.yml @@ -57,25 +57,25 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 29 c03: type: mnru - q: 24 + q: 25 c04: type: mnru - q: 20 + q: 21 c05: type: mnru - q: 16 + q: 17 c06: type: esdru - alpha: 0.7 + alpha: 0.8 c07: type: esdru - alpha: 0.4 + alpha: 0.6 c08: type: esdru - alpha: 0.1 + alpha: 0.4 ### EVS condition ################################ c09: @@ -141,9 +141,10 @@ conditions_to_generate: cod: opts: ["-max_band", "FB"] dec: + c17: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -153,7 +154,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -161,7 +162,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -169,7 +170,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -177,7 +178,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -185,19 +186,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - - ### IVAS condition ############################### c23: - type: ivas + type: evs + sba_fmt: "FOA" bitrates: - - 13200 + - 24400 cod: + opts: ["-dtx", "-max_band", "FB"] dec: - fmt: "FOA" + + ### IVAS condition ############################### c24: type: ivas bitrates: @@ -247,6 +249,7 @@ conditions_to_generate: cod: dec: fmt: "FOA" + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-5/config/P800-5-cat2.yml b/experiments/selection/P800-5/config/P800-5-cat2.yml index c7a8ec1e..f3c50a88 100644 --- a/experiments/selection/P800-5/config/P800-5-cat2.yml +++ b/experiments/selection/P800-5/config/P800-5-cat2.yml @@ -55,25 +55,25 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 29 c03: type: mnru - q: 24 + q: 25 c04: type: mnru - q: 20 + q: 21 c05: type: mnru - q: 16 + q: 17 c06: type: esdru - alpha: 0.7 + alpha: 0.8 c07: type: esdru - alpha: 0.4 + alpha: 0.6 c08: type: esdru - alpha: 0.1 + alpha: 0.4 ### EVS condition ################################ c09: @@ -139,9 +139,10 @@ conditions_to_generate: cod: opts: ["-max_band", "FB"] dec: + c17: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -151,7 +152,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -159,7 +160,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -167,7 +168,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -175,7 +176,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -183,19 +184,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - - ### IVAS condition ############################### c23: - type: ivas + type: evs + sba_fmt: "FOA" bitrates: - - 13200 + - 24400 cod: + opts: ["-dtx", "-max_band", "FB"] dec: - fmt: "FOA" + + ### IVAS condition ############################### c24: type: ivas bitrates: @@ -245,6 +247,7 @@ conditions_to_generate: cod: dec: fmt: "FOA" + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-5/config/P800-5-cat3.yml b/experiments/selection/P800-5/config/P800-5-cat3.yml index aa2b3ab1..60598cf2 100644 --- a/experiments/selection/P800-5/config/P800-5-cat3.yml +++ b/experiments/selection/P800-5/config/P800-5-cat3.yml @@ -55,25 +55,25 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 29 c03: type: mnru - q: 24 + q: 25 c04: type: mnru - q: 20 + q: 21 c05: type: mnru - q: 16 + q: 17 c06: type: esdru - alpha: 0.7 + alpha: 0.8 c07: type: esdru - alpha: 0.4 + alpha: 0.6 c08: type: esdru - alpha: 0.1 + alpha: 0.4 ### EVS condition ################################ c09: @@ -139,9 +139,10 @@ conditions_to_generate: cod: opts: ["-max_band", "FB"] dec: + c17: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -151,7 +152,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -159,7 +160,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -167,7 +168,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -175,7 +176,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -183,19 +184,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - - ### IVAS condition ############################### c23: - type: ivas + type: evs + sba_fmt: "FOA" bitrates: - - 13200 + - 24400 cod: + opts: ["-dtx", "-max_band", "FB"] dec: - fmt: "FOA" + + ### IVAS condition ############################### c24: type: ivas bitrates: @@ -245,6 +247,7 @@ conditions_to_generate: cod: dec: fmt: "FOA" + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-5/config/P800-5-cat4.yml b/experiments/selection/P800-5/config/P800-5-cat4.yml index da1b7186..a2033f3a 100644 --- a/experiments/selection/P800-5/config/P800-5-cat4.yml +++ b/experiments/selection/P800-5/config/P800-5-cat4.yml @@ -55,25 +55,25 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 29 c03: type: mnru - q: 24 + q: 25 c04: type: mnru - q: 20 + q: 21 c05: type: mnru - q: 16 + q: 17 c06: type: esdru - alpha: 0.7 + alpha: 0.8 c07: type: esdru - alpha: 0.4 + alpha: 0.6 c08: type: esdru - alpha: 0.1 + alpha: 0.4 ### EVS condition ################################ c09: @@ -139,9 +139,10 @@ conditions_to_generate: cod: opts: ["-max_band", "FB"] dec: + c17: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -151,7 +152,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -159,7 +160,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -167,7 +168,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -175,7 +176,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -183,19 +184,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - - ### IVAS condition ############################### c23: - type: ivas + type: evs + sba_fmt: "FOA" bitrates: - - 13200 + - 24400 cod: + opts: ["-dtx", "-max_band", "FB"] dec: - fmt: "FOA" + + ### IVAS condition ############################### c24: type: ivas bitrates: @@ -245,6 +247,7 @@ conditions_to_generate: cod: dec: fmt: "FOA" + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-5/config/P800-5-cat5.yml b/experiments/selection/P800-5/config/P800-5-cat5.yml index 219e2e5b..609657f7 100644 --- a/experiments/selection/P800-5/config/P800-5-cat5.yml +++ b/experiments/selection/P800-5/config/P800-5-cat5.yml @@ -55,25 +55,25 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 29 c03: type: mnru - q: 24 + q: 25 c04: type: mnru - q: 20 + q: 21 c05: type: mnru - q: 16 + q: 17 c06: type: esdru - alpha: 0.7 + alpha: 0.8 c07: type: esdru - alpha: 0.4 + alpha: 0.6 c08: type: esdru - alpha: 0.1 + alpha: 0.4 ### EVS condition ################################ c09: @@ -139,9 +139,10 @@ conditions_to_generate: cod: opts: ["-max_band", "FB"] dec: + c17: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -151,7 +152,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -159,7 +160,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -167,7 +168,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -175,7 +176,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -183,19 +184,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - - ### IVAS condition ############################### c23: - type: ivas + type: evs + sba_fmt: "FOA" bitrates: - - 13200 + - 24400 cod: + opts: ["-dtx", "-max_band", "FB"] dec: - fmt: "FOA" + + ### IVAS condition ############################### c24: type: ivas bitrates: @@ -245,6 +247,7 @@ conditions_to_generate: cod: dec: fmt: "FOA" + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-5/config/P800-5-cat6.yml b/experiments/selection/P800-5/config/P800-5-cat6.yml index 48dfa172..1cac552a 100644 --- a/experiments/selection/P800-5/config/P800-5-cat6.yml +++ b/experiments/selection/P800-5/config/P800-5-cat6.yml @@ -55,25 +55,25 @@ conditions_to_generate: type: ref c02: type: mnru - q: 28 + q: 29 c03: type: mnru - q: 24 + q: 25 c04: type: mnru - q: 20 + q: 21 c05: type: mnru - q: 16 + q: 17 c06: type: esdru - alpha: 0.7 + alpha: 0.8 c07: type: esdru - alpha: 0.4 + alpha: 0.6 c08: type: esdru - alpha: 0.1 + alpha: 0.4 ### EVS condition ################################ c09: @@ -139,9 +139,10 @@ conditions_to_generate: cod: opts: ["-max_band", "FB"] dec: + c17: type: evs - sba_fmt: "FOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -151,7 +152,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 8000 + - 7200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -159,7 +160,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 9600 + - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -167,7 +168,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 13200 + - 9600 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -175,7 +176,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 16400 + - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: @@ -183,19 +184,20 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 24400 + - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - - ### IVAS condition ############################### c23: - type: ivas + type: evs + sba_fmt: "FOA" bitrates: - - 13200 + - 24400 cod: + opts: ["-dtx", "-max_band", "FB"] dec: - fmt: "FOA" + + ### IVAS condition ############################### c24: type: ivas bitrates: @@ -245,6 +247,7 @@ conditions_to_generate: cod: dec: fmt: "FOA" + c31: type: ivas bitrates: -- GitLab From aa0e68a9b0c6dbf7f8d014a1f0abb38f161f7672 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 11:13:06 +0200 Subject: [PATCH 06/22] adapt P800-6 --- .../selection/P800-6/config/P800-6-cat1.yml | 82 +++++++++++++++---- .../selection/P800-6/config/P800-6-cat2.yml | 82 +++++++++++++++---- .../selection/P800-6/config/P800-6-cat3.yml | 82 +++++++++++++++---- .../selection/P800-6/config/P800-6-cat4.yml | 82 +++++++++++++++---- .../selection/P800-6/config/P800-6-cat5.yml | 82 +++++++++++++++---- .../selection/P800-6/config/P800-6-cat6.yml | 82 +++++++++++++++---- 6 files changed, 402 insertions(+), 90 deletions(-) diff --git a/experiments/selection/P800-6/config/P800-6-cat1.yml b/experiments/selection/P800-6/config/P800-6-cat1.yml index 0259bfdc..a8038036 100644 --- a/experiments/selection/P800-6/config/P800-6-cat1.yml +++ b/experiments/selection/P800-6/config/P800-6-cat1.yml @@ -106,6 +106,21 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + c16: + type: evs + bitrates: + - 64000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 13200 @@ -115,7 +130,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c18: type: evs bitrates: - 16400 @@ -125,7 +140,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c19: type: evs bitrates: - 24400 @@ -135,21 +150,32 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c20: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c19: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c23: type: evs bitrates: - 24400 @@ -158,35 +184,50 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c21: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "ISM1" - c22: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM1" - c23: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM1" - c24: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM1" - c25: + c28: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "ISM1" + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM1" + + c30: type: ivas bitrates: - 13200 @@ -196,7 +237,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c26: + c31: type: ivas bitrates: - 16400 @@ -206,7 +247,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c32: type: ivas bitrates: - 24400 @@ -216,7 +257,18 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c33: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "ISM1" + tx: + type: "FER" + error_rate: 5 + + c34: type: ivas bitrates: - 13200 @@ -224,7 +276,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c29: + c35: type: ivas bitrates: - 16400 @@ -232,7 +284,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c30: + c36: type: ivas bitrates: - 24400 diff --git a/experiments/selection/P800-6/config/P800-6-cat2.yml b/experiments/selection/P800-6/config/P800-6-cat2.yml index a983c37f..c8dcafe5 100644 --- a/experiments/selection/P800-6/config/P800-6-cat2.yml +++ b/experiments/selection/P800-6/config/P800-6-cat2.yml @@ -105,6 +105,21 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + c16: + type: evs + bitrates: + - 64000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 13200 @@ -114,7 +129,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c18: type: evs bitrates: - 16400 @@ -124,7 +139,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c19: type: evs bitrates: - 24400 @@ -134,21 +149,32 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c20: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c19: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c23: type: evs bitrates: - 24400 @@ -157,35 +183,50 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c21: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "ISM1" - c22: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM1" - c23: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM1" - c24: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM1" - c25: + c28: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "ISM1" + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM1" + + c30: type: ivas bitrates: - 13200 @@ -195,7 +236,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c26: + c31: type: ivas bitrates: - 16400 @@ -205,7 +246,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c32: type: ivas bitrates: - 24400 @@ -215,7 +256,18 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c33: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "ISM1" + tx: + type: "FER" + error_rate: 5 + + c34: type: ivas bitrates: - 13200 @@ -223,7 +275,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c29: + c35: type: ivas bitrates: - 16400 @@ -231,7 +283,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c30: + c36: type: ivas bitrates: - 24400 diff --git a/experiments/selection/P800-6/config/P800-6-cat3.yml b/experiments/selection/P800-6/config/P800-6-cat3.yml index 81ced939..006dbff9 100644 --- a/experiments/selection/P800-6/config/P800-6-cat3.yml +++ b/experiments/selection/P800-6/config/P800-6-cat3.yml @@ -105,6 +105,21 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + c16: + type: evs + bitrates: + - 64000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 13200 @@ -114,7 +129,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c18: type: evs bitrates: - 16400 @@ -124,7 +139,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c19: type: evs bitrates: - 24400 @@ -134,21 +149,32 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c20: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c19: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c23: type: evs bitrates: - 24400 @@ -157,35 +183,50 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c21: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "ISM1" - c22: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM1" - c23: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM1" - c24: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM1" - c25: + c28: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "ISM1" + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM1" + + c30: type: ivas bitrates: - 13200 @@ -195,7 +236,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c26: + c31: type: ivas bitrates: - 16400 @@ -205,7 +246,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c32: type: ivas bitrates: - 24400 @@ -215,7 +256,18 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c33: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "ISM1" + tx: + type: "FER" + error_rate: 5 + + c34: type: ivas bitrates: - 13200 @@ -223,7 +275,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c29: + c35: type: ivas bitrates: - 16400 @@ -231,7 +283,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c30: + c36: type: ivas bitrates: - 24400 diff --git a/experiments/selection/P800-6/config/P800-6-cat4.yml b/experiments/selection/P800-6/config/P800-6-cat4.yml index 6b072eb3..a21cf72b 100644 --- a/experiments/selection/P800-6/config/P800-6-cat4.yml +++ b/experiments/selection/P800-6/config/P800-6-cat4.yml @@ -105,6 +105,21 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + c16: + type: evs + bitrates: + - 64000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 13200 @@ -114,7 +129,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c18: type: evs bitrates: - 16400 @@ -124,7 +139,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c19: type: evs bitrates: - 24400 @@ -134,21 +149,32 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c20: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c19: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c23: type: evs bitrates: - 24400 @@ -157,35 +183,50 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c21: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "ISM1" - c22: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM1" - c23: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM1" - c24: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM1" - c25: + c28: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "ISM1" + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM1" + + c30: type: ivas bitrates: - 13200 @@ -195,7 +236,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c26: + c31: type: ivas bitrates: - 16400 @@ -205,7 +246,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c32: type: ivas bitrates: - 24400 @@ -215,7 +256,18 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c33: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "ISM1" + tx: + type: "FER" + error_rate: 5 + + c34: type: ivas bitrates: - 13200 @@ -223,7 +275,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c29: + c35: type: ivas bitrates: - 16400 @@ -231,7 +283,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c30: + c36: type: ivas bitrates: - 24400 diff --git a/experiments/selection/P800-6/config/P800-6-cat5.yml b/experiments/selection/P800-6/config/P800-6-cat5.yml index 55d739eb..2a0317cf 100644 --- a/experiments/selection/P800-6/config/P800-6-cat5.yml +++ b/experiments/selection/P800-6/config/P800-6-cat5.yml @@ -105,6 +105,21 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + c16: + type: evs + bitrates: + - 64000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 13200 @@ -114,7 +129,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c18: type: evs bitrates: - 16400 @@ -124,7 +139,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c19: type: evs bitrates: - 24400 @@ -134,21 +149,32 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c20: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c19: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c23: type: evs bitrates: - 24400 @@ -157,35 +183,50 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c21: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "ISM1" - c22: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM1" - c23: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM1" - c24: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM1" - c25: + c28: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "ISM1" + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM1" + + c30: type: ivas bitrates: - 13200 @@ -195,7 +236,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c26: + c31: type: ivas bitrates: - 16400 @@ -205,7 +246,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c32: type: ivas bitrates: - 24400 @@ -215,7 +256,18 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c33: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "ISM1" + tx: + type: "FER" + error_rate: 5 + + c34: type: ivas bitrates: - 13200 @@ -223,7 +275,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c29: + c35: type: ivas bitrates: - 16400 @@ -231,7 +283,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c30: + c36: type: ivas bitrates: - 24400 diff --git a/experiments/selection/P800-6/config/P800-6-cat6.yml b/experiments/selection/P800-6/config/P800-6-cat6.yml index 31500eed..4a376cb6 100644 --- a/experiments/selection/P800-6/config/P800-6-cat6.yml +++ b/experiments/selection/P800-6/config/P800-6-cat6.yml @@ -105,6 +105,21 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 48000 + cod: + opts: ["-max_band", "FB"] + dec: + c16: + type: evs + bitrates: + - 64000 + cod: + opts: ["-max_band", "FB"] + dec: + + c17: type: evs bitrates: - 13200 @@ -114,7 +129,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c18: type: evs bitrates: - 16400 @@ -124,7 +139,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c19: type: evs bitrates: - 24400 @@ -134,21 +149,32 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c20: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + tx: + type: "FER" + error_rate: 5 + + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c19: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c23: type: evs bitrates: - 24400 @@ -157,35 +183,50 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c21: + c24: type: ivas bitrates: - 13200 cod: dec: fmt: "ISM1" - c22: + c25: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM1" - c23: + c26: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM1" - c24: + c27: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM1" - c25: + c28: + type: ivas + bitrates: + - 48000 + cod: + dec: + fmt: "ISM1" + c29: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM1" + + c30: type: ivas bitrates: - 13200 @@ -195,7 +236,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c26: + c31: type: ivas bitrates: - 16400 @@ -205,7 +246,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c32: type: ivas bitrates: - 24400 @@ -215,7 +256,18 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c33: + type: ivas + bitrates: + - 32000 + cod: + dec: + fmt: "ISM1" + tx: + type: "FER" + error_rate: 5 + + c34: type: ivas bitrates: - 13200 @@ -223,7 +275,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c29: + c35: type: ivas bitrates: - 16400 @@ -231,7 +283,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM1" - c30: + c36: type: ivas bitrates: - 24400 -- GitLab From 4c62070b2e7a8b6bfcc07471af5cc78a659150aa Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 11:22:28 +0200 Subject: [PATCH 07/22] adapt P800-7 --- .../selection/P800-7/config/P800-7-cat1.yml | 61 +++++++++++++------ .../selection/P800-7/config/P800-7-cat2.yml | 61 +++++++++++++------ .../selection/P800-7/config/P800-7-cat3.yml | 61 +++++++++++++------ .../selection/P800-7/config/P800-7-cat4.yml | 61 +++++++++++++------ .../selection/P800-7/config/P800-7-cat5.yml | 61 +++++++++++++------ .../selection/P800-7/config/P800-7-cat6.yml | 61 +++++++++++++------ 6 files changed, 246 insertions(+), 120 deletions(-) diff --git a/experiments/selection/P800-7/config/P800-7-cat1.yml b/experiments/selection/P800-7/config/P800-7-cat1.yml index 4b079fb8..27a4c200 100644 --- a/experiments/selection/P800-7/config/P800-7-cat1.yml +++ b/experiments/selection/P800-7/config/P800-7-cat1.yml @@ -106,6 +106,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c16: type: evs bitrates: - 8000 @@ -115,7 +123,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c17: type: evs bitrates: - 13200 @@ -125,7 +133,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 16400 @@ -135,35 +143,39 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 24400 cod: - opts: ["-dtx", "-max_band", "FB"] + opts: ["-max_band", "FB"] dec: - c19: + tx: + type: "FER" + error_rate: 5 + + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c21: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c22: + c23: type: evs bitrates: - 24400 @@ -172,35 +184,43 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM2" - c24: + c25: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM2" - c25: + c26: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM2" - c26: + c27: type: ivas bitrates: - 48000 cod: dec: fmt: "ISM2" - c27: + c28: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM2" + + c29: type: ivas bitrates: - 16400 @@ -210,7 +230,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c30: type: ivas bitrates: - 24400 @@ -220,7 +240,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 32000 @@ -230,7 +250,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 48000 @@ -240,7 +260,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + + c33: type: ivas bitrates: - 16400 @@ -248,7 +269,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c32: + c34: type: ivas bitrates: - 24400 @@ -256,7 +277,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c33: + c35: type: ivas bitrates: - 32000 @@ -264,7 +285,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c34: + c36: type: ivas bitrates: - 48000 diff --git a/experiments/selection/P800-7/config/P800-7-cat2.yml b/experiments/selection/P800-7/config/P800-7-cat2.yml index cc36866e..4bd11885 100644 --- a/experiments/selection/P800-7/config/P800-7-cat2.yml +++ b/experiments/selection/P800-7/config/P800-7-cat2.yml @@ -105,6 +105,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c16: type: evs bitrates: - 8000 @@ -114,7 +122,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c17: type: evs bitrates: - 13200 @@ -124,7 +132,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 16400 @@ -134,35 +142,39 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 24400 cod: - opts: ["-dtx", "-max_band", "FB"] + opts: ["-max_band", "FB"] dec: - c19: + tx: + type: "FER" + error_rate: 5 + + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c21: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c22: + c23: type: evs bitrates: - 24400 @@ -171,35 +183,43 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM2" - c24: + c25: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM2" - c25: + c26: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM2" - c26: + c27: type: ivas bitrates: - 48000 cod: dec: fmt: "ISM2" - c27: + c28: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM2" + + c29: type: ivas bitrates: - 16400 @@ -209,7 +229,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c30: type: ivas bitrates: - 24400 @@ -219,7 +239,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 32000 @@ -229,7 +249,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 48000 @@ -239,7 +259,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + + c33: type: ivas bitrates: - 16400 @@ -247,7 +268,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c32: + c34: type: ivas bitrates: - 24400 @@ -255,7 +276,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c33: + c35: type: ivas bitrates: - 32000 @@ -263,7 +284,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c34: + c36: type: ivas bitrates: - 48000 diff --git a/experiments/selection/P800-7/config/P800-7-cat3.yml b/experiments/selection/P800-7/config/P800-7-cat3.yml index ed4312a3..0acd49d9 100644 --- a/experiments/selection/P800-7/config/P800-7-cat3.yml +++ b/experiments/selection/P800-7/config/P800-7-cat3.yml @@ -105,6 +105,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c16: type: evs bitrates: - 8000 @@ -114,7 +122,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c17: type: evs bitrates: - 13200 @@ -124,7 +132,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 16400 @@ -134,35 +142,39 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 24400 cod: - opts: ["-dtx", "-max_band", "FB"] + opts: ["-max_band", "FB"] dec: - c19: + tx: + type: "FER" + error_rate: 5 + + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c21: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c22: + c23: type: evs bitrates: - 24400 @@ -171,35 +183,43 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM2" - c24: + c25: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM2" - c25: + c26: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM2" - c26: + c27: type: ivas bitrates: - 48000 cod: dec: fmt: "ISM2" - c27: + c28: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM2" + + c29: type: ivas bitrates: - 16400 @@ -209,7 +229,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c30: type: ivas bitrates: - 24400 @@ -219,7 +239,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 32000 @@ -229,7 +249,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 48000 @@ -239,7 +259,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + + c33: type: ivas bitrates: - 16400 @@ -247,7 +268,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c32: + c34: type: ivas bitrates: - 24400 @@ -255,7 +276,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c33: + c35: type: ivas bitrates: - 32000 @@ -263,7 +284,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c34: + c36: type: ivas bitrates: - 48000 diff --git a/experiments/selection/P800-7/config/P800-7-cat4.yml b/experiments/selection/P800-7/config/P800-7-cat4.yml index 6ca3acaf..9bccb07e 100644 --- a/experiments/selection/P800-7/config/P800-7-cat4.yml +++ b/experiments/selection/P800-7/config/P800-7-cat4.yml @@ -105,6 +105,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c16: type: evs bitrates: - 8000 @@ -114,7 +122,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c17: type: evs bitrates: - 13200 @@ -124,7 +132,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 16400 @@ -134,35 +142,39 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 24400 cod: - opts: ["-dtx", "-max_band", "FB"] + opts: ["-max_band", "FB"] dec: - c19: + tx: + type: "FER" + error_rate: 5 + + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c21: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c22: + c23: type: evs bitrates: - 24400 @@ -171,35 +183,43 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM2" - c24: + c25: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM2" - c25: + c26: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM2" - c26: + c27: type: ivas bitrates: - 48000 cod: dec: fmt: "ISM2" - c27: + c28: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM2" + + c29: type: ivas bitrates: - 16400 @@ -209,7 +229,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c30: type: ivas bitrates: - 24400 @@ -219,7 +239,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 32000 @@ -229,7 +249,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 48000 @@ -239,7 +259,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + + c33: type: ivas bitrates: - 16400 @@ -247,7 +268,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c32: + c34: type: ivas bitrates: - 24400 @@ -255,7 +276,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c33: + c35: type: ivas bitrates: - 32000 @@ -263,7 +284,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c34: + c36: type: ivas bitrates: - 48000 diff --git a/experiments/selection/P800-7/config/P800-7-cat5.yml b/experiments/selection/P800-7/config/P800-7-cat5.yml index ec3c4230..6921ab24 100644 --- a/experiments/selection/P800-7/config/P800-7-cat5.yml +++ b/experiments/selection/P800-7/config/P800-7-cat5.yml @@ -105,6 +105,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c16: type: evs bitrates: - 8000 @@ -114,7 +122,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c17: type: evs bitrates: - 13200 @@ -124,7 +132,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 16400 @@ -134,35 +142,39 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 24400 cod: - opts: ["-dtx", "-max_band", "FB"] + opts: ["-max_band", "FB"] dec: - c19: + tx: + type: "FER" + error_rate: 5 + + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c21: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c22: + c23: type: evs bitrates: - 24400 @@ -171,35 +183,43 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM2" - c24: + c25: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM2" - c25: + c26: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM2" - c26: + c27: type: ivas bitrates: - 48000 cod: dec: fmt: "ISM2" - c27: + c28: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM2" + + c29: type: ivas bitrates: - 16400 @@ -209,7 +229,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c30: type: ivas bitrates: - 24400 @@ -219,7 +239,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 32000 @@ -229,7 +249,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 48000 @@ -239,7 +259,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + + c33: type: ivas bitrates: - 16400 @@ -247,7 +268,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c32: + c34: type: ivas bitrates: - 24400 @@ -255,7 +276,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c33: + c35: type: ivas bitrates: - 32000 @@ -263,7 +284,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c34: + c36: type: ivas bitrates: - 48000 diff --git a/experiments/selection/P800-7/config/P800-7-cat6.yml b/experiments/selection/P800-7/config/P800-7-cat6.yml index 3088a95e..50db89d9 100644 --- a/experiments/selection/P800-7/config/P800-7-cat6.yml +++ b/experiments/selection/P800-7/config/P800-7-cat6.yml @@ -105,6 +105,14 @@ conditions_to_generate: opts: ["-max_band", "FB"] dec: c15: + type: evs + bitrates: + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + + c16: type: evs bitrates: - 8000 @@ -114,7 +122,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c16: + c17: type: evs bitrates: - 13200 @@ -124,7 +132,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c17: + c18: type: evs bitrates: - 16400 @@ -134,35 +142,39 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c18: + c19: type: evs bitrates: - 24400 cod: - opts: ["-dtx", "-max_band", "FB"] + opts: ["-max_band", "FB"] dec: - c19: + tx: + type: "FER" + error_rate: 5 + + c20: type: evs bitrates: - 8000 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c20: + c21: type: evs bitrates: - 13200 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c21: + c22: type: evs bitrates: - 16400 cod: opts: ["-dtx", "-max_band", "FB"] dec: - c22: + c23: type: evs bitrates: - 24400 @@ -171,35 +183,43 @@ conditions_to_generate: dec: ### IVAS condition ############################### - c23: + c24: type: ivas bitrates: - 16400 cod: dec: fmt: "ISM2" - c24: + c25: type: ivas bitrates: - 24400 cod: dec: fmt: "ISM2" - c25: + c26: type: ivas bitrates: - 32000 cod: dec: fmt: "ISM2" - c26: + c27: type: ivas bitrates: - 48000 cod: dec: fmt: "ISM2" - c27: + c28: + type: ivas + bitrates: + - 64000 + cod: + dec: + fmt: "ISM2" + + c29: type: ivas bitrates: - 16400 @@ -209,7 +229,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c28: + c30: type: ivas bitrates: - 24400 @@ -219,7 +239,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c29: + c31: type: ivas bitrates: - 32000 @@ -229,7 +249,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c30: + c32: type: ivas bitrates: - 48000 @@ -239,7 +259,8 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c31: + + c33: type: ivas bitrates: - 16400 @@ -247,7 +268,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c32: + c34: type: ivas bitrates: - 24400 @@ -255,7 +276,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c33: + c35: type: ivas bitrates: - 32000 @@ -263,7 +284,7 @@ conditions_to_generate: opts: ["-dtx"] dec: fmt: "ISM2" - c34: + c36: type: ivas bitrates: - 48000 -- GitLab From 44bc402c997c2d1cfa8decc8d7d3a76dd05660ca Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 11:53:21 +0200 Subject: [PATCH 08/22] adapt P800-8 --- .../selection/P800-8/config/P800-8-cat1.yml | 108 +++++++----------- .../selection/P800-8/config/P800-8-cat2.yml | 108 +++++++----------- .../selection/P800-8/config/P800-8-cat3.yml | 108 +++++++----------- .../selection/P800-8/config/P800-8-cat4.yml | 108 +++++++----------- .../selection/P800-8/config/P800-8-cat5.yml | 108 +++++++----------- .../selection/P800-8/config/P800-8-cat6.yml | 108 +++++++----------- 6 files changed, 240 insertions(+), 408 deletions(-) diff --git a/experiments/selection/P800-8/config/P800-8-cat1.yml b/experiments/selection/P800-8/config/P800-8-cat1.yml index cf89a878..866cb1d1 100644 --- a/experiments/selection/P800-8/config/P800-8-cat1.yml +++ b/experiments/selection/P800-8/config/P800-8-cat1.yml @@ -52,34 +52,35 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -87,6 +88,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -94,6 +96,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -101,26 +104,21 @@ conditions_to_generate: dec: c13: type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs + sba_format: "FOA" bitrates: - 16400 cod: opts: ["-max_band", "FB"] dec: - c15: + c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: - c16: + c15: type: evs bitrates: - 7200 @@ -128,7 +126,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c17: + c16: type: evs bitrates: - 8000 @@ -136,7 +134,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c18: + c17: type: evs bitrates: - 9600 @@ -144,7 +142,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c19: + c18: type: evs bitrates: - 16400 @@ -152,7 +150,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c20: + c19: type: evs bitrates: - 24400 @@ -160,19 +158,21 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c21: + + c20: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" tx: type: "FER" error_rate: 5 - c22: + c21: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -181,8 +181,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c23: + c22: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -191,28 +192,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c24: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c25: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c26: + c23: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -221,7 +203,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c24: type: evs bitrates: - 24400 @@ -233,7 +215,7 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c28: + c25: type: ivas bitrates: - 13200 @@ -241,7 +223,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c29: + c26: type: ivas bitrates: - 16400 @@ -249,7 +231,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c30: + c27: type: ivas bitrates: - 24400 @@ -257,7 +239,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c31: + c28: type: ivas bitrates: - 32000 @@ -265,7 +247,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c32: + c29: type: ivas bitrates: - 48000 @@ -273,7 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c33: + c30: type: ivas bitrates: - 64000 @@ -281,7 +263,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c34: + c31: type: ivas bitrates: - 80000 @@ -289,7 +271,8 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c35: + + c32: type: ivas bitrates: - 13200 @@ -300,7 +283,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c36: + c33: type: ivas bitrates: - 16400 @@ -311,7 +294,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c37: + c34: type: ivas bitrates: - 24400 @@ -322,18 +305,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c38: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c39: + c35: type: ivas bitrates: - 48000 @@ -344,7 +316,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c40: + c36: type: ivas bitrates: - 64000 diff --git a/experiments/selection/P800-8/config/P800-8-cat2.yml b/experiments/selection/P800-8/config/P800-8-cat2.yml index 56d1df23..0d5c24fb 100644 --- a/experiments/selection/P800-8/config/P800-8-cat2.yml +++ b/experiments/selection/P800-8/config/P800-8-cat2.yml @@ -52,34 +52,35 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -87,6 +88,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -94,6 +96,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -101,26 +104,21 @@ conditions_to_generate: dec: c13: type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs + sba_format: "FOA" bitrates: - 16400 cod: opts: ["-max_band", "FB"] dec: - c15: + c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: - c16: + c15: type: evs bitrates: - 7200 @@ -128,7 +126,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c17: + c16: type: evs bitrates: - 8000 @@ -136,7 +134,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c18: + c17: type: evs bitrates: - 9600 @@ -144,7 +142,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c19: + c18: type: evs bitrates: - 16400 @@ -152,7 +150,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c20: + c19: type: evs bitrates: - 24400 @@ -160,19 +158,21 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c21: + + c20: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" tx: type: "FER" error_rate: 5 - c22: + c21: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -181,8 +181,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c23: + c22: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -191,28 +192,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c24: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c25: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c26: + c23: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -221,7 +203,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c24: type: evs bitrates: - 24400 @@ -233,7 +215,7 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c28: + c25: type: ivas bitrates: - 13200 @@ -241,7 +223,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c29: + c26: type: ivas bitrates: - 16400 @@ -249,7 +231,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c30: + c27: type: ivas bitrates: - 24400 @@ -257,7 +239,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c31: + c28: type: ivas bitrates: - 32000 @@ -265,7 +247,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c32: + c29: type: ivas bitrates: - 48000 @@ -273,7 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c33: + c30: type: ivas bitrates: - 64000 @@ -281,7 +263,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c34: + c31: type: ivas bitrates: - 80000 @@ -289,7 +271,8 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c35: + + c32: type: ivas bitrates: - 13200 @@ -300,7 +283,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c36: + c33: type: ivas bitrates: - 16400 @@ -311,7 +294,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c37: + c34: type: ivas bitrates: - 24400 @@ -322,18 +305,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c38: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c39: + c35: type: ivas bitrates: - 48000 @@ -344,7 +316,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c40: + c36: type: ivas bitrates: - 64000 diff --git a/experiments/selection/P800-8/config/P800-8-cat3.yml b/experiments/selection/P800-8/config/P800-8-cat3.yml index 068c3d2a..9b441aec 100644 --- a/experiments/selection/P800-8/config/P800-8-cat3.yml +++ b/experiments/selection/P800-8/config/P800-8-cat3.yml @@ -52,34 +52,35 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -87,6 +88,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -94,6 +96,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -101,26 +104,21 @@ conditions_to_generate: dec: c13: type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs + sba_format: "FOA" bitrates: - 16400 cod: opts: ["-max_band", "FB"] dec: - c15: + c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: - c16: + c15: type: evs bitrates: - 7200 @@ -128,7 +126,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c17: + c16: type: evs bitrates: - 8000 @@ -136,7 +134,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c18: + c17: type: evs bitrates: - 9600 @@ -144,7 +142,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c19: + c18: type: evs bitrates: - 16400 @@ -152,7 +150,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c20: + c19: type: evs bitrates: - 24400 @@ -160,19 +158,21 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c21: + + c20: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" tx: type: "FER" error_rate: 5 - c22: + c21: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -181,8 +181,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c23: + c22: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -191,28 +192,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c24: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c25: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c26: + c23: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -221,7 +203,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c24: type: evs bitrates: - 24400 @@ -233,7 +215,7 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c28: + c25: type: ivas bitrates: - 13200 @@ -241,7 +223,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c29: + c26: type: ivas bitrates: - 16400 @@ -249,7 +231,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c30: + c27: type: ivas bitrates: - 24400 @@ -257,7 +239,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c31: + c28: type: ivas bitrates: - 32000 @@ -265,7 +247,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c32: + c29: type: ivas bitrates: - 48000 @@ -273,7 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c33: + c30: type: ivas bitrates: - 64000 @@ -281,7 +263,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c34: + c31: type: ivas bitrates: - 80000 @@ -289,7 +271,8 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c35: + + c32: type: ivas bitrates: - 13200 @@ -300,7 +283,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c36: + c33: type: ivas bitrates: - 16400 @@ -311,7 +294,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c37: + c34: type: ivas bitrates: - 24400 @@ -322,18 +305,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c38: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c39: + c35: type: ivas bitrates: - 48000 @@ -344,7 +316,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c40: + c36: type: ivas bitrates: - 64000 diff --git a/experiments/selection/P800-8/config/P800-8-cat4.yml b/experiments/selection/P800-8/config/P800-8-cat4.yml index 4703581f..1044726f 100644 --- a/experiments/selection/P800-8/config/P800-8-cat4.yml +++ b/experiments/selection/P800-8/config/P800-8-cat4.yml @@ -52,34 +52,35 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -87,6 +88,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -94,6 +96,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -101,26 +104,21 @@ conditions_to_generate: dec: c13: type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs + sba_format: "FOA" bitrates: - 16400 cod: opts: ["-max_band", "FB"] dec: - c15: + c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: - c16: + c15: type: evs bitrates: - 7200 @@ -128,7 +126,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c17: + c16: type: evs bitrates: - 8000 @@ -136,7 +134,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c18: + c17: type: evs bitrates: - 9600 @@ -144,7 +142,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c19: + c18: type: evs bitrates: - 16400 @@ -152,7 +150,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c20: + c19: type: evs bitrates: - 24400 @@ -160,19 +158,21 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c21: + + c20: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" tx: type: "FER" error_rate: 5 - c22: + c21: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -181,8 +181,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c23: + c22: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -191,28 +192,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c24: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c25: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c26: + c23: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -221,7 +203,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c24: type: evs bitrates: - 24400 @@ -233,7 +215,7 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c28: + c25: type: ivas bitrates: - 13200 @@ -241,7 +223,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c29: + c26: type: ivas bitrates: - 16400 @@ -249,7 +231,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c30: + c27: type: ivas bitrates: - 24400 @@ -257,7 +239,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c31: + c28: type: ivas bitrates: - 32000 @@ -265,7 +247,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c32: + c29: type: ivas bitrates: - 48000 @@ -273,7 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c33: + c30: type: ivas bitrates: - 64000 @@ -281,7 +263,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c34: + c31: type: ivas bitrates: - 80000 @@ -289,7 +271,8 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c35: + + c32: type: ivas bitrates: - 13200 @@ -300,7 +283,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c36: + c33: type: ivas bitrates: - 16400 @@ -311,7 +294,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c37: + c34: type: ivas bitrates: - 24400 @@ -322,18 +305,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c38: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c39: + c35: type: ivas bitrates: - 48000 @@ -344,7 +316,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c40: + c36: type: ivas bitrates: - 64000 diff --git a/experiments/selection/P800-8/config/P800-8-cat5.yml b/experiments/selection/P800-8/config/P800-8-cat5.yml index bfebe93e..fa32fefd 100644 --- a/experiments/selection/P800-8/config/P800-8-cat5.yml +++ b/experiments/selection/P800-8/config/P800-8-cat5.yml @@ -52,34 +52,35 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -87,6 +88,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -94,6 +96,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -101,26 +104,21 @@ conditions_to_generate: dec: c13: type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs + sba_format: "FOA" bitrates: - 16400 cod: opts: ["-max_band", "FB"] dec: - c15: + c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: - c16: + c15: type: evs bitrates: - 7200 @@ -128,7 +126,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c17: + c16: type: evs bitrates: - 8000 @@ -136,7 +134,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c18: + c17: type: evs bitrates: - 9600 @@ -144,7 +142,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c19: + c18: type: evs bitrates: - 16400 @@ -152,7 +150,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c20: + c19: type: evs bitrates: - 24400 @@ -160,19 +158,21 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c21: + + c20: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" tx: type: "FER" error_rate: 5 - c22: + c21: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -181,8 +181,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c23: + c22: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -191,28 +192,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c24: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c25: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c26: + c23: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -221,7 +203,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c24: type: evs bitrates: - 24400 @@ -233,7 +215,7 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c28: + c25: type: ivas bitrates: - 13200 @@ -241,7 +223,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c29: + c26: type: ivas bitrates: - 16400 @@ -249,7 +231,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c30: + c27: type: ivas bitrates: - 24400 @@ -257,7 +239,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c31: + c28: type: ivas bitrates: - 32000 @@ -265,7 +247,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c32: + c29: type: ivas bitrates: - 48000 @@ -273,7 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c33: + c30: type: ivas bitrates: - 64000 @@ -281,7 +263,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c34: + c31: type: ivas bitrates: - 80000 @@ -289,7 +271,8 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c35: + + c32: type: ivas bitrates: - 13200 @@ -300,7 +283,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c36: + c33: type: ivas bitrates: - 16400 @@ -311,7 +294,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c37: + c34: type: ivas bitrates: - 24400 @@ -322,18 +305,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c38: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c39: + c35: type: ivas bitrates: - 48000 @@ -344,7 +316,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c40: + c36: type: ivas bitrates: - 64000 diff --git a/experiments/selection/P800-8/config/P800-8-cat6.yml b/experiments/selection/P800-8/config/P800-8-cat6.yml index 641efed6..1aedcae4 100644 --- a/experiments/selection/P800-8/config/P800-8-cat6.yml +++ b/experiments/selection/P800-8/config/P800-8-cat6.yml @@ -52,34 +52,35 @@ conditions_to_generate: q: 32 c03: type: mnru - q: 27 + q: 28 c04: type: mnru - q: 22 + q: 24 c05: type: mnru - q: 17 + q: 20 c06: type: esdru alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -87,6 +88,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -94,6 +96,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -101,26 +104,21 @@ conditions_to_generate: dec: c13: type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - c14: - type: evs + sba_format: "FOA" bitrates: - 16400 cod: opts: ["-max_band", "FB"] dec: - c15: + c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: - c16: + c15: type: evs bitrates: - 7200 @@ -128,7 +126,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c17: + c16: type: evs bitrates: - 8000 @@ -136,7 +134,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c18: + c17: type: evs bitrates: - 9600 @@ -144,7 +142,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c19: + c18: type: evs bitrates: - 16400 @@ -152,7 +150,7 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c20: + c19: type: evs bitrates: - 24400 @@ -160,19 +158,21 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c21: + + c20: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" tx: type: "FER" error_rate: 5 - c22: + c21: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -181,8 +181,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c23: + c22: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -191,28 +192,9 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c24: - type: evs - bitrates: - - 9600 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c25: - type: evs - bitrates: - - 13200 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 - c26: + c23: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -221,7 +203,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c27: + c24: type: evs bitrates: - 24400 @@ -233,7 +215,7 @@ conditions_to_generate: error_rate: 5 ### IVAS condition ############################### - c28: + c25: type: ivas bitrates: - 13200 @@ -241,7 +223,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c29: + c26: type: ivas bitrates: - 16400 @@ -249,7 +231,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c30: + c27: type: ivas bitrates: - 24400 @@ -257,7 +239,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c31: + c28: type: ivas bitrates: - 32000 @@ -265,7 +247,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c32: + c29: type: ivas bitrates: - 48000 @@ -273,7 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c33: + c30: type: ivas bitrates: - 64000 @@ -281,7 +263,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c34: + c31: type: ivas bitrates: - 80000 @@ -289,7 +271,8 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c35: + + c32: type: ivas bitrates: - 13200 @@ -300,7 +283,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c36: + c33: type: ivas bitrates: - 16400 @@ -311,7 +294,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c37: + c34: type: ivas bitrates: - 24400 @@ -322,18 +305,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c38: - type: ivas - bitrates: - - 32000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 - c39: + c35: type: ivas bitrates: - 48000 @@ -344,7 +316,7 @@ conditions_to_generate: tx: type: "FER" error_rate: 5 - c40: + c36: type: ivas bitrates: - 64000 -- GitLab From c84d3fe64713b1dc5b8be179fc3506569a22f6e0 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 11:58:34 +0200 Subject: [PATCH 09/22] adapt P800-9 --- .../selection/P800-9/config/P800-9-cat1.yml | 27 ++++++++++++++----- .../selection/P800-9/config/P800-9-cat2.yml | 27 ++++++++++++++----- .../selection/P800-9/config/P800-9-cat3.yml | 27 ++++++++++++++----- .../selection/P800-9/config/P800-9-cat4.yml | 27 ++++++++++++++----- .../selection/P800-9/config/P800-9-cat5.yml | 27 ++++++++++++++----- .../selection/P800-9/config/P800-9-cat6.yml | 27 ++++++++++++++----- 6 files changed, 120 insertions(+), 42 deletions(-) diff --git a/experiments/selection/P800-9/config/P800-9-cat1.yml b/experiments/selection/P800-9/config/P800-9-cat1.yml index b1b91db7..be871ebc 100644 --- a/experiments/selection/P800-9/config/P800-9-cat1.yml +++ b/experiments/selection/P800-9/config/P800-9-cat1.yml @@ -54,13 +54,13 @@ conditions_to_generate: type: ref c02: type: mnru - q: 32 + q: 29 c03: type: mnru - q: 27 + q: 25 c04: type: mnru - q: 22 + q: 21 c05: type: mnru q: 17 @@ -69,22 +69,23 @@ conditions_to_generate: alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -92,6 +93,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -99,6 +101,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -106,6 +109,7 @@ conditions_to_generate: dec: c13: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -113,11 +117,13 @@ conditions_to_generate: dec: c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: + c15: type: evs bitrates: @@ -142,16 +148,18 @@ conditions_to_generate: fmt: "MASA2" opts: ["-dtx", "-max_band", "FB"] dec: + c18: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c19: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -159,6 +167,7 @@ conditions_to_generate: dec: c20: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -166,6 +175,7 @@ conditions_to_generate: dec: c21: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -173,6 +183,7 @@ conditions_to_generate: dec: c22: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -180,6 +191,7 @@ conditions_to_generate: dec: c23: type: evs + sba_format: "FOA" bitrates: - 24400 cod: @@ -243,6 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-9/config/P800-9-cat2.yml b/experiments/selection/P800-9/config/P800-9-cat2.yml index 1ed2b89c..25e3b8a1 100644 --- a/experiments/selection/P800-9/config/P800-9-cat2.yml +++ b/experiments/selection/P800-9/config/P800-9-cat2.yml @@ -54,13 +54,13 @@ conditions_to_generate: type: ref c02: type: mnru - q: 32 + q: 29 c03: type: mnru - q: 27 + q: 25 c04: type: mnru - q: 22 + q: 21 c05: type: mnru q: 17 @@ -69,22 +69,23 @@ conditions_to_generate: alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -92,6 +93,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -99,6 +101,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -106,6 +109,7 @@ conditions_to_generate: dec: c13: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -113,11 +117,13 @@ conditions_to_generate: dec: c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: + c15: type: evs bitrates: @@ -142,16 +148,18 @@ conditions_to_generate: fmt: "MASA2" opts: ["-dtx", "-max_band", "FB"] dec: + c18: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c19: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -159,6 +167,7 @@ conditions_to_generate: dec: c20: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -166,6 +175,7 @@ conditions_to_generate: dec: c21: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -173,6 +183,7 @@ conditions_to_generate: dec: c22: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -180,6 +191,7 @@ conditions_to_generate: dec: c23: type: evs + sba_format: "FOA" bitrates: - 24400 cod: @@ -243,6 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-9/config/P800-9-cat3.yml b/experiments/selection/P800-9/config/P800-9-cat3.yml index 6a3cd9c6..876cbef5 100644 --- a/experiments/selection/P800-9/config/P800-9-cat3.yml +++ b/experiments/selection/P800-9/config/P800-9-cat3.yml @@ -54,13 +54,13 @@ conditions_to_generate: type: ref c02: type: mnru - q: 32 + q: 29 c03: type: mnru - q: 27 + q: 25 c04: type: mnru - q: 22 + q: 21 c05: type: mnru q: 17 @@ -69,22 +69,23 @@ conditions_to_generate: alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -92,6 +93,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -99,6 +101,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -106,6 +109,7 @@ conditions_to_generate: dec: c13: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -113,11 +117,13 @@ conditions_to_generate: dec: c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: + c15: type: evs bitrates: @@ -142,16 +148,18 @@ conditions_to_generate: fmt: "MASA2" opts: ["-dtx", "-max_band", "FB"] dec: + c18: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c19: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -159,6 +167,7 @@ conditions_to_generate: dec: c20: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -166,6 +175,7 @@ conditions_to_generate: dec: c21: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -173,6 +183,7 @@ conditions_to_generate: dec: c22: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -180,6 +191,7 @@ conditions_to_generate: dec: c23: type: evs + sba_format: "FOA" bitrates: - 24400 cod: @@ -243,6 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-9/config/P800-9-cat4.yml b/experiments/selection/P800-9/config/P800-9-cat4.yml index e10f73a9..ef333f45 100644 --- a/experiments/selection/P800-9/config/P800-9-cat4.yml +++ b/experiments/selection/P800-9/config/P800-9-cat4.yml @@ -54,13 +54,13 @@ conditions_to_generate: type: ref c02: type: mnru - q: 32 + q: 29 c03: type: mnru - q: 27 + q: 25 c04: type: mnru - q: 22 + q: 21 c05: type: mnru q: 17 @@ -69,22 +69,23 @@ conditions_to_generate: alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -92,6 +93,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -99,6 +101,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -106,6 +109,7 @@ conditions_to_generate: dec: c13: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -113,11 +117,13 @@ conditions_to_generate: dec: c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: + c15: type: evs bitrates: @@ -142,16 +148,18 @@ conditions_to_generate: fmt: "MASA2" opts: ["-dtx", "-max_band", "FB"] dec: + c18: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c19: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -159,6 +167,7 @@ conditions_to_generate: dec: c20: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -166,6 +175,7 @@ conditions_to_generate: dec: c21: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -173,6 +183,7 @@ conditions_to_generate: dec: c22: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -180,6 +191,7 @@ conditions_to_generate: dec: c23: type: evs + sba_format: "FOA" bitrates: - 24400 cod: @@ -243,6 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-9/config/P800-9-cat5.yml b/experiments/selection/P800-9/config/P800-9-cat5.yml index 1c1930e6..4d0a54dd 100644 --- a/experiments/selection/P800-9/config/P800-9-cat5.yml +++ b/experiments/selection/P800-9/config/P800-9-cat5.yml @@ -54,13 +54,13 @@ conditions_to_generate: type: ref c02: type: mnru - q: 32 + q: 29 c03: type: mnru - q: 27 + q: 25 c04: type: mnru - q: 22 + q: 21 c05: type: mnru q: 17 @@ -69,22 +69,23 @@ conditions_to_generate: alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -92,6 +93,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -99,6 +101,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -106,6 +109,7 @@ conditions_to_generate: dec: c13: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -113,11 +117,13 @@ conditions_to_generate: dec: c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: + c15: type: evs bitrates: @@ -142,16 +148,18 @@ conditions_to_generate: fmt: "MASA2" opts: ["-dtx", "-max_band", "FB"] dec: + c18: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c19: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -159,6 +167,7 @@ conditions_to_generate: dec: c20: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -166,6 +175,7 @@ conditions_to_generate: dec: c21: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -173,6 +183,7 @@ conditions_to_generate: dec: c22: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -180,6 +191,7 @@ conditions_to_generate: dec: c23: type: evs + sba_format: "FOA" bitrates: - 24400 cod: @@ -243,6 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" + c31: type: ivas bitrates: diff --git a/experiments/selection/P800-9/config/P800-9-cat6.yml b/experiments/selection/P800-9/config/P800-9-cat6.yml index e6dcc3dc..36e9a382 100644 --- a/experiments/selection/P800-9/config/P800-9-cat6.yml +++ b/experiments/selection/P800-9/config/P800-9-cat6.yml @@ -54,13 +54,13 @@ conditions_to_generate: type: ref c02: type: mnru - q: 32 + q: 29 c03: type: mnru - q: 27 + q: 25 c04: type: mnru - q: 22 + q: 21 c05: type: mnru q: 17 @@ -69,22 +69,23 @@ conditions_to_generate: alpha: 0.8 c07: type: esdru - alpha: 0.675 + alpha: 0.6 c08: type: esdru - alpha: 0.55 + alpha: 0.4 # ### EVS condition ################################ c09: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c10: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -92,6 +93,7 @@ conditions_to_generate: dec: c11: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -99,6 +101,7 @@ conditions_to_generate: dec: c12: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -106,6 +109,7 @@ conditions_to_generate: dec: c13: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -113,11 +117,13 @@ conditions_to_generate: dec: c14: type: evs + sba_format: "FOA" bitrates: - 24400 cod: opts: ["-max_band", "FB"] dec: + c15: type: evs bitrates: @@ -142,16 +148,18 @@ conditions_to_generate: fmt: "MASA2" opts: ["-dtx", "-max_band", "FB"] dec: + c18: type: evs + sba_format: "PLANARFOA" bitrates: - 7200 cod: opts: ["-max_band", "FB"] dec: - sba_format: "PLANARFOA" c19: type: evs + sba_format: "FOA" bitrates: - 7200 cod: @@ -159,6 +167,7 @@ conditions_to_generate: dec: c20: type: evs + sba_format: "FOA" bitrates: - 8000 cod: @@ -166,6 +175,7 @@ conditions_to_generate: dec: c21: type: evs + sba_format: "FOA" bitrates: - 9600 cod: @@ -173,6 +183,7 @@ conditions_to_generate: dec: c22: type: evs + sba_format: "FOA" bitrates: - 16400 cod: @@ -180,6 +191,7 @@ conditions_to_generate: dec: c23: type: evs + sba_format: "FOA" bitrates: - 24400 cod: @@ -243,6 +255,7 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" + c31: type: ivas bitrates: -- GitLab From 69912c2d75dd9c39dbd989ce890577bb08123d88 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 12:07:03 +0200 Subject: [PATCH 10/22] adapt BS1534-4b --- experiments/selection/BS1534-4b/config/BS1534-4b.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/experiments/selection/BS1534-4b/config/BS1534-4b.yml b/experiments/selection/BS1534-4b/config/BS1534-4b.yml index 3b08c9cc..e1a71372 100644 --- a/experiments/selection/BS1534-4b/config/BS1534-4b.yml +++ b/experiments/selection/BS1534-4b/config/BS1534-4b.yml @@ -55,7 +55,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 48000 + - 32000 cod: opts: ["-max_band", "FB"] dec: @@ -63,7 +63,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 64000 + - 48000 cod: opts: ["-max_band", "FB"] dec: @@ -71,7 +71,7 @@ conditions_to_generate: type: evs sba_fmt: "FOA" bitrates: - - 96000 + - 64000 cod: opts: ["-max_band", "FB"] dec: @@ -81,7 +81,7 @@ conditions_to_generate: type: ivas sba_fmt: "HOA2" bitrates: - - 192000 + - 160000 cod: dec: fmt: "HOA3" @@ -89,7 +89,7 @@ conditions_to_generate: type: ivas sba_fmt: "HOA2" bitrates: - - 256000 + - 192000 cod: dec: fmt: "HOA3" -- GitLab From 2888b27cfce73e814fdd2486b80a0a0423877ef7 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 12:07:21 +0200 Subject: [PATCH 11/22] sba_format -> sba_fmt in MASA P800 tests --- .../selection/P800-8/config/P800-8-cat1.yml | 20 ++++++++-------- .../selection/P800-8/config/P800-8-cat2.yml | 20 ++++++++-------- .../selection/P800-8/config/P800-8-cat3.yml | 20 ++++++++-------- .../selection/P800-8/config/P800-8-cat4.yml | 20 ++++++++-------- .../selection/P800-8/config/P800-8-cat5.yml | 20 ++++++++-------- .../selection/P800-8/config/P800-8-cat6.yml | 20 ++++++++-------- .../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 +++++++++---------- 12 files changed, 132 insertions(+), 132 deletions(-) diff --git a/experiments/selection/P800-8/config/P800-8-cat1.yml b/experiments/selection/P800-8/config/P800-8-cat1.yml index 866cb1d1..7ca88fc9 100644 --- a/experiments/selection/P800-8/config/P800-8-cat1.yml +++ b/experiments/selection/P800-8/config/P800-8-cat1.yml @@ -72,7 +72,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -80,7 +80,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -88,7 +88,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -96,7 +96,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -104,7 +104,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -112,7 +112,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -161,7 +161,7 @@ conditions_to_generate: c20: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -172,7 +172,7 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -183,7 +183,7 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -194,7 +194,7 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: diff --git a/experiments/selection/P800-8/config/P800-8-cat2.yml b/experiments/selection/P800-8/config/P800-8-cat2.yml index 0d5c24fb..c161174b 100644 --- a/experiments/selection/P800-8/config/P800-8-cat2.yml +++ b/experiments/selection/P800-8/config/P800-8-cat2.yml @@ -72,7 +72,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -80,7 +80,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -88,7 +88,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -96,7 +96,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -104,7 +104,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -112,7 +112,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -161,7 +161,7 @@ conditions_to_generate: c20: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -172,7 +172,7 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -183,7 +183,7 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -194,7 +194,7 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: diff --git a/experiments/selection/P800-8/config/P800-8-cat3.yml b/experiments/selection/P800-8/config/P800-8-cat3.yml index 9b441aec..cffea87a 100644 --- a/experiments/selection/P800-8/config/P800-8-cat3.yml +++ b/experiments/selection/P800-8/config/P800-8-cat3.yml @@ -72,7 +72,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -80,7 +80,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -88,7 +88,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -96,7 +96,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -104,7 +104,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -112,7 +112,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -161,7 +161,7 @@ conditions_to_generate: c20: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -172,7 +172,7 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -183,7 +183,7 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -194,7 +194,7 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: diff --git a/experiments/selection/P800-8/config/P800-8-cat4.yml b/experiments/selection/P800-8/config/P800-8-cat4.yml index 1044726f..13f2766e 100644 --- a/experiments/selection/P800-8/config/P800-8-cat4.yml +++ b/experiments/selection/P800-8/config/P800-8-cat4.yml @@ -72,7 +72,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -80,7 +80,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -88,7 +88,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -96,7 +96,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -104,7 +104,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -112,7 +112,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -161,7 +161,7 @@ conditions_to_generate: c20: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -172,7 +172,7 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -183,7 +183,7 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -194,7 +194,7 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: diff --git a/experiments/selection/P800-8/config/P800-8-cat5.yml b/experiments/selection/P800-8/config/P800-8-cat5.yml index fa32fefd..e96679cc 100644 --- a/experiments/selection/P800-8/config/P800-8-cat5.yml +++ b/experiments/selection/P800-8/config/P800-8-cat5.yml @@ -72,7 +72,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -80,7 +80,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -88,7 +88,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -96,7 +96,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -104,7 +104,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -112,7 +112,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -161,7 +161,7 @@ conditions_to_generate: c20: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -172,7 +172,7 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -183,7 +183,7 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -194,7 +194,7 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: diff --git a/experiments/selection/P800-8/config/P800-8-cat6.yml b/experiments/selection/P800-8/config/P800-8-cat6.yml index 1aedcae4..e9481d71 100644 --- a/experiments/selection/P800-8/config/P800-8-cat6.yml +++ b/experiments/selection/P800-8/config/P800-8-cat6.yml @@ -72,7 +72,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -80,7 +80,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -88,7 +88,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -96,7 +96,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -104,7 +104,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -112,7 +112,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -161,7 +161,7 @@ conditions_to_generate: c20: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -172,7 +172,7 @@ conditions_to_generate: error_rate: 5 c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -183,7 +183,7 @@ conditions_to_generate: error_rate: 5 c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -194,7 +194,7 @@ conditions_to_generate: error_rate: 5 c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: diff --git a/experiments/selection/P800-9/config/P800-9-cat1.yml b/experiments/selection/P800-9/config/P800-9-cat1.yml index be871ebc..04afaaa5 100644 --- a/experiments/selection/P800-9/config/P800-9-cat1.yml +++ b/experiments/selection/P800-9/config/P800-9-cat1.yml @@ -77,7 +77,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -85,7 +85,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -93,7 +93,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -101,7 +101,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -109,7 +109,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -117,7 +117,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -151,7 +151,7 @@ conditions_to_generate: c18: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -159,7 +159,7 @@ conditions_to_generate: dec: c19: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -167,7 +167,7 @@ conditions_to_generate: dec: c20: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -175,7 +175,7 @@ conditions_to_generate: dec: c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -183,7 +183,7 @@ conditions_to_generate: dec: c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -191,7 +191,7 @@ conditions_to_generate: dec: c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: diff --git a/experiments/selection/P800-9/config/P800-9-cat2.yml b/experiments/selection/P800-9/config/P800-9-cat2.yml index 25e3b8a1..001c9447 100644 --- a/experiments/selection/P800-9/config/P800-9-cat2.yml +++ b/experiments/selection/P800-9/config/P800-9-cat2.yml @@ -77,7 +77,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -85,7 +85,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -93,7 +93,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -101,7 +101,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -109,7 +109,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -117,7 +117,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -151,7 +151,7 @@ conditions_to_generate: c18: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -159,7 +159,7 @@ conditions_to_generate: dec: c19: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -167,7 +167,7 @@ conditions_to_generate: dec: c20: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -175,7 +175,7 @@ conditions_to_generate: dec: c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -183,7 +183,7 @@ conditions_to_generate: dec: c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -191,7 +191,7 @@ conditions_to_generate: dec: c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: diff --git a/experiments/selection/P800-9/config/P800-9-cat3.yml b/experiments/selection/P800-9/config/P800-9-cat3.yml index 876cbef5..5ab05e0c 100644 --- a/experiments/selection/P800-9/config/P800-9-cat3.yml +++ b/experiments/selection/P800-9/config/P800-9-cat3.yml @@ -77,7 +77,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -85,7 +85,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -93,7 +93,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -101,7 +101,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -109,7 +109,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -117,7 +117,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -151,7 +151,7 @@ conditions_to_generate: c18: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -159,7 +159,7 @@ conditions_to_generate: dec: c19: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -167,7 +167,7 @@ conditions_to_generate: dec: c20: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -175,7 +175,7 @@ conditions_to_generate: dec: c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -183,7 +183,7 @@ conditions_to_generate: dec: c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -191,7 +191,7 @@ conditions_to_generate: dec: c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: diff --git a/experiments/selection/P800-9/config/P800-9-cat4.yml b/experiments/selection/P800-9/config/P800-9-cat4.yml index ef333f45..ba0b56e4 100644 --- a/experiments/selection/P800-9/config/P800-9-cat4.yml +++ b/experiments/selection/P800-9/config/P800-9-cat4.yml @@ -77,7 +77,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -85,7 +85,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -93,7 +93,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -101,7 +101,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -109,7 +109,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -117,7 +117,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -151,7 +151,7 @@ conditions_to_generate: c18: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -159,7 +159,7 @@ conditions_to_generate: dec: c19: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -167,7 +167,7 @@ conditions_to_generate: dec: c20: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -175,7 +175,7 @@ conditions_to_generate: dec: c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -183,7 +183,7 @@ conditions_to_generate: dec: c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -191,7 +191,7 @@ conditions_to_generate: dec: c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: diff --git a/experiments/selection/P800-9/config/P800-9-cat5.yml b/experiments/selection/P800-9/config/P800-9-cat5.yml index 4d0a54dd..0b518e30 100644 --- a/experiments/selection/P800-9/config/P800-9-cat5.yml +++ b/experiments/selection/P800-9/config/P800-9-cat5.yml @@ -77,7 +77,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -85,7 +85,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -93,7 +93,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -101,7 +101,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -109,7 +109,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -117,7 +117,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -151,7 +151,7 @@ conditions_to_generate: c18: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -159,7 +159,7 @@ conditions_to_generate: dec: c19: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -167,7 +167,7 @@ conditions_to_generate: dec: c20: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -175,7 +175,7 @@ conditions_to_generate: dec: c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -183,7 +183,7 @@ conditions_to_generate: dec: c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -191,7 +191,7 @@ conditions_to_generate: dec: c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: diff --git a/experiments/selection/P800-9/config/P800-9-cat6.yml b/experiments/selection/P800-9/config/P800-9-cat6.yml index 36e9a382..83ed2eaa 100644 --- a/experiments/selection/P800-9/config/P800-9-cat6.yml +++ b/experiments/selection/P800-9/config/P800-9-cat6.yml @@ -77,7 +77,7 @@ conditions_to_generate: # ### EVS condition ################################ c09: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -85,7 +85,7 @@ conditions_to_generate: dec: c10: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -93,7 +93,7 @@ conditions_to_generate: dec: c11: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -101,7 +101,7 @@ conditions_to_generate: dec: c12: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -109,7 +109,7 @@ conditions_to_generate: dec: c13: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -117,7 +117,7 @@ conditions_to_generate: dec: c14: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: @@ -151,7 +151,7 @@ conditions_to_generate: c18: type: evs - sba_format: "PLANARFOA" + sba_fmt: "PLANARFOA" bitrates: - 7200 cod: @@ -159,7 +159,7 @@ conditions_to_generate: dec: c19: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 7200 cod: @@ -167,7 +167,7 @@ conditions_to_generate: dec: c20: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 8000 cod: @@ -175,7 +175,7 @@ conditions_to_generate: dec: c21: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 9600 cod: @@ -183,7 +183,7 @@ conditions_to_generate: dec: c22: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 16400 cod: @@ -191,7 +191,7 @@ conditions_to_generate: dec: c23: type: evs - sba_format: "FOA" + sba_fmt: "FOA" bitrates: - 24400 cod: -- GitLab From 7826f4d52d711e043f8c73d0310704d3305ef031 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 12:09:27 +0200 Subject: [PATCH 12/22] adapt BS1534-5b --- experiments/selection/BS1534-5b/config/BS1534-5b.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/experiments/selection/BS1534-5b/config/BS1534-5b.yml b/experiments/selection/BS1534-5b/config/BS1534-5b.yml index 2599f3c5..0ba46178 100644 --- a/experiments/selection/BS1534-5b/config/BS1534-5b.yml +++ b/experiments/selection/BS1534-5b/config/BS1534-5b.yml @@ -67,24 +67,16 @@ conditions_to_generate: cod: opts: ["-max_band", "FB"] dec: - c05: - type: evs - sba_fmt: "FOA" - bitrates: - - 96000 - cod: - opts: ["-max_band", "FB"] - dec: ### IVAS condition ############################### - c06: + c05: type: ivas bitrates: - 384000 cod: dec: fmt: "HOA3" - c07: + c06: type: ivas bitrates: - 512000 -- GitLab From f401e1ebeb728ecdf6c4b09c120fd5e61f300258 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 12:11:17 +0200 Subject: [PATCH 13/22] adapt BS1534-6b --- .../selection/BS1534-6b/config/BS1534-6b.yml | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/experiments/selection/BS1534-6b/config/BS1534-6b.yml b/experiments/selection/BS1534-6b/config/BS1534-6b.yml index 74e45cf7..de89b791 100644 --- a/experiments/selection/BS1534-6b/config/BS1534-6b.yml +++ b/experiments/selection/BS1534-6b/config/BS1534-6b.yml @@ -61,32 +61,40 @@ conditions_to_generate: c04: type: evs bitrates: - - 24400 + - 32000 + cod: + opts: ["-max_band", "FB"] + dec: + c05: + type: evs + bitrates: + - 64000 cod: opts: ["-max_band", "FB"] dec: - tx: - type: "FER" - error_rate: 5 ### IVAS condition ############################### - c05: + c06: type: ivas bitrates: - 96000 cod: dec: fmt: "ISM4" - c06: + c07: type: ivas bitrates: - - 96000 + - 128000 + cod: + dec: + fmt: "ISM4" + c08: + type: ivas + bitrates: + - 256000 cod: dec: fmt: "ISM4" - tx: - type: "FER" - error_rate: 5 ################################################ ### Post-processing -- GitLab From 3bf7ab2b4f4b21e19066b960b3e10ec51180f34b Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 12:12:41 +0200 Subject: [PATCH 14/22] remove frame errors from BS1534-1b --- .../selection/BS1534-1b/config/BS1534-1b.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/experiments/selection/BS1534-1b/config/BS1534-1b.yml b/experiments/selection/BS1534-1b/config/BS1534-1b.yml index d3492185..7f848e6f 100644 --- a/experiments/selection/BS1534-1b/config/BS1534-1b.yml +++ b/experiments/selection/BS1534-1b/config/BS1534-1b.yml @@ -58,9 +58,6 @@ conditions_to_generate: cod: opts: ["-max_band", "FB"] dec: - tx: - type: "FER" - error_rate: 5 c04: type: evs bitrates: @@ -68,9 +65,6 @@ conditions_to_generate: cod: opts: ["-max_band", "FB"] dec: - tx: - type: "FER" - error_rate: 5 c05: type: evs bitrates: @@ -78,9 +72,6 @@ conditions_to_generate: cod: opts: ["-max_band", "FB"] dec: - tx: - type: "FER" - error_rate: 5 ### IVAS condition ############################### c06: @@ -90,9 +81,6 @@ conditions_to_generate: cod: dec: fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 c07: type: ivas bitrates: @@ -100,9 +88,6 @@ conditions_to_generate: cod: dec: fmt: "STEREO" - tx: - type: "FER" - error_rate: 5 ################################################ ### Post-processing -- GitLab From 24a2ef560eeea033bd235ca75fa3d44b40068efa Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 12:16:29 +0200 Subject: [PATCH 15/22] adapt BS1534-7 a and b --- .../selection/BS1534-7a/config/BS1534-7a.yml | 30 ++++++++----------- .../selection/BS1534-7b/config/BS1534-7b.yml | 27 +++-------------- 2 files changed, 17 insertions(+), 40 deletions(-) diff --git a/experiments/selection/BS1534-7a/config/BS1534-7a.yml b/experiments/selection/BS1534-7a/config/BS1534-7a.yml index b92ae405..904f3358 100644 --- a/experiments/selection/BS1534-7a/config/BS1534-7a.yml +++ b/experiments/selection/BS1534-7a/config/BS1534-7a.yml @@ -53,43 +53,42 @@ conditions_to_generate: ### EVS condition ################################ c03: type: evs + sba_format: "FOA" bitrates: - - 24400 + - 32000 cod: opts: ["-max_band", "FB"] dec: c04: type: evs + sba_format: "FOA" bitrates: - - 24400 + - 48000 cod: - fmt: "MASA2" opts: ["-max_band", "FB"] dec: c05: type: evs bitrates: - - 16400 + - 32000 cod: + fmt: "MASA2" opts: ["-max_band", "FB"] dec: - tx: - type: "FER" - error_rate: 5 - - ### IVAS condition ############################### c06: - type: ivas + type: evs bitrates: - - 64000 + - 48000 cod: fmt: "MASA2" + opts: ["-max_band", "FB"] dec: - fmt: "MASA2" + + ### IVAS condition ############################### c07: type: ivas bitrates: - - 80000 + - 96000 cod: fmt: "MASA2" dec: @@ -97,14 +96,11 @@ conditions_to_generate: c08: type: ivas bitrates: - - 48000 + - 128000 cod: fmt: "MASA2" dec: fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 ################################################ ### Post-processing diff --git a/experiments/selection/BS1534-7b/config/BS1534-7b.yml b/experiments/selection/BS1534-7b/config/BS1534-7b.yml index d4984f4d..dfe571a6 100644 --- a/experiments/selection/BS1534-7b/config/BS1534-7b.yml +++ b/experiments/selection/BS1534-7b/config/BS1534-7b.yml @@ -53,6 +53,7 @@ conditions_to_generate: ### EVS condition ################################ c03: type: evs + sba_format: "FOA" bitrates: - 48000 cod: @@ -60,6 +61,7 @@ conditions_to_generate: dec: c04: type: evs + sba_format: "FOA" bitrates: - 96000 cod: @@ -68,7 +70,7 @@ conditions_to_generate: c05: type: evs bitrates: - - 48000 + - 64000 cod: fmt: "MASA2" opts: ["-max_band", "FB"] @@ -81,22 +83,12 @@ conditions_to_generate: fmt: "MASA2" opts: ["-max_band", "FB"] dec: - c07: - type: evs - bitrates: - - 32000 - cod: - opts: ["-max_band", "FB"] - dec: - tx: - type: "FER" - error_rate: 5 ### IVAS condition ############################### c08: type: ivas bitrates: - - 160000 + - 192000 cod: fmt: "MASA2" dec: @@ -109,17 +101,6 @@ conditions_to_generate: fmt: "MASA2" dec: fmt: "MASA2" - c10: - type: ivas - bitrates: - - 96000 - cod: - fmt: "MASA2" - dec: - fmt: "MASA2" - tx: - type: "FER" - error_rate: 5 ################################################ ### Post-processing -- GitLab From 05fa3cba4c9ccb8ca571d0822fd6bbbbc838dbe6 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 13:52:48 +0200 Subject: [PATCH 16/22] adapt preprocessing for BS1534 experiments --- experiments/selection/BS1534-1a/config/BS1534-1a.yml | 7 +++---- experiments/selection/BS1534-1b/config/BS1534-1b.yml | 7 +++---- experiments/selection/BS1534-2a/config/BS1534-2a.yml | 7 +++---- experiments/selection/BS1534-2b/config/BS1534-2b.yml | 7 +++---- experiments/selection/BS1534-3a/config/BS1534-3a.yml | 7 +++---- experiments/selection/BS1534-3b/config/BS1534-3b.yml | 7 +++---- experiments/selection/BS1534-4a/config/BS1534-4a.yml | 7 +++---- experiments/selection/BS1534-4b/config/BS1534-4b.yml | 7 +++---- experiments/selection/BS1534-5a/config/BS1534-5a.yml | 7 +++---- experiments/selection/BS1534-5b/config/BS1534-5b.yml | 7 +++---- experiments/selection/BS1534-6a/config/BS1534-6a.yml | 7 +++---- experiments/selection/BS1534-6b/config/BS1534-6b.yml | 7 +++---- experiments/selection/BS1534-7a/config/BS1534-7a.yml | 7 +++---- experiments/selection/BS1534-7b/config/BS1534-7b.yml | 7 +++---- 14 files changed, 42 insertions(+), 56 deletions(-) diff --git a/experiments/selection/BS1534-1a/config/BS1534-1a.yml b/experiments/selection/BS1534-1a/config/BS1534-1a.yml index b18c13eb..4ed1bf73 100644 --- a/experiments/selection/BS1534-1a/config/BS1534-1a.yml +++ b/experiments/selection/BS1534-1a/config/BS1534-1a.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-1b/config/BS1534-1b.yml b/experiments/selection/BS1534-1b/config/BS1534-1b.yml index 7f848e6f..742b61e4 100644 --- a/experiments/selection/BS1534-1b/config/BS1534-1b.yml +++ b/experiments/selection/BS1534-1b/config/BS1534-1b.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-2a/config/BS1534-2a.yml b/experiments/selection/BS1534-2a/config/BS1534-2a.yml index 8c466f3d..543adb69 100644 --- a/experiments/selection/BS1534-2a/config/BS1534-2a.yml +++ b/experiments/selection/BS1534-2a/config/BS1534-2a.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-2b/config/BS1534-2b.yml b/experiments/selection/BS1534-2b/config/BS1534-2b.yml index 23f361e0..fcaf4dfa 100644 --- a/experiments/selection/BS1534-2b/config/BS1534-2b.yml +++ b/experiments/selection/BS1534-2b/config/BS1534-2b.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-3a/config/BS1534-3a.yml b/experiments/selection/BS1534-3a/config/BS1534-3a.yml index f439f864..dfaf1808 100644 --- a/experiments/selection/BS1534-3a/config/BS1534-3a.yml +++ b/experiments/selection/BS1534-3a/config/BS1534-3a.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-3b/config/BS1534-3b.yml b/experiments/selection/BS1534-3b/config/BS1534-3b.yml index e3045430..7c15efd7 100644 --- a/experiments/selection/BS1534-3b/config/BS1534-3b.yml +++ b/experiments/selection/BS1534-3b/config/BS1534-3b.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-4a/config/BS1534-4a.yml b/experiments/selection/BS1534-4a/config/BS1534-4a.yml index 6a80a5ed..9da29696 100644 --- a/experiments/selection/BS1534-4a/config/BS1534-4a.yml +++ b/experiments/selection/BS1534-4a/config/BS1534-4a.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-4b/config/BS1534-4b.yml b/experiments/selection/BS1534-4b/config/BS1534-4b.yml index e1a71372..fb6d37f8 100644 --- a/experiments/selection/BS1534-4b/config/BS1534-4b.yml +++ b/experiments/selection/BS1534-4b/config/BS1534-4b.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-5a/config/BS1534-5a.yml b/experiments/selection/BS1534-5a/config/BS1534-5a.yml index 49bc562a..2055da7c 100644 --- a/experiments/selection/BS1534-5a/config/BS1534-5a.yml +++ b/experiments/selection/BS1534-5a/config/BS1534-5a.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-5b/config/BS1534-5b.yml b/experiments/selection/BS1534-5b/config/BS1534-5b.yml index 0ba46178..3702d644 100644 --- a/experiments/selection/BS1534-5b/config/BS1534-5b.yml +++ b/experiments/selection/BS1534-5b/config/BS1534-5b.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-6a/config/BS1534-6a.yml b/experiments/selection/BS1534-6a/config/BS1534-6a.yml index f622da2c..8d69f1f7 100644 --- a/experiments/selection/BS1534-6a/config/BS1534-6a.yml +++ b/experiments/selection/BS1534-6a/config/BS1534-6a.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-6b/config/BS1534-6b.yml b/experiments/selection/BS1534-6b/config/BS1534-6b.yml index de89b791..d7d5763a 100644 --- a/experiments/selection/BS1534-6b/config/BS1534-6b.yml +++ b/experiments/selection/BS1534-6b/config/BS1534-6b.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-7a/config/BS1534-7a.yml b/experiments/selection/BS1534-7a/config/BS1534-7a.yml index 904f3358..89da64b0 100644 --- a/experiments/selection/BS1534-7a/config/BS1534-7a.yml +++ b/experiments/selection/BS1534-7a/config/BS1534-7a.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/BS1534-7b/config/BS1534-7b.yml b/experiments/selection/BS1534-7b/config/BS1534-7b.yml index dfe571a6..f3d268f9 100644 --- a/experiments/selection/BS1534-7b/config/BS1534-7b.yml +++ b/experiments/selection/BS1534-7b/config/BS1534-7b.yml @@ -31,10 +31,9 @@ preprocessing: ### Pre-processing on whole signal(s) ################################################ preprocessing_2: - concatenate_input: true - # concatenation_order: [] - preamble: 10000 - preamble_noise: true + concatenate_input: false + preamble_noise: false + repeat_signal: true ################################################# ### Bitstream processing -- GitLab From 20b1da5b22d7442fba6322533d05038e211eae54 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 13:56:44 +0200 Subject: [PATCH 17/22] adapt preprocessing for P800 experiments --- experiments/selection/P800-1/config/P800-1-cat1.yml | 6 ++++++ experiments/selection/P800-1/config/P800-1-cat2.yml | 6 ++++++ experiments/selection/P800-1/config/P800-1-cat3.yml | 6 ++++++ experiments/selection/P800-1/config/P800-1-cat4.yml | 6 ++++++ experiments/selection/P800-1/config/P800-1-cat5.yml | 6 ++++++ experiments/selection/P800-1/config/P800-1-cat6.yml | 6 ++++++ experiments/selection/P800-3/config/P800-3-cat1.yml | 1 + experiments/selection/P800-3/config/P800-3-cat2.yml | 1 + experiments/selection/P800-3/config/P800-3-cat3.yml | 1 + experiments/selection/P800-3/config/P800-3-cat4.yml | 1 + experiments/selection/P800-3/config/P800-3-cat5.yml | 1 + experiments/selection/P800-3/config/P800-3-cat6.yml | 1 + experiments/selection/P800-4/config/P800-4-cat1.yml | 5 +++++ experiments/selection/P800-4/config/P800-4-cat2.yml | 6 ++++++ experiments/selection/P800-4/config/P800-4-cat3.yml | 6 ++++++ experiments/selection/P800-4/config/P800-4-cat4.yml | 6 ++++++ experiments/selection/P800-4/config/P800-4-cat5.yml | 6 ++++++ experiments/selection/P800-4/config/P800-4-cat6.yml | 6 ++++++ experiments/selection/P800-5/config/P800-5-cat1.yml | 4 ++-- experiments/selection/P800-5/config/P800-5-cat2.yml | 3 ++- experiments/selection/P800-5/config/P800-5-cat3.yml | 3 ++- experiments/selection/P800-5/config/P800-5-cat4.yml | 3 ++- experiments/selection/P800-5/config/P800-5-cat5.yml | 3 ++- experiments/selection/P800-5/config/P800-5-cat6.yml | 3 ++- experiments/selection/P800-6/config/P800-6-cat1.yml | 1 + experiments/selection/P800-6/config/P800-6-cat2.yml | 1 + experiments/selection/P800-6/config/P800-6-cat3.yml | 1 + experiments/selection/P800-6/config/P800-6-cat4.yml | 1 + experiments/selection/P800-6/config/P800-6-cat5.yml | 1 + experiments/selection/P800-6/config/P800-6-cat6.yml | 1 + experiments/selection/P800-7/config/P800-7-cat1.yml | 1 + experiments/selection/P800-7/config/P800-7-cat2.yml | 1 + experiments/selection/P800-7/config/P800-7-cat3.yml | 1 + experiments/selection/P800-7/config/P800-7-cat4.yml | 1 + experiments/selection/P800-7/config/P800-7-cat5.yml | 1 + experiments/selection/P800-7/config/P800-7-cat6.yml | 1 + experiments/selection/P800-8/config/P800-8-cat1.yml | 5 +++++ experiments/selection/P800-8/config/P800-8-cat2.yml | 6 ++++++ experiments/selection/P800-8/config/P800-8-cat3.yml | 6 ++++++ experiments/selection/P800-8/config/P800-8-cat4.yml | 6 ++++++ experiments/selection/P800-8/config/P800-8-cat5.yml | 6 ++++++ experiments/selection/P800-8/config/P800-8-cat6.yml | 6 ++++++ experiments/selection/P800-9/config/P800-9-cat1.yml | 2 +- experiments/selection/P800-9/config/P800-9-cat2.yml | 2 +- 44 files changed, 138 insertions(+), 9 deletions(-) diff --git a/experiments/selection/P800-1/config/P800-1-cat1.yml b/experiments/selection/P800-1/config/P800-1-cat1.yml index af8e8e34..378c9ebb 100644 --- a/experiments/selection/P800-1/config/P800-1-cat1.yml +++ b/experiments/selection/P800-1/config/P800-1-cat1.yml @@ -36,6 +36,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat1.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-1/config/P800-1-cat2.yml b/experiments/selection/P800-1/config/P800-1-cat2.yml index f917f7e2..4db37ded 100644 --- a/experiments/selection/P800-1/config/P800-1-cat2.yml +++ b/experiments/selection/P800-1/config/P800-1-cat2.yml @@ -35,6 +35,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat2.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-1/config/P800-1-cat3.yml b/experiments/selection/P800-1/config/P800-1-cat3.yml index 3f0d7754..976e1cfb 100644 --- a/experiments/selection/P800-1/config/P800-1-cat3.yml +++ b/experiments/selection/P800-1/config/P800-1-cat3.yml @@ -35,6 +35,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat3.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-1/config/P800-1-cat4.yml b/experiments/selection/P800-1/config/P800-1-cat4.yml index 92e14190..0a0502f7 100644 --- a/experiments/selection/P800-1/config/P800-1-cat4.yml +++ b/experiments/selection/P800-1/config/P800-1-cat4.yml @@ -35,6 +35,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat4.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-1/config/P800-1-cat5.yml b/experiments/selection/P800-1/config/P800-1-cat5.yml index 3a34bd80..c5bb4078 100644 --- a/experiments/selection/P800-1/config/P800-1-cat5.yml +++ b/experiments/selection/P800-1/config/P800-1-cat5.yml @@ -35,6 +35,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat5.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-1/config/P800-1-cat6.yml b/experiments/selection/P800-1/config/P800-1-cat6.yml index b3e293d4..ade9bbe1 100644 --- a/experiments/selection/P800-1/config/P800-1-cat6.yml +++ b/experiments/selection/P800-1/config/P800-1-cat6.yml @@ -35,6 +35,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-1/background_noise/background_noise_cat6.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-3/config/P800-3-cat1.yml b/experiments/selection/P800-3/config/P800-3-cat1.yml index a5b5c284..b6b5349c 100644 --- a/experiments/selection/P800-3/config/P800-3-cat1.yml +++ b/experiments/selection/P800-3/config/P800-3-cat1.yml @@ -34,6 +34,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-3/config/P800-3-cat2.yml b/experiments/selection/P800-3/config/P800-3-cat2.yml index 64b1cd46..fff313b4 100644 --- a/experiments/selection/P800-3/config/P800-3-cat2.yml +++ b/experiments/selection/P800-3/config/P800-3-cat2.yml @@ -33,6 +33,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-3/config/P800-3-cat3.yml b/experiments/selection/P800-3/config/P800-3-cat3.yml index d7aee34d..438b05c4 100644 --- a/experiments/selection/P800-3/config/P800-3-cat3.yml +++ b/experiments/selection/P800-3/config/P800-3-cat3.yml @@ -33,6 +33,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-3/config/P800-3-cat4.yml b/experiments/selection/P800-3/config/P800-3-cat4.yml index ae2b91d0..59e76424 100644 --- a/experiments/selection/P800-3/config/P800-3-cat4.yml +++ b/experiments/selection/P800-3/config/P800-3-cat4.yml @@ -33,6 +33,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-3/config/P800-3-cat5.yml b/experiments/selection/P800-3/config/P800-3-cat5.yml index a922d2d1..2a713814 100644 --- a/experiments/selection/P800-3/config/P800-3-cat5.yml +++ b/experiments/selection/P800-3/config/P800-3-cat5.yml @@ -33,6 +33,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-3/config/P800-3-cat6.yml b/experiments/selection/P800-3/config/P800-3-cat6.yml index 3479ad06..93597889 100644 --- a/experiments/selection/P800-3/config/P800-3-cat6.yml +++ b/experiments/selection/P800-3/config/P800-3-cat6.yml @@ -33,6 +33,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-4/config/P800-4-cat1.yml b/experiments/selection/P800-4/config/P800-4-cat1.yml index efb62c8f..5ec17e36 100644 --- a/experiments/selection/P800-4/config/P800-4-cat1.yml +++ b/experiments/selection/P800-4/config/P800-4-cat1.yml @@ -38,6 +38,11 @@ preprocessing_2: preamble: 10000 preamble_noise: true repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat1.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-4/config/P800-4-cat2.yml b/experiments/selection/P800-4/config/P800-4-cat2.yml index 1639f9c5..c3ac28c5 100644 --- a/experiments/selection/P800-4/config/P800-4-cat2.yml +++ b/experiments/selection/P800-4/config/P800-4-cat2.yml @@ -36,6 +36,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat2.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-4/config/P800-4-cat3.yml b/experiments/selection/P800-4/config/P800-4-cat3.yml index aa87e060..e4437ae4 100644 --- a/experiments/selection/P800-4/config/P800-4-cat3.yml +++ b/experiments/selection/P800-4/config/P800-4-cat3.yml @@ -36,6 +36,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat3.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-4/config/P800-4-cat4.yml b/experiments/selection/P800-4/config/P800-4-cat4.yml index 9253e4b9..badbc02e 100644 --- a/experiments/selection/P800-4/config/P800-4-cat4.yml +++ b/experiments/selection/P800-4/config/P800-4-cat4.yml @@ -36,6 +36,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat4.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-4/config/P800-4-cat5.yml b/experiments/selection/P800-4/config/P800-4-cat5.yml index 3062dfb6..6d5f05f7 100644 --- a/experiments/selection/P800-4/config/P800-4-cat5.yml +++ b/experiments/selection/P800-4/config/P800-4-cat5.yml @@ -36,6 +36,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat5.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-4/config/P800-4-cat6.yml b/experiments/selection/P800-4/config/P800-4-cat6.yml index a390497e..a8b5b319 100644 --- a/experiments/selection/P800-4/config/P800-4-cat6.yml +++ b/experiments/selection/P800-4/config/P800-4-cat6.yml @@ -36,6 +36,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-4/background_noise/background_noise_cat6.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-5/config/P800-5-cat1.yml b/experiments/selection/P800-5/config/P800-5-cat1.yml index f26f5c34..03c07bbf 100644 --- a/experiments/selection/P800-5/config/P800-5-cat1.yml +++ b/experiments/selection/P800-5/config/P800-5-cat1.yml @@ -37,12 +37,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 15 + snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat1.wav" - repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-5/config/P800-5-cat2.yml b/experiments/selection/P800-5/config/P800-5-cat2.yml index f3c50a88..c40cc88b 100644 --- a/experiments/selection/P800-5/config/P800-5-cat2.yml +++ b/experiments/selection/P800-5/config/P800-5-cat2.yml @@ -36,9 +36,10 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 15 + snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat2.wav" diff --git a/experiments/selection/P800-5/config/P800-5-cat3.yml b/experiments/selection/P800-5/config/P800-5-cat3.yml index 60598cf2..913c0417 100644 --- a/experiments/selection/P800-5/config/P800-5-cat3.yml +++ b/experiments/selection/P800-5/config/P800-5-cat3.yml @@ -36,9 +36,10 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 15 + snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat3.wav" diff --git a/experiments/selection/P800-5/config/P800-5-cat4.yml b/experiments/selection/P800-5/config/P800-5-cat4.yml index a2033f3a..ed5b2a69 100644 --- a/experiments/selection/P800-5/config/P800-5-cat4.yml +++ b/experiments/selection/P800-5/config/P800-5-cat4.yml @@ -36,9 +36,10 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 15 + snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat4.wav" diff --git a/experiments/selection/P800-5/config/P800-5-cat5.yml b/experiments/selection/P800-5/config/P800-5-cat5.yml index 609657f7..fd6d66d9 100644 --- a/experiments/selection/P800-5/config/P800-5-cat5.yml +++ b/experiments/selection/P800-5/config/P800-5-cat5.yml @@ -36,9 +36,10 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 15 + snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat5.wav" diff --git a/experiments/selection/P800-5/config/P800-5-cat6.yml b/experiments/selection/P800-5/config/P800-5-cat6.yml index 1cac552a..9d3b2f69 100644 --- a/experiments/selection/P800-5/config/P800-5-cat6.yml +++ b/experiments/selection/P800-5/config/P800-5-cat6.yml @@ -36,9 +36,10 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 15 + snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat6.wav" diff --git a/experiments/selection/P800-6/config/P800-6-cat1.yml b/experiments/selection/P800-6/config/P800-6-cat1.yml index a8038036..8ff35479 100644 --- a/experiments/selection/P800-6/config/P800-6-cat1.yml +++ b/experiments/selection/P800-6/config/P800-6-cat1.yml @@ -36,6 +36,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-6/config/P800-6-cat2.yml b/experiments/selection/P800-6/config/P800-6-cat2.yml index c8dcafe5..2111bc82 100644 --- a/experiments/selection/P800-6/config/P800-6-cat2.yml +++ b/experiments/selection/P800-6/config/P800-6-cat2.yml @@ -35,6 +35,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-6/config/P800-6-cat3.yml b/experiments/selection/P800-6/config/P800-6-cat3.yml index 006dbff9..c8770276 100644 --- a/experiments/selection/P800-6/config/P800-6-cat3.yml +++ b/experiments/selection/P800-6/config/P800-6-cat3.yml @@ -35,6 +35,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-6/config/P800-6-cat4.yml b/experiments/selection/P800-6/config/P800-6-cat4.yml index a21cf72b..c91b66d2 100644 --- a/experiments/selection/P800-6/config/P800-6-cat4.yml +++ b/experiments/selection/P800-6/config/P800-6-cat4.yml @@ -35,6 +35,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-6/config/P800-6-cat5.yml b/experiments/selection/P800-6/config/P800-6-cat5.yml index 2a0317cf..9b96e92e 100644 --- a/experiments/selection/P800-6/config/P800-6-cat5.yml +++ b/experiments/selection/P800-6/config/P800-6-cat5.yml @@ -35,6 +35,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-6/config/P800-6-cat6.yml b/experiments/selection/P800-6/config/P800-6-cat6.yml index 4a376cb6..c7d59946 100644 --- a/experiments/selection/P800-6/config/P800-6-cat6.yml +++ b/experiments/selection/P800-6/config/P800-6-cat6.yml @@ -35,6 +35,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-7/config/P800-7-cat1.yml b/experiments/selection/P800-7/config/P800-7-cat1.yml index 27a4c200..10e50370 100644 --- a/experiments/selection/P800-7/config/P800-7-cat1.yml +++ b/experiments/selection/P800-7/config/P800-7-cat1.yml @@ -36,6 +36,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-7/config/P800-7-cat2.yml b/experiments/selection/P800-7/config/P800-7-cat2.yml index 4bd11885..96972c41 100644 --- a/experiments/selection/P800-7/config/P800-7-cat2.yml +++ b/experiments/selection/P800-7/config/P800-7-cat2.yml @@ -35,6 +35,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-7/config/P800-7-cat3.yml b/experiments/selection/P800-7/config/P800-7-cat3.yml index 0acd49d9..40d2c773 100644 --- a/experiments/selection/P800-7/config/P800-7-cat3.yml +++ b/experiments/selection/P800-7/config/P800-7-cat3.yml @@ -35,6 +35,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-7/config/P800-7-cat4.yml b/experiments/selection/P800-7/config/P800-7-cat4.yml index 9bccb07e..5db48ada 100644 --- a/experiments/selection/P800-7/config/P800-7-cat4.yml +++ b/experiments/selection/P800-7/config/P800-7-cat4.yml @@ -35,6 +35,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-7/config/P800-7-cat5.yml b/experiments/selection/P800-7/config/P800-7-cat5.yml index 6921ab24..f9fc3dca 100644 --- a/experiments/selection/P800-7/config/P800-7-cat5.yml +++ b/experiments/selection/P800-7/config/P800-7-cat5.yml @@ -35,6 +35,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-7/config/P800-7-cat6.yml b/experiments/selection/P800-7/config/P800-7-cat6.yml index 50db89d9..d7b5c76c 100644 --- a/experiments/selection/P800-7/config/P800-7-cat6.yml +++ b/experiments/selection/P800-7/config/P800-7-cat6.yml @@ -35,6 +35,7 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-8/config/P800-8-cat1.yml b/experiments/selection/P800-8/config/P800-8-cat1.yml index 7ca88fc9..42f258c1 100644 --- a/experiments/selection/P800-8/config/P800-8-cat1.yml +++ b/experiments/selection/P800-8/config/P800-8-cat1.yml @@ -35,6 +35,11 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat1.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-8/config/P800-8-cat2.yml b/experiments/selection/P800-8/config/P800-8-cat2.yml index c161174b..b6d73aa8 100644 --- a/experiments/selection/P800-8/config/P800-8-cat2.yml +++ b/experiments/selection/P800-8/config/P800-8-cat2.yml @@ -35,6 +35,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat2.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-8/config/P800-8-cat3.yml b/experiments/selection/P800-8/config/P800-8-cat3.yml index cffea87a..cfcb54e0 100644 --- a/experiments/selection/P800-8/config/P800-8-cat3.yml +++ b/experiments/selection/P800-8/config/P800-8-cat3.yml @@ -35,6 +35,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat3.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-8/config/P800-8-cat4.yml b/experiments/selection/P800-8/config/P800-8-cat4.yml index 13f2766e..5e5bff47 100644 --- a/experiments/selection/P800-8/config/P800-8-cat4.yml +++ b/experiments/selection/P800-8/config/P800-8-cat4.yml @@ -35,6 +35,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat4.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-8/config/P800-8-cat5.yml b/experiments/selection/P800-8/config/P800-8-cat5.yml index e96679cc..d7507008 100644 --- a/experiments/selection/P800-8/config/P800-8-cat5.yml +++ b/experiments/selection/P800-8/config/P800-8-cat5.yml @@ -35,6 +35,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat5.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-8/config/P800-8-cat6.yml b/experiments/selection/P800-8/config/P800-8-cat6.yml index e9481d71..e6e0c93f 100644 --- a/experiments/selection/P800-8/config/P800-8-cat6.yml +++ b/experiments/selection/P800-8/config/P800-8-cat6.yml @@ -35,6 +35,12 @@ preprocessing_2: # concatenation_order: [] preamble: 10000 preamble_noise: true + repeat_signal: true + background_noise: + ### REQUIRED: SNR for background noise in dB + snr: 45 + ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) + background_noise_path: "experiments/selection/P800-8/background_noise/background_noise_cat6.wav" ################################################# ### Bitstream processing diff --git a/experiments/selection/P800-9/config/P800-9-cat1.yml b/experiments/selection/P800-9/config/P800-9-cat1.yml index 04afaaa5..7fe15f8e 100644 --- a/experiments/selection/P800-9/config/P800-9-cat1.yml +++ b/experiments/selection/P800-9/config/P800-9-cat1.yml @@ -37,7 +37,7 @@ preprocessing_2: preamble_noise: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 15 + snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-9/background_noise/background_noise_cat1.wav" diff --git a/experiments/selection/P800-9/config/P800-9-cat2.yml b/experiments/selection/P800-9/config/P800-9-cat2.yml index 001c9447..daf34faf 100644 --- a/experiments/selection/P800-9/config/P800-9-cat2.yml +++ b/experiments/selection/P800-9/config/P800-9-cat2.yml @@ -37,7 +37,7 @@ preprocessing_2: preamble_noise: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 15 + snr: 10 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-9/background_noise/background_noise_cat2.wav" -- GitLab From 420b47b32b67bc6f6e35528539b20cae02aee719 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 30 May 2023 14:51:07 +0200 Subject: [PATCH 18/22] add folders for background noise in folder skeleton --- experiments/selection/P800-1/background_noise/.gitkeep | 0 experiments/selection/P800-4/background_noise/.gitkeep | 0 experiments/selection/P800-8/background_noise/.gitkeep | 0 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 experiments/selection/P800-1/background_noise/.gitkeep create mode 100644 experiments/selection/P800-4/background_noise/.gitkeep create mode 100644 experiments/selection/P800-8/background_noise/.gitkeep diff --git a/experiments/selection/P800-1/background_noise/.gitkeep b/experiments/selection/P800-1/background_noise/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/selection/P800-4/background_noise/.gitkeep b/experiments/selection/P800-4/background_noise/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/experiments/selection/P800-8/background_noise/.gitkeep b/experiments/selection/P800-8/background_noise/.gitkeep new file mode 100644 index 00000000..e69de29b -- GitLab From 2da36b6a24451390e2640a85ff769e9ea06a7af6 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Tue, 30 May 2023 15:14:25 +0200 Subject: [PATCH 19/22] add missing key condition_in_output_filename, harmonize True vs. true for use_windows_codec_binaries --- experiments/selection/P800-1/config/P800-1-cat2.yml | 3 ++- experiments/selection/P800-1/config/P800-1-cat3.yml | 3 ++- experiments/selection/P800-1/config/P800-1-cat4.yml | 3 ++- experiments/selection/P800-1/config/P800-1-cat5.yml | 3 ++- experiments/selection/P800-1/config/P800-1-cat6.yml | 3 ++- experiments/selection/P800-2/config/P800-2-cat2.yml | 3 ++- experiments/selection/P800-2/config/P800-2-cat3.yml | 3 ++- experiments/selection/P800-2/config/P800-2-cat4.yml | 3 ++- experiments/selection/P800-2/config/P800-2-cat5.yml | 3 ++- experiments/selection/P800-2/config/P800-2-cat6.yml | 3 ++- experiments/selection/P800-3/config/P800-3-cat2.yml | 3 ++- experiments/selection/P800-3/config/P800-3-cat3.yml | 3 ++- experiments/selection/P800-3/config/P800-3-cat4.yml | 3 ++- experiments/selection/P800-3/config/P800-3-cat5.yml | 3 ++- experiments/selection/P800-3/config/P800-3-cat6.yml | 3 ++- experiments/selection/P800-4/config/P800-4-cat2.yml | 3 ++- experiments/selection/P800-4/config/P800-4-cat3.yml | 3 ++- experiments/selection/P800-4/config/P800-4-cat4.yml | 3 ++- experiments/selection/P800-4/config/P800-4-cat5.yml | 3 ++- experiments/selection/P800-4/config/P800-4-cat6.yml | 3 ++- experiments/selection/P800-5/config/P800-5-cat2.yml | 3 ++- experiments/selection/P800-5/config/P800-5-cat3.yml | 3 ++- experiments/selection/P800-5/config/P800-5-cat4.yml | 3 ++- experiments/selection/P800-5/config/P800-5-cat5.yml | 3 ++- experiments/selection/P800-5/config/P800-5-cat6.yml | 3 ++- experiments/selection/P800-6/config/P800-6-cat2.yml | 3 ++- experiments/selection/P800-6/config/P800-6-cat3.yml | 3 ++- experiments/selection/P800-6/config/P800-6-cat4.yml | 3 ++- experiments/selection/P800-6/config/P800-6-cat5.yml | 3 ++- experiments/selection/P800-6/config/P800-6-cat6.yml | 3 ++- experiments/selection/P800-7/config/P800-7-cat2.yml | 3 ++- experiments/selection/P800-7/config/P800-7-cat3.yml | 3 ++- experiments/selection/P800-7/config/P800-7-cat4.yml | 3 ++- experiments/selection/P800-7/config/P800-7-cat5.yml | 3 ++- experiments/selection/P800-7/config/P800-7-cat6.yml | 3 ++- 35 files changed, 70 insertions(+), 35 deletions(-) diff --git a/experiments/selection/P800-1/config/P800-1-cat2.yml b/experiments/selection/P800-1/config/P800-1-cat2.yml index 4db37ded..80704d48 100644 --- a/experiments/selection/P800-1/config/P800-1-cat2.yml +++ b/experiments/selection/P800-1/config/P800-1-cat2.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-1/proc_input/cat2" output_path: "experiments/selection/P800-1/proc_output/cat2" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-1/config/P800-1-cat3.yml b/experiments/selection/P800-1/config/P800-1-cat3.yml index 976e1cfb..49602271 100644 --- a/experiments/selection/P800-1/config/P800-1-cat3.yml +++ b/experiments/selection/P800-1/config/P800-1-cat3.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-1/proc_input/cat3" output_path: "experiments/selection/P800-1/proc_output/cat3" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-1/config/P800-1-cat4.yml b/experiments/selection/P800-1/config/P800-1-cat4.yml index 0a0502f7..2d3d92b5 100644 --- a/experiments/selection/P800-1/config/P800-1-cat4.yml +++ b/experiments/selection/P800-1/config/P800-1-cat4.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-1/proc_input/cat4" output_path: "experiments/selection/P800-1/proc_output/cat4" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-1/config/P800-1-cat5.yml b/experiments/selection/P800-1/config/P800-1-cat5.yml index c5bb4078..9956da00 100644 --- a/experiments/selection/P800-1/config/P800-1-cat5.yml +++ b/experiments/selection/P800-1/config/P800-1-cat5.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-1/proc_input/cat5" output_path: "experiments/selection/P800-1/proc_output/cat5" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-1/config/P800-1-cat6.yml b/experiments/selection/P800-1/config/P800-1-cat6.yml index ade9bbe1..bcc7fdd5 100644 --- a/experiments/selection/P800-1/config/P800-1-cat6.yml +++ b/experiments/selection/P800-1/config/P800-1-cat6.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-1/proc_input/cat6" output_path: "experiments/selection/P800-1/proc_output/cat6" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-2/config/P800-2-cat2.yml b/experiments/selection/P800-2/config/P800-2-cat2.yml index edb22a77..a5afa146 100644 --- a/experiments/selection/P800-2/config/P800-2-cat2.yml +++ b/experiments/selection/P800-2/config/P800-2-cat2.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-2/proc_input/cat2" output_path: "experiments/selection/P800-2/proc_output/cat2" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-2/config/P800-2-cat3.yml b/experiments/selection/P800-2/config/P800-2-cat3.yml index 1ba06715..dc1d2c1a 100644 --- a/experiments/selection/P800-2/config/P800-2-cat3.yml +++ b/experiments/selection/P800-2/config/P800-2-cat3.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-2/proc_input/cat3" output_path: "experiments/selection/P800-2/proc_output/cat3" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-2/config/P800-2-cat4.yml b/experiments/selection/P800-2/config/P800-2-cat4.yml index 7ab8a425..da348950 100644 --- a/experiments/selection/P800-2/config/P800-2-cat4.yml +++ b/experiments/selection/P800-2/config/P800-2-cat4.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-2/proc_input/cat4" output_path: "experiments/selection/P800-2/proc_output/cat4" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-2/config/P800-2-cat5.yml b/experiments/selection/P800-2/config/P800-2-cat5.yml index 51cadd20..fe88b1ac 100644 --- a/experiments/selection/P800-2/config/P800-2-cat5.yml +++ b/experiments/selection/P800-2/config/P800-2-cat5.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-2/proc_input/cat5" output_path: "experiments/selection/P800-2/proc_output/cat5" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-2/config/P800-2-cat6.yml b/experiments/selection/P800-2/config/P800-2-cat6.yml index 66f745c8..baf1c8df 100644 --- a/experiments/selection/P800-2/config/P800-2-cat6.yml +++ b/experiments/selection/P800-2/config/P800-2-cat6.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-2/proc_input/cat6" output_path: "experiments/selection/P800-2/proc_output/cat6" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-3/config/P800-3-cat2.yml b/experiments/selection/P800-3/config/P800-3-cat2.yml index fff313b4..73e8abe8 100644 --- a/experiments/selection/P800-3/config/P800-3-cat2.yml +++ b/experiments/selection/P800-3/config/P800-3-cat2.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-3/proc_input/cat2" output_path: "experiments/selection/P800-3/proc_output/cat2" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-3/config/P800-3-cat3.yml b/experiments/selection/P800-3/config/P800-3-cat3.yml index 438b05c4..bbfcc3c8 100644 --- a/experiments/selection/P800-3/config/P800-3-cat3.yml +++ b/experiments/selection/P800-3/config/P800-3-cat3.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-3/proc_input/cat3" output_path: "experiments/selection/P800-3/proc_output/cat3" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-3/config/P800-3-cat4.yml b/experiments/selection/P800-3/config/P800-3-cat4.yml index 59e76424..6837e7c6 100644 --- a/experiments/selection/P800-3/config/P800-3-cat4.yml +++ b/experiments/selection/P800-3/config/P800-3-cat4.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-3/proc_input/cat4" output_path: "experiments/selection/P800-3/proc_output/cat4" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-3/config/P800-3-cat5.yml b/experiments/selection/P800-3/config/P800-3-cat5.yml index 2a713814..470d63f7 100644 --- a/experiments/selection/P800-3/config/P800-3-cat5.yml +++ b/experiments/selection/P800-3/config/P800-3-cat5.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-3/proc_input/cat5" output_path: "experiments/selection/P800-3/proc_output/cat5" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-3/config/P800-3-cat6.yml b/experiments/selection/P800-3/config/P800-3-cat6.yml index 93597889..19d3792a 100644 --- a/experiments/selection/P800-3/config/P800-3-cat6.yml +++ b/experiments/selection/P800-3/config/P800-3-cat6.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-3/proc_input/cat6" output_path: "experiments/selection/P800-3/proc_output/cat6" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-4/config/P800-4-cat2.yml b/experiments/selection/P800-4/config/P800-4-cat2.yml index c3ac28c5..64224b7d 100644 --- a/experiments/selection/P800-4/config/P800-4-cat2.yml +++ b/experiments/selection/P800-4/config/P800-4-cat2.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-4/proc_input/cat2" output_path: "experiments/selection/P800-4/proc_output/cat2" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-4/config/P800-4-cat3.yml b/experiments/selection/P800-4/config/P800-4-cat3.yml index e4437ae4..abaebaac 100644 --- a/experiments/selection/P800-4/config/P800-4-cat3.yml +++ b/experiments/selection/P800-4/config/P800-4-cat3.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-4/proc_input/cat3" output_path: "experiments/selection/P800-4/proc_output/cat3" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-4/config/P800-4-cat4.yml b/experiments/selection/P800-4/config/P800-4-cat4.yml index badbc02e..5b28d3c6 100644 --- a/experiments/selection/P800-4/config/P800-4-cat4.yml +++ b/experiments/selection/P800-4/config/P800-4-cat4.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-4/proc_input/cat4" output_path: "experiments/selection/P800-4/proc_output/cat4" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-4/config/P800-4-cat5.yml b/experiments/selection/P800-4/config/P800-4-cat5.yml index 6d5f05f7..6d267937 100644 --- a/experiments/selection/P800-4/config/P800-4-cat5.yml +++ b/experiments/selection/P800-4/config/P800-4-cat5.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-4/proc_input/cat5" output_path: "experiments/selection/P800-4/proc_output/cat5" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-4/config/P800-4-cat6.yml b/experiments/selection/P800-4/config/P800-4-cat6.yml index a8b5b319..84e38e9c 100644 --- a/experiments/selection/P800-4/config/P800-4-cat6.yml +++ b/experiments/selection/P800-4/config/P800-4-cat6.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-4/proc_input/cat6" output_path: "experiments/selection/P800-4/proc_output/cat6" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-5/config/P800-5-cat2.yml b/experiments/selection/P800-5/config/P800-5-cat2.yml index c40cc88b..465db76d 100644 --- a/experiments/selection/P800-5/config/P800-5-cat2.yml +++ b/experiments/selection/P800-5/config/P800-5-cat2.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-5/proc_input/cat2" output_path: "experiments/selection/P800-5/proc_output/cat2" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-5/config/P800-5-cat3.yml b/experiments/selection/P800-5/config/P800-5-cat3.yml index 913c0417..c27a100b 100644 --- a/experiments/selection/P800-5/config/P800-5-cat3.yml +++ b/experiments/selection/P800-5/config/P800-5-cat3.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-5/proc_input/cat3" output_path: "experiments/selection/P800-5/proc_output/cat3" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-5/config/P800-5-cat4.yml b/experiments/selection/P800-5/config/P800-5-cat4.yml index ed5b2a69..305a2dec 100644 --- a/experiments/selection/P800-5/config/P800-5-cat4.yml +++ b/experiments/selection/P800-5/config/P800-5-cat4.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-5/proc_input/cat4" output_path: "experiments/selection/P800-5/proc_output/cat4" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-5/config/P800-5-cat5.yml b/experiments/selection/P800-5/config/P800-5-cat5.yml index fd6d66d9..c52674ec 100644 --- a/experiments/selection/P800-5/config/P800-5-cat5.yml +++ b/experiments/selection/P800-5/config/P800-5-cat5.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-5/proc_input/cat5" output_path: "experiments/selection/P800-5/proc_output/cat5" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-5/config/P800-5-cat6.yml b/experiments/selection/P800-5/config/P800-5-cat6.yml index 9d3b2f69..dc3c903d 100644 --- a/experiments/selection/P800-5/config/P800-5-cat6.yml +++ b/experiments/selection/P800-5/config/P800-5-cat6.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-5/proc_input/cat6" output_path: "experiments/selection/P800-5/proc_output/cat6" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-6/config/P800-6-cat2.yml b/experiments/selection/P800-6/config/P800-6-cat2.yml index 2111bc82..e4294fdb 100644 --- a/experiments/selection/P800-6/config/P800-6-cat2.yml +++ b/experiments/selection/P800-6/config/P800-6-cat2.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-6/proc_input/cat2" output_path: "experiments/selection/P800-6/proc_output/cat2" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-6/config/P800-6-cat3.yml b/experiments/selection/P800-6/config/P800-6-cat3.yml index c8770276..01800636 100644 --- a/experiments/selection/P800-6/config/P800-6-cat3.yml +++ b/experiments/selection/P800-6/config/P800-6-cat3.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-6/proc_input/cat3" output_path: "experiments/selection/P800-6/proc_output/cat3" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-6/config/P800-6-cat4.yml b/experiments/selection/P800-6/config/P800-6-cat4.yml index c91b66d2..cd729ab0 100644 --- a/experiments/selection/P800-6/config/P800-6-cat4.yml +++ b/experiments/selection/P800-6/config/P800-6-cat4.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-6/proc_input/cat4" output_path: "experiments/selection/P800-6/proc_output/cat4" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-6/config/P800-6-cat5.yml b/experiments/selection/P800-6/config/P800-6-cat5.yml index 9b96e92e..744d9d13 100644 --- a/experiments/selection/P800-6/config/P800-6-cat5.yml +++ b/experiments/selection/P800-6/config/P800-6-cat5.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-6/proc_input/cat5" output_path: "experiments/selection/P800-6/proc_output/cat5" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-6/config/P800-6-cat6.yml b/experiments/selection/P800-6/config/P800-6-cat6.yml index c7d59946..1bd6f8a7 100644 --- a/experiments/selection/P800-6/config/P800-6-cat6.yml +++ b/experiments/selection/P800-6/config/P800-6-cat6.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-6/proc_input/cat6" output_path: "experiments/selection/P800-6/proc_output/cat6" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-7/config/P800-7-cat2.yml b/experiments/selection/P800-7/config/P800-7-cat2.yml index 96972c41..77760adf 100644 --- a/experiments/selection/P800-7/config/P800-7-cat2.yml +++ b/experiments/selection/P800-7/config/P800-7-cat2.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-7/proc_input/cat2" output_path: "experiments/selection/P800-7/proc_output/cat2" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-7/config/P800-7-cat3.yml b/experiments/selection/P800-7/config/P800-7-cat3.yml index 40d2c773..48692ae9 100644 --- a/experiments/selection/P800-7/config/P800-7-cat3.yml +++ b/experiments/selection/P800-7/config/P800-7-cat3.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-7/proc_input/cat3" output_path: "experiments/selection/P800-7/proc_output/cat3" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-7/config/P800-7-cat4.yml b/experiments/selection/P800-7/config/P800-7-cat4.yml index 5db48ada..ed17e8fe 100644 --- a/experiments/selection/P800-7/config/P800-7-cat4.yml +++ b/experiments/selection/P800-7/config/P800-7-cat4.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-7/proc_input/cat4" output_path: "experiments/selection/P800-7/proc_output/cat4" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-7/config/P800-7-cat5.yml b/experiments/selection/P800-7/config/P800-7-cat5.yml index f9fc3dca..af2bc879 100644 --- a/experiments/selection/P800-7/config/P800-7-cat5.yml +++ b/experiments/selection/P800-7/config/P800-7-cat5.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-7/proc_input/cat5" output_path: "experiments/selection/P800-7/proc_output/cat5" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration diff --git a/experiments/selection/P800-7/config/P800-7-cat6.yml b/experiments/selection/P800-7/config/P800-7-cat6.yml index d7b5c76c..c7e5371b 100644 --- a/experiments/selection/P800-7/config/P800-7-cat6.yml +++ b/experiments/selection/P800-7/config/P800-7-cat6.yml @@ -9,7 +9,8 @@ prerun_seed: 2 input_path: "experiments/selection/P800-7/proc_input/cat6" output_path: "experiments/selection/P800-7/proc_output/cat6" -use_windows_codec_binaries: True +use_windows_codec_binaries: true +condition_in_output_filename: true ################################################ ### Input configuration -- GitLab From 837505cd3545be3ec512126e39b5c7e963a35137 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Tue, 30 May 2023 15:33:38 +0200 Subject: [PATCH 20/22] adjust background noise level for P800-5 cat. 3/4/5/6 to 15 dB --- experiments/selection/P800-5/config/P800-5-cat3.yml | 2 +- experiments/selection/P800-5/config/P800-5-cat4.yml | 2 +- experiments/selection/P800-5/config/P800-5-cat5.yml | 2 +- experiments/selection/P800-5/config/P800-5-cat6.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/experiments/selection/P800-5/config/P800-5-cat3.yml b/experiments/selection/P800-5/config/P800-5-cat3.yml index c27a100b..832c47c1 100644 --- a/experiments/selection/P800-5/config/P800-5-cat3.yml +++ b/experiments/selection/P800-5/config/P800-5-cat3.yml @@ -40,7 +40,7 @@ preprocessing_2: repeat_signal: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 10 + snr: 15 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat3.wav" diff --git a/experiments/selection/P800-5/config/P800-5-cat4.yml b/experiments/selection/P800-5/config/P800-5-cat4.yml index 305a2dec..b308075d 100644 --- a/experiments/selection/P800-5/config/P800-5-cat4.yml +++ b/experiments/selection/P800-5/config/P800-5-cat4.yml @@ -40,7 +40,7 @@ preprocessing_2: repeat_signal: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 10 + snr: 15 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat4.wav" diff --git a/experiments/selection/P800-5/config/P800-5-cat5.yml b/experiments/selection/P800-5/config/P800-5-cat5.yml index c52674ec..41a8377c 100644 --- a/experiments/selection/P800-5/config/P800-5-cat5.yml +++ b/experiments/selection/P800-5/config/P800-5-cat5.yml @@ -40,7 +40,7 @@ preprocessing_2: repeat_signal: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 10 + snr: 15 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat5.wav" diff --git a/experiments/selection/P800-5/config/P800-5-cat6.yml b/experiments/selection/P800-5/config/P800-5-cat6.yml index dc3c903d..b2d3ac8b 100644 --- a/experiments/selection/P800-5/config/P800-5-cat6.yml +++ b/experiments/selection/P800-5/config/P800-5-cat6.yml @@ -40,7 +40,7 @@ preprocessing_2: repeat_signal: true background_noise: ### REQUIRED: SNR for background noise in dB - snr: 10 + snr: 15 ### REQUIRED: Path to background noise, must have same format and sampling rate as input signal(s) background_noise_path: "experiments/selection/P800-5/background_noise/background_noise_cat6.wav" -- GitLab From ec325c806fb5011921ff3a7338a3868a6214bdd4 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Tue, 30 May 2023 15:57:32 +0200 Subject: [PATCH 21/22] add DTX for conditions c18 - c23 --- experiments/selection/P800-9/config/P800-9-cat1.yml | 12 ++++++------ experiments/selection/P800-9/config/P800-9-cat2.yml | 12 ++++++------ experiments/selection/P800-9/config/P800-9-cat3.yml | 12 ++++++------ experiments/selection/P800-9/config/P800-9-cat4.yml | 12 ++++++------ experiments/selection/P800-9/config/P800-9-cat5.yml | 12 ++++++------ experiments/selection/P800-9/config/P800-9-cat6.yml | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/experiments/selection/P800-9/config/P800-9-cat1.yml b/experiments/selection/P800-9/config/P800-9-cat1.yml index 7fe15f8e..69ab33fc 100644 --- a/experiments/selection/P800-9/config/P800-9-cat1.yml +++ b/experiments/selection/P800-9/config/P800-9-cat1.yml @@ -155,7 +155,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs @@ -163,7 +163,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs @@ -171,7 +171,7 @@ conditions_to_generate: bitrates: - 8000 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs @@ -179,7 +179,7 @@ conditions_to_generate: bitrates: - 9600 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs @@ -187,7 +187,7 @@ conditions_to_generate: bitrates: - 16400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs @@ -195,7 +195,7 @@ conditions_to_generate: bitrates: - 24400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: ### IVAS condition ############################### diff --git a/experiments/selection/P800-9/config/P800-9-cat2.yml b/experiments/selection/P800-9/config/P800-9-cat2.yml index daf34faf..ca5dbe53 100644 --- a/experiments/selection/P800-9/config/P800-9-cat2.yml +++ b/experiments/selection/P800-9/config/P800-9-cat2.yml @@ -155,7 +155,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs @@ -163,7 +163,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs @@ -171,7 +171,7 @@ conditions_to_generate: bitrates: - 8000 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs @@ -179,7 +179,7 @@ conditions_to_generate: bitrates: - 9600 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs @@ -187,7 +187,7 @@ conditions_to_generate: bitrates: - 16400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs @@ -195,7 +195,7 @@ conditions_to_generate: bitrates: - 24400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: ### IVAS condition ############################### diff --git a/experiments/selection/P800-9/config/P800-9-cat3.yml b/experiments/selection/P800-9/config/P800-9-cat3.yml index 5ab05e0c..0ad4bc91 100644 --- a/experiments/selection/P800-9/config/P800-9-cat3.yml +++ b/experiments/selection/P800-9/config/P800-9-cat3.yml @@ -155,7 +155,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs @@ -163,7 +163,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs @@ -171,7 +171,7 @@ conditions_to_generate: bitrates: - 8000 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs @@ -179,7 +179,7 @@ conditions_to_generate: bitrates: - 9600 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs @@ -187,7 +187,7 @@ conditions_to_generate: bitrates: - 16400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs @@ -195,7 +195,7 @@ conditions_to_generate: bitrates: - 24400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: ### IVAS condition ############################### diff --git a/experiments/selection/P800-9/config/P800-9-cat4.yml b/experiments/selection/P800-9/config/P800-9-cat4.yml index ba0b56e4..84ad08a9 100644 --- a/experiments/selection/P800-9/config/P800-9-cat4.yml +++ b/experiments/selection/P800-9/config/P800-9-cat4.yml @@ -155,7 +155,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs @@ -163,7 +163,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs @@ -171,7 +171,7 @@ conditions_to_generate: bitrates: - 8000 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs @@ -179,7 +179,7 @@ conditions_to_generate: bitrates: - 9600 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs @@ -187,7 +187,7 @@ conditions_to_generate: bitrates: - 16400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs @@ -195,7 +195,7 @@ conditions_to_generate: bitrates: - 24400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: ### IVAS condition ############################### diff --git a/experiments/selection/P800-9/config/P800-9-cat5.yml b/experiments/selection/P800-9/config/P800-9-cat5.yml index 0b518e30..8b08bacb 100644 --- a/experiments/selection/P800-9/config/P800-9-cat5.yml +++ b/experiments/selection/P800-9/config/P800-9-cat5.yml @@ -155,7 +155,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs @@ -163,7 +163,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs @@ -171,7 +171,7 @@ conditions_to_generate: bitrates: - 8000 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs @@ -179,7 +179,7 @@ conditions_to_generate: bitrates: - 9600 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs @@ -187,7 +187,7 @@ conditions_to_generate: bitrates: - 16400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs @@ -195,7 +195,7 @@ conditions_to_generate: bitrates: - 24400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: ### IVAS condition ############################### diff --git a/experiments/selection/P800-9/config/P800-9-cat6.yml b/experiments/selection/P800-9/config/P800-9-cat6.yml index 83ed2eaa..138dc708 100644 --- a/experiments/selection/P800-9/config/P800-9-cat6.yml +++ b/experiments/selection/P800-9/config/P800-9-cat6.yml @@ -155,7 +155,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c19: type: evs @@ -163,7 +163,7 @@ conditions_to_generate: bitrates: - 7200 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c20: type: evs @@ -171,7 +171,7 @@ conditions_to_generate: bitrates: - 8000 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c21: type: evs @@ -179,7 +179,7 @@ conditions_to_generate: bitrates: - 9600 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c22: type: evs @@ -187,7 +187,7 @@ conditions_to_generate: bitrates: - 16400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: c23: type: evs @@ -195,7 +195,7 @@ conditions_to_generate: bitrates: - 24400 cod: - opts: ["-max_band", "FB"] + opts: ["-dtx", "-max_band", "FB"] dec: ### IVAS condition ############################### -- GitLab From 41ff473641a4b293ececc9051c65e6a7ec225ab8 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Tue, 30 May 2023 16:19:20 +0200 Subject: [PATCH 22/22] fix bitrate for BS1534-7b --- experiments/selection/BS1534-7b/config/BS1534-7b.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiments/selection/BS1534-7b/config/BS1534-7b.yml b/experiments/selection/BS1534-7b/config/BS1534-7b.yml index f3d268f9..e9a3075b 100644 --- a/experiments/selection/BS1534-7b/config/BS1534-7b.yml +++ b/experiments/selection/BS1534-7b/config/BS1534-7b.yml @@ -54,7 +54,7 @@ conditions_to_generate: type: evs sba_format: "FOA" bitrates: - - 48000 + - 64000 cod: opts: ["-max_band", "FB"] dec: -- GitLab