From a6b7f108fc3f7763b5279178a90c7f65e02c4855 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 13 Dec 2023 09:28:56 +0100 Subject: [PATCH 1/5] fix planar SBA modes in ivas_modes.json --- scripts/config/ivas_modes.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index 89c9d46b15..dcc76cabc6 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -1152,7 +1152,7 @@ "PlanarFOA_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - "1" + -"1" ], "encoptions": [ "-max_band", @@ -1231,7 +1231,7 @@ "PlanarFOA_b{bitrate}_dtx_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - "1" + "-1" ], "encoptions": [ "-dtx", @@ -1290,7 +1290,7 @@ "PlanarFOA_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-sba", - "1" + "-1" ], "encoptions": [ "-max_band", @@ -1335,7 +1335,7 @@ "PlanarHOA2_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - "2" + "-2" ], "encoptions": [ "-max_band", @@ -1414,7 +1414,7 @@ "PlanarHOA2_b{bitrate}_dtx_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - "2" + "-2" ], "encoptions": [ "-dtx", @@ -1473,7 +1473,7 @@ "PlanarHOA2_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-sba", - "2" + "-2" ], "encoptions": [ "-max_band", @@ -1518,7 +1518,7 @@ "PlanarHOA3_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - "3" + "-3" ], "encoptions": [ "-max_band", @@ -1597,7 +1597,7 @@ "PlanarHOA3_b{bitrate}_dtx_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - "3" + "-3" ], "encoptions": [ "-dtx", @@ -1656,7 +1656,7 @@ "PlanarHOA3_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-sba", - "3" + "-3" ], "encoptions": [ "-max_band", -- GitLab From 31a5f4419d7b56bee33538855f2896b4fcbe442f Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 13 Dec 2023 09:33:25 +0100 Subject: [PATCH 2/5] add planar modes for OSBA --- scripts/config/ivas_modes.json | 1346 +++++++++++++++++++++++++++++++- 1 file changed, 1345 insertions(+), 1 deletion(-) diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index dcc76cabc6..80623d223a 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -1152,7 +1152,7 @@ "PlanarFOA_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-sba", - -"1" + "-1" ], "encoptions": [ "-max_band", @@ -6936,6 +6936,1350 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } + }, + "OSBA_ISM1_PlanarHOA3_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "1", + "-3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM1_HOA3", + "table_name": "OSBA ISM1 HOA3@{table_bitrate} kbps {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM1_PlanarHOA2_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "1", + "-2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM1_HOA2", + "table_name": "OSBA ISM1 HOA2@{table_bitrate} kbps {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM1_PlanarFOA_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "1", + "-1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM1_FOA", + "table_name": "OSBA ISM1 FOA@{table_bitrate} kbps {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM2_PlanarHOA3_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "2", + "-3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM2_HOA3", + "table_name": "OSBA ISM2 HOA3@{table_bitrate} kbps {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM2_PlanarHOA2_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "2", + "-2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM2_HOA2", + "table_name": "OSBA ISM2 HOA2@{table_bitrate} kbps {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM2_PlanarFOA_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "2", + "-1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM2_FOA", + "table_name": "OSBA ISM2 FOA@{table_bitrate} kbps {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM3_PlanarHOA3_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "3", + "-3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM3_HOA3", + "table_name": "OSBA ISM3 HOA3@{table_bitrate} kbps {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM3_PlanarHOA2_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "3", + "-2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM3_HOA2", + "table_name": "OSBA ISM3 HOA2@{table_bitrate} kbps {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM3_PlanarFOA_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "3", + "-1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM3_FOA", + "table_name": "OSBA ISM3 FOA@{table_bitrate} kbps {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM4_PlanarHOA3_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "4", + "-3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM4_HOA3", + "table_name": "OSBA ISM4 HOA3@{table_bitrate} kbps {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM4_PlanarHOA2_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "4", + "-2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM4_HOA2", + "table_name": "OSBA ISM4 HOA2@{table_bitrate} kbps {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM4_PlanarFOA_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism_sba", + "4", + "-1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM4_FOA", + "table_name": "OSBA ISM4 FOA@{table_bitrate} kbps {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 13200, + 16400, + 24400, + 32000, + 48000, + 64000, + 80000, + 96000, + 128000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "OSBA_ISM1_PlanarHOA3_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "1", + "-3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM1_HOA3", + "table_name": "OSBA ISM1 HOA3 RS {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM1_PlanarHOA2_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "1", + "-2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM1_HOA2", + "table_name": "OSBA ISM1 HOA2 RS {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM1_PlanarFOA_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "1", + "-1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM1_FOA", + "table_name": "OSBA ISM1 FOA RS {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM2_PlanarHOA3_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "2", + "-3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM2_HOA3", + "table_name": "OSBA ISM2 HOA RS {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM2_PlanarHOA2_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "2", + "-2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM2_HOA2", + "table_name": "OSBA ISM2 HOA2 RS {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM2_PlanarFOA_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "2", + "-1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM2_FOA", + "table_name": "OSBA ISM2 FOA RS {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM3_PlanarHOA3_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "3", + "-3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM3_HOA3", + "table_name": "OSBA ISM3 HOA3 RS {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM3_PlanarHOA2_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "3", + "-2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM3_HOA2", + "table_name": "OSBA ISM3 HOA2 RS {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM3_PlanarFOA_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "3", + "-1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM3_FOA", + "table_name": "OSBA ISM3 FOA RS {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM4_PlanarHOA3_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "4", + "-3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM4_HOA3", + "table_name": "OSBA ISM4 HOA3 RS {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM4_PlanarHOA2_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "4", + "-2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM4_HOA2", + "table_name": "OSBA ISM4 HOA2 RS {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } + }, + "OSBA_ISM4_PlanarFOA_b{bitrate}_{bandwidth}_rs": { + "encmodeoption": [ + "-ism_sba", + "4", + "-1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "7_1_4": [], + "HOA3": [], + "mono": [], + "stereo": [], + "EXT": [] + }, + "in_config": "OSBA_ISM4_FOA", + "table_name": "OSBA ISM4 FOA RS {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": true, + "amr": false, + "mono": false, + "bitrates": { + "wb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "swb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + }, + "fb": { + "all": "{sw_files_path}/sw_13k2_512k.bin" + } + } } } } -- GitLab From 8733ddfcabfb267115d609faa3d08206dd2ce697 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 13 Dec 2023 10:37:27 +0100 Subject: [PATCH 3/5] add missing output configs for OSBA modes in ivas_modes.json --- scripts/config/ivas_modes.json | 528 ++++++++++++++++++++++++++++++--- 1 file changed, 480 insertions(+), 48 deletions(-) diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index 80623d223a..bbb5f137f2 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -5605,10 +5605,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_HOA3", "table_name": "OSBA ISM1 HOA3@{table_bitrate} kbps {bandwidth}", @@ -5679,10 +5688,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_HOA2", "table_name": "OSBA ISM1 HOA2@{table_bitrate} kbps {bandwidth}", @@ -5753,10 +5771,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_FOA", "table_name": "OSBA ISM1 FOA@{table_bitrate} kbps {bandwidth}", @@ -5827,10 +5854,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_HOA3", "table_name": "OSBA ISM2 HOA3@{table_bitrate} kbps {bandwidth}", @@ -5901,10 +5937,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_HOA2", "table_name": "OSBA ISM2 HOA2@{table_bitrate} kbps {bandwidth}", @@ -5975,10 +6020,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_FOA", "table_name": "OSBA ISM2 FOA@{table_bitrate} kbps {bandwidth}", @@ -6049,10 +6103,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_HOA3", "table_name": "OSBA ISM3 HOA3@{table_bitrate} kbps {bandwidth}", @@ -6123,10 +6186,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_HOA2", "table_name": "OSBA ISM3 HOA2@{table_bitrate} kbps {bandwidth}", @@ -6197,10 +6269,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_FOA", "table_name": "OSBA ISM3 FOA@{table_bitrate} kbps {bandwidth}", @@ -6271,10 +6352,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_HOA3", "table_name": "OSBA ISM4 HOA3@{table_bitrate} kbps {bandwidth}", @@ -6345,10 +6435,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_HOA2", "table_name": "OSBA ISM4 HOA2@{table_bitrate} kbps {bandwidth}", @@ -6419,10 +6518,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_FOA", "table_name": "OSBA ISM4 FOA@{table_bitrate} kbps {bandwidth}", @@ -6493,10 +6601,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_HOA3", "table_name": "OSBA ISM1 HOA3 RS {bandwidth}", @@ -6531,10 +6648,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_HOA2", "table_name": "OSBA ISM1 HOA2 RS {bandwidth}", @@ -6569,10 +6695,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_FOA", "table_name": "OSBA ISM1 FOA RS {bandwidth}", @@ -6607,10 +6742,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_HOA3", "table_name": "OSBA ISM2 HOA RS {bandwidth}", @@ -6645,10 +6789,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_HOA2", "table_name": "OSBA ISM2 HOA2 RS {bandwidth}", @@ -6683,10 +6836,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_FOA", "table_name": "OSBA ISM2 FOA RS {bandwidth}", @@ -6721,10 +6883,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_HOA3", "table_name": "OSBA ISM3 HOA3 RS {bandwidth}", @@ -6759,10 +6930,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_HOA2", "table_name": "OSBA ISM3 HOA2 RS {bandwidth}", @@ -6797,10 +6977,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_FOA", "table_name": "OSBA ISM3 FOA RS {bandwidth}", @@ -6835,10 +7024,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_HOA3", "table_name": "OSBA ISM4 HOA3 RS {bandwidth}", @@ -6873,10 +7071,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_HOA2", "table_name": "OSBA ISM4 HOA2 RS {bandwidth}", @@ -6911,10 +7118,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_FOA", "table_name": "OSBA ISM4 FOA RS {bandwidth}", @@ -6949,10 +7165,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_HOA3", "table_name": "OSBA ISM1 HOA3@{table_bitrate} kbps {bandwidth}", @@ -7023,10 +7248,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_HOA2", "table_name": "OSBA ISM1 HOA2@{table_bitrate} kbps {bandwidth}", @@ -7097,10 +7331,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_FOA", "table_name": "OSBA ISM1 FOA@{table_bitrate} kbps {bandwidth}", @@ -7171,10 +7414,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_HOA3", "table_name": "OSBA ISM2 HOA3@{table_bitrate} kbps {bandwidth}", @@ -7245,10 +7497,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_HOA2", "table_name": "OSBA ISM2 HOA2@{table_bitrate} kbps {bandwidth}", @@ -7319,10 +7580,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_FOA", "table_name": "OSBA ISM2 FOA@{table_bitrate} kbps {bandwidth}", @@ -7393,10 +7663,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_HOA3", "table_name": "OSBA ISM3 HOA3@{table_bitrate} kbps {bandwidth}", @@ -7467,10 +7746,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_HOA2", "table_name": "OSBA ISM3 HOA2@{table_bitrate} kbps {bandwidth}", @@ -7541,10 +7829,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_FOA", "table_name": "OSBA ISM3 FOA@{table_bitrate} kbps {bandwidth}", @@ -7615,10 +7912,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_HOA3", "table_name": "OSBA ISM4 HOA3@{table_bitrate} kbps {bandwidth}", @@ -7689,10 +7995,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_HOA2", "table_name": "OSBA ISM4 HOA2@{table_bitrate} kbps {bandwidth}", @@ -7763,10 +8078,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_FOA", "table_name": "OSBA ISM4 FOA@{table_bitrate} kbps {bandwidth}", @@ -7837,10 +8161,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_HOA3", "table_name": "OSBA ISM1 HOA3 RS {bandwidth}", @@ -7875,10 +8208,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_HOA2", "table_name": "OSBA ISM1 HOA2 RS {bandwidth}", @@ -7913,10 +8255,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM1_FOA", "table_name": "OSBA ISM1 FOA RS {bandwidth}", @@ -7951,10 +8302,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_HOA3", "table_name": "OSBA ISM2 HOA RS {bandwidth}", @@ -7989,10 +8349,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_HOA2", "table_name": "OSBA ISM2 HOA2 RS {bandwidth}", @@ -8027,10 +8396,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM2_FOA", "table_name": "OSBA ISM2 FOA RS {bandwidth}", @@ -8065,10 +8443,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_HOA3", "table_name": "OSBA ISM3 HOA3 RS {bandwidth}", @@ -8103,10 +8490,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_HOA2", "table_name": "OSBA ISM3 HOA2 RS {bandwidth}", @@ -8141,10 +8537,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM3_FOA", "table_name": "OSBA ISM3 FOA RS {bandwidth}", @@ -8179,10 +8584,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_HOA3", "table_name": "OSBA ISM4 HOA3 RS {bandwidth}", @@ -8217,10 +8631,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_HOA2", "table_name": "OSBA ISM4 HOA2 RS {bandwidth}", @@ -8255,10 +8678,19 @@ ], "dec": { "7_1_4": [], + "7_1": [], + "5_1_4": [], + "5_1_2": [], + "5_1": [], + "BINAURAL": [], + "BINAURAL_ROOM_IR": [], + "BINAURAL_ROOM_REVERB": [], "HOA3": [], + "HOA2": [], + "FOA": [], "mono": [], "stereo": [], - "EXT": [] + "EXT": [], }, "in_config": "OSBA_ISM4_FOA", "table_name": "OSBA ISM4 FOA RS {bandwidth}", -- GitLab From e42722a700004c9f50ae4aa01ad300973757a374 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 13 Dec 2023 10:42:50 +0100 Subject: [PATCH 4/5] remove wrong "," --- scripts/config/ivas_modes.json | 96 +++++++++++++++++----------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index bbb5f137f2..86994010aa 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -5617,7 +5617,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_HOA3", "table_name": "OSBA ISM1 HOA3@{table_bitrate} kbps {bandwidth}", @@ -5700,7 +5700,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_HOA2", "table_name": "OSBA ISM1 HOA2@{table_bitrate} kbps {bandwidth}", @@ -5783,7 +5783,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_FOA", "table_name": "OSBA ISM1 FOA@{table_bitrate} kbps {bandwidth}", @@ -5866,7 +5866,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_HOA3", "table_name": "OSBA ISM2 HOA3@{table_bitrate} kbps {bandwidth}", @@ -5949,7 +5949,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_HOA2", "table_name": "OSBA ISM2 HOA2@{table_bitrate} kbps {bandwidth}", @@ -6032,7 +6032,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_FOA", "table_name": "OSBA ISM2 FOA@{table_bitrate} kbps {bandwidth}", @@ -6115,7 +6115,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_HOA3", "table_name": "OSBA ISM3 HOA3@{table_bitrate} kbps {bandwidth}", @@ -6198,7 +6198,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_HOA2", "table_name": "OSBA ISM3 HOA2@{table_bitrate} kbps {bandwidth}", @@ -6281,7 +6281,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_FOA", "table_name": "OSBA ISM3 FOA@{table_bitrate} kbps {bandwidth}", @@ -6364,7 +6364,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_HOA3", "table_name": "OSBA ISM4 HOA3@{table_bitrate} kbps {bandwidth}", @@ -6447,7 +6447,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_HOA2", "table_name": "OSBA ISM4 HOA2@{table_bitrate} kbps {bandwidth}", @@ -6530,7 +6530,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_FOA", "table_name": "OSBA ISM4 FOA@{table_bitrate} kbps {bandwidth}", @@ -6613,7 +6613,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_HOA3", "table_name": "OSBA ISM1 HOA3 RS {bandwidth}", @@ -6660,7 +6660,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_HOA2", "table_name": "OSBA ISM1 HOA2 RS {bandwidth}", @@ -6707,7 +6707,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_FOA", "table_name": "OSBA ISM1 FOA RS {bandwidth}", @@ -6754,7 +6754,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_HOA3", "table_name": "OSBA ISM2 HOA RS {bandwidth}", @@ -6801,7 +6801,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_HOA2", "table_name": "OSBA ISM2 HOA2 RS {bandwidth}", @@ -6848,7 +6848,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_FOA", "table_name": "OSBA ISM2 FOA RS {bandwidth}", @@ -6895,7 +6895,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_HOA3", "table_name": "OSBA ISM3 HOA3 RS {bandwidth}", @@ -6942,7 +6942,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_HOA2", "table_name": "OSBA ISM3 HOA2 RS {bandwidth}", @@ -6989,7 +6989,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_FOA", "table_name": "OSBA ISM3 FOA RS {bandwidth}", @@ -7036,7 +7036,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_HOA3", "table_name": "OSBA ISM4 HOA3 RS {bandwidth}", @@ -7083,7 +7083,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_HOA2", "table_name": "OSBA ISM4 HOA2 RS {bandwidth}", @@ -7130,7 +7130,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_FOA", "table_name": "OSBA ISM4 FOA RS {bandwidth}", @@ -7177,7 +7177,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_HOA3", "table_name": "OSBA ISM1 HOA3@{table_bitrate} kbps {bandwidth}", @@ -7260,7 +7260,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_HOA2", "table_name": "OSBA ISM1 HOA2@{table_bitrate} kbps {bandwidth}", @@ -7343,7 +7343,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_FOA", "table_name": "OSBA ISM1 FOA@{table_bitrate} kbps {bandwidth}", @@ -7426,7 +7426,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_HOA3", "table_name": "OSBA ISM2 HOA3@{table_bitrate} kbps {bandwidth}", @@ -7509,7 +7509,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_HOA2", "table_name": "OSBA ISM2 HOA2@{table_bitrate} kbps {bandwidth}", @@ -7592,7 +7592,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_FOA", "table_name": "OSBA ISM2 FOA@{table_bitrate} kbps {bandwidth}", @@ -7675,7 +7675,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_HOA3", "table_name": "OSBA ISM3 HOA3@{table_bitrate} kbps {bandwidth}", @@ -7758,7 +7758,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_HOA2", "table_name": "OSBA ISM3 HOA2@{table_bitrate} kbps {bandwidth}", @@ -7841,7 +7841,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_FOA", "table_name": "OSBA ISM3 FOA@{table_bitrate} kbps {bandwidth}", @@ -7924,7 +7924,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_HOA3", "table_name": "OSBA ISM4 HOA3@{table_bitrate} kbps {bandwidth}", @@ -8007,7 +8007,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_HOA2", "table_name": "OSBA ISM4 HOA2@{table_bitrate} kbps {bandwidth}", @@ -8090,7 +8090,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_FOA", "table_name": "OSBA ISM4 FOA@{table_bitrate} kbps {bandwidth}", @@ -8173,7 +8173,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_HOA3", "table_name": "OSBA ISM1 HOA3 RS {bandwidth}", @@ -8220,7 +8220,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_HOA2", "table_name": "OSBA ISM1 HOA2 RS {bandwidth}", @@ -8267,7 +8267,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM1_FOA", "table_name": "OSBA ISM1 FOA RS {bandwidth}", @@ -8314,7 +8314,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_HOA3", "table_name": "OSBA ISM2 HOA RS {bandwidth}", @@ -8361,7 +8361,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_HOA2", "table_name": "OSBA ISM2 HOA2 RS {bandwidth}", @@ -8408,7 +8408,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM2_FOA", "table_name": "OSBA ISM2 FOA RS {bandwidth}", @@ -8455,7 +8455,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_HOA3", "table_name": "OSBA ISM3 HOA3 RS {bandwidth}", @@ -8502,7 +8502,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_HOA2", "table_name": "OSBA ISM3 HOA2 RS {bandwidth}", @@ -8549,7 +8549,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM3_FOA", "table_name": "OSBA ISM3 FOA RS {bandwidth}", @@ -8596,7 +8596,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_HOA3", "table_name": "OSBA ISM4 HOA3 RS {bandwidth}", @@ -8643,7 +8643,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_HOA2", "table_name": "OSBA ISM4 HOA2 RS {bandwidth}", @@ -8690,7 +8690,7 @@ "FOA": [], "mono": [], "stereo": [], - "EXT": [], + "EXT": [] }, "in_config": "OSBA_ISM4_FOA", "table_name": "OSBA ISM4 FOA RS {bandwidth}", -- GitLab From 82ed3c06ca4e29cb8b8e34f599ef7940e740647d Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 13 Dec 2023 12:35:49 +0100 Subject: [PATCH 5/5] run smoke test on fast runners only --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 123fb93b94..7e5bac3a32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -410,6 +410,8 @@ codec-smoke-test: - .test-job-linux-needs-testv-dir - .rules-merge-request timeout: "17 minutes" + tags: + - ivas-linux-fast stage: test needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"] script: -- GitLab