diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1074de71b886bd145d0dfb4a1274b9db29188f8d..f6a9bc884fb70803ad3976066384ae09dbf7d569 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1066,7 +1066,7 @@ complexity-ism-in-binaural-out: - *complexity-measurements-setup - in_format=ISM - out_format=BINAURAL - - bash ci/complexity_measurements/getWmops.sh "ISM1 ISM2 ISM3 ISM4" "$out_format" + - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" - *complexity-measurements-prepare-artifacts complexity-sba-hoa3-in-hoa3-out: diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index 2f8d4ce39814a6c35f3b6176ebb8e0a65989b66c..c2953e64bf26fcfb6f43dd482967c5120b1f090f 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -2292,6 +2292,426 @@ } } }, + "ISM+1": { + "ISM+1_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism", + "+1" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM+1", + "table_name": "ISM+1@{table_bitrate} kbps {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000 + ] + } + }, + "ISM+1_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism", + "+1" + ], + "encoptions": [ + "-dtx", + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM+1", + "table_name": "ISM+1@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 1, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000 + ] + } + } + }, + "ISM+2": { + "ISM+2_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism", + "+2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM+2", + "table_name": "ISM+2@{table_bitrate} kbps {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ] + } + }, + "ISM+2_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-dtx", + "-ism", + "+2" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM+2", + "table_name": "ISM+2@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 2, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000 + ] + } + } + }, + "ISM+3": { + "ISM+3_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism", + "+3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM+3", + "table_name": "ISM+3@{table_bitrate} kbps {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ] + } + }, + "ISM+3_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-dtx", + "-ism", + "+3" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM+3", + "table_name": "ISM+3@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 3, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000 + ] + } + } + }, + "ISM+4": { + "ISM+4_b{bitrate}_{bandwidth}_cbr": { + "encmodeoption": [ + "-ism", + "+4" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM+4", + "table_name": "ISM+4@{table_bitrate} kbps {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ] + } + }, + "ISM+4_b{bitrate}_dtx_{bandwidth}_cbr": { + "encmodeoption": [ + "-dtx", + "-ism", + "+4" + ], + "encoptions": [ + "-max_band", + "{bandwidth}" + ], + "dec": { + "EXT": [] + }, + "in_config": "ISM+4", + "table_name": "ISM+4@{table_bitrate} kbps DTX {bandwidth}", + "nummetadata": 4, + "metadatafilenames": [ + "stvISM{mdi}.csv" + ], + "rs": false, + "amr": false, + "mono": false, + "bitrates": { + "wb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "swb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ], + "fb": [ + 64000, + 80000, + 96000, + 128000, + 160000, + 192000, + 256000, + 384000, + 512000 + ] + } + } + }, "stereo": { "stereo_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [