diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index 702413a58bd44648bcb8b2ec495723634145d111..cb474c2862c181b501ca3e21d1ac0699b1917902 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -1822,7 +1822,6 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } - }, "MASA_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ @@ -1937,7 +1936,7 @@ "rs": true, "amr": false, "mono": false, - "rs": true, + "rs": true, "amr": false, "mono": false, "bitrates": { @@ -2866,7 +2865,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" } } }, @@ -2909,7 +2908,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" } } }, @@ -2952,7 +2951,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" } } }, @@ -2995,7 +2994,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" } } }, @@ -3038,7 +3037,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" } } } @@ -3156,7 +3155,7 @@ "all": "{sw_files_path}/sw_32k_128k.bin" } } - }, + }, "ISM1_b{bitrate}_dtx_{bandwidth}_cbr": { "encmodeoption": [ "-ism", @@ -3470,7 +3469,7 @@ 160000, 192000, 256000, - 384000 + 384000 ], "swb": [ 24400, @@ -3483,7 +3482,7 @@ 160000, 192000, 256000, - 384000 + 384000 ], "fb": [ 32000, @@ -3495,7 +3494,7 @@ 160000, 192000, 256000, - 384000 + 384000 ] } }, @@ -3546,7 +3545,7 @@ 160000, 192000, 256000, - 384000 + 384000 ], "swb": [ 24400, @@ -3669,8 +3668,8 @@ 160000, 192000, 256000, - 384000, - 512000 + 384000, + 512000 ], "swb": [ 24400, @@ -3683,8 +3682,8 @@ 160000, 192000, 256000, - 384000, - 512000 + 384000, + 512000 ], "fb": [ 32000, @@ -3696,8 +3695,8 @@ 160000, 192000, 256000, - 384000, - 512000 + 384000, + 512000 ] } }, @@ -4175,7 +4174,7 @@ 160000, 192000, 256000, - 384000 + 384000 ], "fb": [ 32000, @@ -4187,7 +4186,7 @@ 160000, 192000, 256000, - 384000 + 384000 ] } }, @@ -4426,7 +4425,7 @@ ] } } - }, + }, "stereo": { "stereo_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ @@ -5264,7 +5263,6 @@ } } }, - "OMASA": { "OMASA_ISM1_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ @@ -5478,8 +5476,6 @@ ] } }, - - "OMASA_ISM2_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", @@ -5691,8 +5687,6 @@ ] } }, - - "OMASA_ISM3_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", @@ -5905,8 +5899,6 @@ ] } }, - - "OMASA_ISM4_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", @@ -6144,7 +6136,7 @@ "table_name": "OSBA ISM1 HOA3@{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -6196,7 +6188,7 @@ 512000 ] } - }, + }, "OSBA_ISM1_HOA2_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_sba", @@ -6218,7 +6210,7 @@ "table_name": "OSBA ISM1 HOA2@{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -6292,7 +6284,7 @@ "table_name": "OSBA ISM1 FOA@{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": false, "amr": false, @@ -6366,8 +6358,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, @@ -6419,7 +6410,7 @@ 512000 ] } - }, + }, "OSBA_ISM2_HOA2_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_sba", @@ -6441,8 +6432,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, @@ -6516,8 +6506,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, @@ -6591,9 +6580,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, @@ -6645,7 +6632,7 @@ 512000 ] } - }, + }, "OSBA_ISM3_HOA2_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_sba", @@ -6667,9 +6654,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, @@ -6743,9 +6728,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, @@ -6819,10 +6802,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, @@ -6874,7 +6854,7 @@ 512000 ] } - }, + }, "OSBA_ISM4_HOA2_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_sba", @@ -6896,10 +6876,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, @@ -6973,10 +6950,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, @@ -7050,7 +7024,7 @@ "table_name": "OSBA ISM1 HOA3 RS {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -7066,7 +7040,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } - }, + }, "OSBA_ISM1_HOA2_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_sba", @@ -7088,7 +7062,7 @@ "table_name": "OSBA ISM1 HOA2 RS {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -7126,7 +7100,7 @@ "table_name": "OSBA ISM1 FOA RS {bandwidth}", "nummetadata": 1, "metadatafilenames": [ - "{item}_ISM1.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -7164,8 +7138,7 @@ "table_name": "OSBA ISM2 HOA RS {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -7181,7 +7154,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } - }, + }, "OSBA_ISM2_HOA2_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_sba", @@ -7203,8 +7176,7 @@ "table_name": "OSBA ISM2 HOA2 RS {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -7242,8 +7214,7 @@ "table_name": "OSBA ISM2 FOA RS {bandwidth}", "nummetadata": 2, "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv" + "stvISM{mdi}.csv" ], "rs": true, "amr": false, @@ -7281,9 +7252,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, @@ -7299,7 +7268,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } - }, + }, "OSBA_ISM3_HOA2_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_sba", @@ -7321,9 +7290,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, @@ -7361,9 +7328,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, @@ -7401,10 +7366,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, @@ -7420,7 +7382,7 @@ "all": "{sw_files_path}/sw_13k2_512k.bin" } } - }, + }, "OSBA_ISM4_HOA2_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_sba", @@ -7442,16 +7404,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": { @@ -7483,10 +7442,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, @@ -7504,4 +7460,4 @@ } } } -} +} \ No newline at end of file diff --git a/scripts/self_test.py b/scripts/self_test.py index 321f83419bfc9b370755b3f0063342d880db40b0..247396e7d4451b1c6d6d05353a7c6b5c5554644d 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()