From e95b035d3d2796d15ca466c198d629743cc1465c Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Wed, 6 Sep 2023 17:03:26 +0200 Subject: [PATCH 1/2] fix metadatafilenames to work with stv files --- scripts/config/ivas_modes.json | 152 ++++++++++++--------------------- 1 file changed, 54 insertions(+), 98 deletions(-) diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index 703a3e2b04..1052fdb4df 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -1678,7 +1678,6 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } - }, "MASA_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ @@ -1775,7 +1774,7 @@ "rs": true, "amr": false, "mono": false, - "rs": true, + "rs": true, "amr": false, "mono": false, "bitrates": { @@ -2578,7 +2577,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" }, "fb": { - "all": "{sw_files_path}/sw_13k2_512k.bin" + "all": "{sw_files_path}/sw_13k2_512k.bin" } } }, @@ -2609,7 +2608,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" }, "fb": { - "all": "{sw_files_path}/sw_13k2_512k.bin" + "all": "{sw_files_path}/sw_13k2_512k.bin" } } }, @@ -2640,7 +2639,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" }, "fb": { - "all": "{sw_files_path}/sw_13k2_512k.bin" + "all": "{sw_files_path}/sw_13k2_512k.bin" } } }, @@ -2671,7 +2670,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" }, "fb": { - "all": "{sw_files_path}/sw_13k2_512k.bin" + "all": "{sw_files_path}/sw_13k2_512k.bin" } } }, @@ -2702,7 +2701,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" }, "fb": { - "all": "{sw_files_path}/sw_13k2_512k.bin" + "all": "{sw_files_path}/sw_13k2_512k.bin" } } } @@ -2794,7 +2793,7 @@ "all": "{sw_files_path}/sw_32k_128k.bin" } } - }, + }, "ISM1_b{bitrate}_dtx_{bandwidth}_cbr": { "encmodeoption": [ "-ism", @@ -3043,7 +3042,7 @@ 160000, 192000, 256000, - 384000 + 384000 ], "swb": [ 24400, @@ -3056,7 +3055,7 @@ 160000, 192000, 256000, - 384000 + 384000 ], "fb": [ 32000, @@ -3068,7 +3067,7 @@ 160000, 192000, 256000, - 384000 + 384000 ] } }, @@ -3106,7 +3105,7 @@ 160000, 192000, 256000, - 384000 + 384000 ], "swb": [ 24400, @@ -3203,8 +3202,8 @@ 160000, 192000, 256000, - 384000, - 512000 + 384000, + 512000 ], "swb": [ 24400, @@ -3217,8 +3216,8 @@ 160000, 192000, 256000, - 384000, - 512000 + 384000, + 512000 ], "fb": [ 32000, @@ -3230,8 +3229,8 @@ 160000, 192000, 256000, - 384000, - 512000 + 384000, + 512000 ] } }, @@ -3618,7 +3617,7 @@ 160000, 192000, 256000, - 384000 + 384000 ], "fb": [ 32000, @@ -3630,7 +3629,7 @@ 160000, 192000, 256000, - 384000 + 384000 ] } }, @@ -3830,7 +3829,7 @@ ] } } - }, + }, "stereo": { "stereo_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ @@ -4644,7 +4643,6 @@ } } }, - "OMASA": { "OMASA_ISM1_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ @@ -4858,8 +4856,6 @@ ] } }, - - "OMASA_ISM2_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", @@ -5071,8 +5067,6 @@ ] } }, - - "OMASA_ISM3_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", @@ -5285,8 +5279,6 @@ ] } }, - - "OMASA_ISM4_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", @@ -5524,7 +5516,7 @@ "table_name": "OSBA ISM1 HOA3@{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -5576,7 +5568,7 @@ 512000 ] } - }, + }, "OSBA_ISM1_HOA2_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_sba", @@ -5598,7 +5590,7 @@ "table_name": "OSBA ISM1 HOA2@{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -5672,7 +5664,7 @@ "table_name": "OSBA ISM1 FOA@{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -5746,8 +5738,7 @@ "table_name": "OSBA ISM2 HOA3@{table_bitrate} kbps {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -5799,7 +5790,7 @@ 512000 ] } - }, + }, "OSBA_ISM2_HOA2_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_sba", @@ -5821,8 +5812,7 @@ "table_name": "OSBA ISM2 HOA2@{table_bitrate} kbps {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -5896,8 +5886,7 @@ "table_name": "OSBA ISM2 FOA@{table_bitrate} kbps {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -5971,9 +5960,7 @@ "table_name": "OSBA ISM3 HOA3@{table_bitrate} kbps {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -6025,7 +6012,7 @@ 512000 ] } - }, + }, "OSBA_ISM3_HOA2_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_sba", @@ -6047,9 +6034,7 @@ "table_name": "OSBA ISM3 HOA2@{table_bitrate} kbps {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -6123,9 +6108,7 @@ "table_name": "OSBA ISM3 FOA@{table_bitrate} kbps {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -6199,10 +6182,7 @@ "table_name": "OSBA ISM4 HOA3@{table_bitrate} kbps {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv", - "{item}_ISM4.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -6254,7 +6234,7 @@ 512000 ] } - }, + }, "OSBA_ISM4_HOA2_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_sba", @@ -6276,10 +6256,7 @@ "table_name": "OSBA ISM4 HOA2@{table_bitrate} kbps {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv", - "{item}_ISM4.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -6353,10 +6330,7 @@ "table_name": "OSBA ISM4 FOA@{table_bitrate} kbps {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv", - "{item}_ISM4.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -6430,7 +6404,7 @@ "table_name": "OSBA ISM1 HOA3 RS {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6446,7 +6420,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } - }, + }, "OSBA_ISM1_HOA2_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_sba", @@ -6468,7 +6442,7 @@ "table_name": "OSBA ISM1 HOA2 RS {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6506,7 +6480,7 @@ "table_name": "OSBA ISM1 FOA RS {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6544,8 +6518,7 @@ "table_name": "OSBA ISM2 HOA RS {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6561,7 +6534,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } - }, + }, "OSBA_ISM2_HOA2_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_sba", @@ -6583,8 +6556,7 @@ "table_name": "OSBA ISM2 HOA2 RS {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6622,8 +6594,7 @@ "table_name": "OSBA ISM2 FOA RS {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6661,9 +6632,7 @@ "table_name": "OSBA ISM3 HOA3 RS {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6679,7 +6648,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } - }, + }, "OSBA_ISM3_HOA2_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_sba", @@ -6701,9 +6670,7 @@ "table_name": "OSBA ISM3 HOA2 RS {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6741,9 +6708,7 @@ "table_name": "OSBA ISM3 FOA RS {bandwidth}", "nummetadata": 3, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6781,10 +6746,7 @@ "table_name": "OSBA ISM4 HOA3 RS {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv", - "{item}_ISM4.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6800,7 +6762,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } - }, + }, "OSBA_ISM4_HOA2_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_sba", @@ -6822,16 +6784,13 @@ "table_name": "OSBA ISM4 HOA2 RS {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv", - "{item}_ISM4.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, "mono": false, "bitrates": { - "wb": { + "wb": { "all": "{sw_files_path}/sw_13k2_512k.bin" }, "swb": { @@ -6863,10 +6822,7 @@ "table_name": "OSBA ISM4 FOA RS {bandwidth}", "nummetadata": 4, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv", - "{item}_ISM4.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -6884,4 +6840,4 @@ } } } -} +} \ No newline at end of file -- GitLab From 9a7d9e844e384aef0bf3c3d711a2a4b38972ac2c Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 19 Sep 2023 15:37:05 +0200 Subject: [PATCH 2/2] fix wrong output config suffix in self_test.py for OSBA/OMASA --- scripts/self_test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/self_test.py b/scripts/self_test.py index 321f83419b..247396e7d4 100755 --- a/scripts/self_test.py +++ b/scripts/self_test.py @@ -926,7 +926,7 @@ class SelfTest(IvasScriptsCommon.IvasScript): entry_dict["cmd"]["bitrate"] = self.test_for_file(enc_cmd.pop()) mode_name = re.sub("[^0-9a-zA-Z]+", "_", mode[0]) mono = False - # print(mode_name) + is_osba_or_omasa = False while enc_cmd: next_part = enc_cmd.pop(0) if next_part.upper() in MODES: @@ -950,6 +950,8 @@ class SelfTest(IvasScriptsCommon.IvasScript): else: entry_dict["cmd"]["in_config"] = MODES[next_part][ic] else: + if next_part.upper() == "-ISM_SBA" or next_part.upper() == "-ISM_MASA": + is_osba_or_omasa = True entry_dict["cmd"]["encoptions"].append(next_part) # look for parameters to the argument while enc_cmd and enc_cmd[0][0] != "-": @@ -957,7 +959,7 @@ class SelfTest(IvasScriptsCommon.IvasScript): self.test_for_file(enc_cmd.pop(0)) ) - if entry_dict["cmd"]["encmodeoption"] == []: + if entry_dict["cmd"]["encmodeoption"] == [] and not is_osba_or_omasa: mono = True entry_dict["cmd"]["mono"] = True dec_cmd = mode[1].pop().split() -- GitLab