diff --git a/scripts/config/ci_linux.json b/scripts/config/ci_linux.json index 33d46408b4193988d840995c876636d1d7c88b58..93a7f9eadb5521cf7746cd107a3f4dd54f2689c5 100644 --- a/scripts/config/ci_linux.json +++ b/scripts/config/ci_linux.json @@ -8,10 +8,8 @@ "HOA2": "/usr/local/testv/stv2OA48c.wav", "HOA3": "/usr/local/testv/stv3OA48c.wav", "SBA": "/usr/local/testv/stv3OA48c.wav", - "MASA1TC1DIR": "/usr/local/testv/stv1MASA1TC48c.wav", - "MASA1TC2DIR": "/usr/local/testv/stv2MASA1TC48c.wav", - "MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav", - "MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav", + "MASA1TC": "/usr/local/testv/stv1MASA1TC48c.wav", + "MASA2TC": "/usr/local/testv/stv1MASA2TC48c.wav", "5_1": "/usr/local/testv/stv51MC48c.wav", "5_1_2": "/usr/local/testv/stv512MC48c.wav", "5_1_4": "/usr/local/testv/stv514MC48c.wav", @@ -21,22 +19,14 @@ "ISM2": "/usr/local/testv/stv2ISM48s.wav", "ISM3": "/usr/local/testv/stv3ISM48s.wav", "ISM4": "/usr/local/testv/stv4ISM48s.wav", - "OMASA_ISM1_1TC1DIR": "/usr/local/testv/stvOMASA_1ISM_1MASA1TC48c.wav", - "OMASA_ISM1_1TC2DIR": "/usr/local/testv/stvOMASA_1ISM_2MASA1TC48c.wav", - "OMASA_ISM1_2TC1DIR": "/usr/local/testv/stvOMASA_1ISM_1MASA2TC48c.wav", - "OMASA_ISM1_2TC2DIR": "/usr/local/testv/stvOMASA_1ISM_2MASA2TC48c.wav", - "OMASA_ISM2_1TC1DIR": "/usr/local/testv/stvOMASA_2ISM_1MASA1TC48c.wav", - "OMASA_ISM2_1TC2DIR": "/usr/local/testv/stvOMASA_2ISM_2MASA1TC48c.wav", - "OMASA_ISM2_2TC1DIR": "/usr/local/testv/stvOMASA_2ISM_1MASA2TC48c.wav", - "OMASA_ISM2_2TC2DIR": "/usr/local/testv/stvOMASA_2ISM_2MASA2TC48c.wav", - "OMASA_ISM3_1TC1DIR": "/usr/local/testv/stvOMASA_3ISM_1MASA1TC48c.wav", - "OMASA_ISM3_1TC2DIR": "/usr/local/testv/stvOMASA_3ISM_2MASA1TC48c.wav", - "OMASA_ISM3_2TC1DIR": "/usr/local/testv/stvOMASA_3ISM_1MASA2TC48c.wav", - "OMASA_ISM3_2TC2DIR": "/usr/local/testv/stvOMASA_3ISM_2MASA2TC48c.wav", - "OMASA_ISM4_1TC1DIR": "/usr/local/testv/stvOMASA_4ISM_1MASA1TC48c.wav", - "OMASA_ISM4_1TC2DIR": "/usr/local/testv/stvOMASA_4ISM_2MASA1TC48c.wav", - "OMASA_ISM4_2TC1DIR": "/usr/local/testv/stvOMASA_4ISM_1MASA2TC48c.wav", - "OMASA_ISM4_2TC2DIR": "/usr/local/testv/stvOMASA_4ISM_2MASA2TC48c.wav", + "OMASA_ISM1_1TC": "/usr/local/testv/stvOMASA_1ISM_1MASA1TC48c.wav", + "OMASA_ISM1_2TC": "/usr/local/testv/stvOMASA_1ISM_1MASA2TC48c.wav", + "OMASA_ISM2_1TC": "/usr/local/testv/stvOMASA_2ISM_1MASA1TC48c.wav", + "OMASA_ISM2_2TC": "/usr/local/testv/stvOMASA_2ISM_1MASA2TC48c.wav", + "OMASA_ISM3_1TC": "/usr/local/testv/stvOMASA_3ISM_1MASA1TC48c.wav", + "OMASA_ISM3_2TC": "/usr/local/testv/stvOMASA_3ISM_1MASA2TC48c.wav", + "OMASA_ISM4_1TC": "/usr/local/testv/stvOMASA_4ISM_1MASA1TC48c.wav", + "OMASA_ISM4_2TC": "/usr/local/testv/stvOMASA_4ISM_1MASA2TC48c.wav", "OSBA_ISM1_FOA": "/usr/local/testv/stvOSBA_1ISM_FOA48c.wav", "OSBA_ISM1_HOA2": "/usr/local/testv/stvOSBA_1ISM_2OA48c.wav", "OSBA_ISM1_HOA3": "/usr/local/testv/stvOSBA_1ISM_3OA48c.wav", diff --git a/scripts/config/ci_linux_ltv.json b/scripts/config/ci_linux_ltv.json index 804d87b9c0ca28883cd46feaf7a59ee569e950a4..3d6f8fa400ae366d57fe53977ac859d6056b48e8 100644 --- a/scripts/config/ci_linux_ltv.json +++ b/scripts/config/ci_linux_ltv.json @@ -8,10 +8,8 @@ "HOA2": "/usr/local/ltv/ltv48_HOA2.wav", "HOA3": "/usr/local/ltv/ltv48_HOA3.wav", "SBA": "/usr/local/ltv/ltv48_HOA3.wav", - "MASA1TC1DIR": "/usr/local/testv/stv1MASA1TC48c.wav", - "MASA1TC2DIR": "/usr/local/testv/stv2MASA1TC48c.wav", - "MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav", - "MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav", + "MASA1TC": "/usr/local/ltv/ltv48_MASA1TC.wav", + "MASA2TC": "/usr/local/ltv/ltv48_MASA2TC.wav", "5_1": "/usr/local/ltv/ltv48_MC51.wav", "5_1_2": "/usr/local/ltv/ltv48_MC512.wav", "5_1_4": "/usr/local/ltv/ltv48_MC514.wav", @@ -20,6 +18,26 @@ "ISM1": "/usr/local/ltv/ltv48_1ISM.wav", "ISM2": "/usr/local/ltv/ltv48_2ISM.wav", "ISM3": "/usr/local/ltv/ltv48_3ISM.wav", - "ISM4": "/usr/local/ltv/ltv48_4ISM.wav" + "ISM4": "/usr/local/ltv/ltv48_4ISM.wav", + "OMASA_ISM1_1TC": "/usr/local/ltv/ltv48_OMASA_1ISM_1TC48c.wav", + "OMASA_ISM1_2TC": "/usr/local/ltv/ltv48_OMASA_1ISM_2TC48c.wav", + "OMASA_ISM2_1TC": "/usr/local/ltv/ltv48_OMASA_2ISM_1TC48c.wav", + "OMASA_ISM2_2TC": "/usr/local/ltv/ltv48_OMASA_2ISM_2TC48c.wav", + "OMASA_ISM3_1TC": "/usr/local/ltv/ltv48_OMASA_3ISM_1TC48c.wav", + "OMASA_ISM3_2TC": "/usr/local/ltv/ltv48_OMASA_3ISM_2TC48c.wav", + "OMASA_ISM4_1TC": "/usr/local/ltv/ltv48_OMASA_4ISM_1TC48c.wav", + "OMASA_ISM4_2TC": "/usr/local/ltv/ltv48_OMASA_4ISM_2TC48c.wav", + "OSBA_ISM1_FOA": "/usr/local/ltv/ltv48_OSBA_1ISM_FOA48c.wav", + "OSBA_ISM1_HOA2": "/usr/local/ltv/ltv48_OSBA_1ISM_2OA48c.wav", + "OSBA_ISM1_HOA3": "/usr/local/ltv/ltv48_OSBA_1ISM_3OA48c.wav", + "OSBA_ISM2_FOA": "/usr/local/ltv/ltv48_OSBA_2ISM_FOA48c.wav", + "OSBA_ISM2_HOA2": "/usr/local/ltv/ltv48_OSBA_2ISM_2OA48c.wav", + "OSBA_ISM2_HOA3": "/usr/local/ltv/ltv48_OSBA_2ISM_3OA48c.wav", + "OSBA_ISM3_FOA": "/usr/local/ltv/ltv48_OSBA_3ISM_FOA48c.wav", + "OSBA_ISM3_HOA2": "/usr/local/ltv/ltv48_OSBA_3ISM_2OA48c.wav", + "OSBA_ISM3_HOA3": "/usr/local/ltv/ltv48_OSBA_3ISM_3OA48c.wav", + "OSBA_ISM4_FOA": "/usr/local/ltv/ltv48_OSBA_4ISM_FOA48c.wav", + "OSBA_ISM4_HOA2": "/usr/local/ltv/ltv48_OSBA_4ISM_2OA48c.wav", + "OSBA_ISM4_HOA3": "/usr/local/ltv/ltv48_OSBA_4ISM_3OA48c.wav" } } diff --git a/scripts/config/ci_linux_sidstart_test.json b/scripts/config/ci_linux_sidstart_test.json index 024b1a213dc16ad63d4cd198dc48682c398c55ac..787efbf82cb0323a3dc5400a95e2f02067c7d2b7 100644 --- a/scripts/config/ci_linux_sidstart_test.json +++ b/scripts/config/ci_linux_sidstart_test.json @@ -8,10 +8,8 @@ "HOA2": "/usr/local/ltv/ltv48_HOA2.wav", "HOA3": "/usr/local/ltv/ltv48_HOA3.wav", "SBA": "/usr/local/ltv/ltv48_HOA3.wav", - "MASA1TC1DIR": "/usr/local/ltv/ltv48_MASA1TC.wav", - "MASA1TC2DIR": "/usr/local/ltv/ltv48_MASA1TC.wav", - "MASA2TC1DIR": "/usr/local/ltv/ltv48_MASA2TC.wav", - "MASA2TC2DIR": "/usr/local/ltv/ltv48_MASA2TC.wav", + "MASA1TC": "/usr/local/ltv/ltv48_MASA1TC.wav", + "MASA2TC": "/usr/local/ltv/ltv48_MASA2TC.wav", "5_1": "/usr/local/testv/stv51MC48c.wav", "5_1_2": "/usr/local/testv/stv512MC48c.wav", "5_1_4": "/usr/local/testv/stv514MC48c.wav", diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json index cb474c2862c181b501ca3e21d1ac0699b1917902..0f6596b9f6d0ca85e59d72fb38653204c8dd7221 100644 --- a/scripts/config/ivas_modes.json +++ b/scripts/config/ivas_modes.json @@ -1698,7 +1698,7 @@ } }, "MASA": { - "MASA_1TC_1DIR_b{bitrate}_{bandwidth}_cbr": { + "MASA_1TC_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-masa", "1" @@ -1723,8 +1723,8 @@ "stereo": [], "EXT": [] }, - "in_config": "MASA1TC1DIR", - "table_name": "MASA 1TC 1DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "MASA1TC", + "table_name": "MASA 1TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ "{item}.met" @@ -1777,7 +1777,7 @@ ] } }, - "MASA_1TC_1DIR_b{bitrate}_{bandwidth}_rs": { + "MASA_1TC_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-masa", "1" @@ -1802,8 +1802,8 @@ "stereo": [], "EXT": [] }, - "in_config": "MASA1TC1DIR", - "table_name": "MASA 1TC 1DIR@{table_bitrate} kbps RS {bandwidth}", + "in_config": "MASA1TC", + "table_name": "MASA 1TC @{table_bitrate} kbps RS {bandwidth}", "nummetadata": 1, "metadatafilenames": [ "{item}.met" @@ -1823,7 +1823,7 @@ } } }, - "MASA_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { + "MASA_2TC_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-masa", "2" @@ -1848,8 +1848,8 @@ "stereo": [], "EXT": [] }, - "in_config": "MASA2TC1DIR", - "table_name": "MASA 2TC 1DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "MASA2TC", + "table_name": "MASA 2TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ "{item}.met" @@ -1902,7 +1902,7 @@ ] } }, - "MASA_2TC_1DIR_b{bitrate}_{bandwidth}_rs": { + "MASA_2TC_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-masa", "2" @@ -1927,8 +1927,8 @@ "stereo": [], "EXT": [] }, - "in_config": "MASA2TC1DIR", - "table_name": "MASA 2TC 1DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "MASA2TC", + "table_name": "MASA 2TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 1, "metadatafilenames": [ "{item}.met" @@ -1951,329 +1951,11 @@ } } }, - "MASA_1TC_2DIR_b{bitrate}_{bandwidth}_cbr": { + "MASA_1TC_b{bitrate}_dtx_{bandwidth}_cbr": { "encmodeoption": [ "-masa", "1" ], - "encoptions": [ - "-max_band", - "{bandwidth}" - ], - "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": [] - }, - "in_config": "MASA1TC2DIR", - "table_name": "MASA 1TC 2DIR@{table_bitrate} kbps {bandwidth}", - "nummetadata": 1, - "metadatafilenames": [ - "{item}.met" - ], - "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": [ - 32000, - 48000, - 64000, - 80000, - 96000, - 128000, - 192000, - 256000, - 384000, - 512000 - ] - } - }, - "MASA_2TC_2DIR_b{bitrate}_{bandwidth}_cbr": { - "encmodeoption": [ - "-masa", - "2" - ], - "encoptions": [ - "-max_band", - "{bandwidth}" - ], - "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": [] - }, - "in_config": "MASA2TC2DIR", - "table_name": "MASA 2TC 2DIR@{table_bitrate} kbps {bandwidth}", - "nummetadata": 1, - "metadatafilenames": [ - "{item}.met" - ], - "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": [ - 32000, - 48000, - 64000, - 80000, - 96000, - 128000, - 192000, - 256000, - 384000, - 512000 - ] - } - }, - "MASA_1TC_1DIR_b{bitrate}_dtx_{bandwidth}_cbr": { - "encmodeoption": [ - "-masa", - "1" - ], - "encoptions": [ - "-dtx", - "-max_band", - "{bandwidth}" - ], - "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": [] - }, - "in_config": "MASA1TC1DIR", - "table_name": "MASA 1TC 1DIR@{table_bitrate} kbps DTX {bandwidth}", - "nummetadata": 1, - "metadatafilenames": [ - "{item}.met" - ], - "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": [ - 32000, - 48000, - 64000, - 80000, - 96000, - 128000, - 192000, - 256000, - 384000, - 512000 - ] - } - }, - "MASA_1TC_2DIR_b{bitrate}_dtx_{bandwidth}_cbr": { - "encmodeoption": [ - "-masa", - "1" - ], - "encoptions": [ - "-dtx", - "-max_band", - "{bandwidth}" - ], - "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": [] - }, - "in_config": "MASA1TC2DIR", - "table_name": "MASA 1TC 2DIR@{table_bitrate} kbps DTX {bandwidth}", - "nummetadata": 1, - "metadatafilenames": [ - "{item}.met" - ], - "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": [ - 32000, - 48000, - 64000, - 80000, - 96000, - 128000, - 192000, - 256000, - 384000, - 512000 - ] - } - }, - "MASA_2TC_1DIR_b{bitrate}_dtx_{bandwidth}_cbr": { - "encmodeoption": [ - "-masa", - "2" - ], "encoptions": [ "-dtx", "-max_band", @@ -2295,8 +1977,8 @@ "stereo": [], "EXT": [] }, - "in_config": "MASA2TC1DIR", - "table_name": "MASA 2TC 1DIR@{table_bitrate} kbps DTX {bandwidth}", + "in_config": "MASA1TC", + "table_name": "MASA 1TC @{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 1, "metadatafilenames": [ "{item}.met" @@ -2349,7 +2031,7 @@ ] } }, - "MASA_2TC_2DIR_b{bitrate}_dtx_{bandwidth}_cbr": { + "MASA_2TC_b{bitrate}_dtx_{bandwidth}_cbr": { "encmodeoption": [ "-masa", "2" @@ -2375,8 +2057,8 @@ "stereo": [], "EXT": [] }, - "in_config": "MASA2TC2DIR", - "table_name": "MASA 2TC 2DIR@{table_bitrate} kbps DTX {bandwidth}", + "in_config": "MASA2TC", + "table_name": "MASA 2TC @{table_bitrate} kbps DTX {bandwidth}", "nummetadata": 1, "metadatafilenames": [ "{item}.met" @@ -5264,7 +4946,7 @@ } }, "OMASA": { - "OMASA_ISM1_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { + "OMASA_ISM1_2TC_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", "1", @@ -5281,8 +4963,8 @@ "stereo": [], "EXT": [] }, - "in_config": "OMASA_ISM1_2TC1DIR", - "table_name": "OMASA ISM1 2TC 1DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "OMASA_ISM1_2TC", + "table_name": "OMASA ISM1 2TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 2, "metadatafilenames": [ "{item}_ISM1.csv", @@ -5339,7 +5021,7 @@ ] } }, - "OMASA_ISM1_2TC_2DIR_b{bitrate}_{bandwidth}_rs": { + "OMASA_ISM1_2TC_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_masa", "1", @@ -5356,8 +5038,8 @@ "stereo": [], "EXT": [] }, - "in_config": "OMASA_ISM1_2TC2DIR", - "table_name": "OMASA ISM1 2TC 2DIR@{table_bitrate} RS {bandwidth}", + "in_config": "OMASA_ISM1_2TC", + "table_name": "OMASA ISM1 2TC @{table_bitrate} RS {bandwidth}", "nummetadata": 2, "metadatafilenames": [ "{item}_ISM1.csv", @@ -5378,56 +5060,7 @@ } } }, - "OMASA_ISM1_1TC_1DIR_b{bitrate}_{bandwidth}_cbr": { - "encmodeoption": [ - "-ism_masa", - "1", - "1" - ], - "encoptions": [ - "-max_band", - "{bandwidth}" - ], - "dec": { - "7_1_4": [], - "HOA3": [], - "mono": [], - "stereo": [], - "EXT": [] - }, - "in_config": "OMASA_ISM1_1TC1DIR", - "table_name": "OMASA ISM1 1TC 1DIR@{table_bitrate} kbps {bandwidth}", - "nummetadata": 2, - "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}.met" - ], - "rs": false, - "amr": false, - "mono": false, - "bitrates": { - "wb": [ - 13200, - 32000, - 80000, - 192000, - 512000 - ], - "swb": [ - 16400, - 48000, - 96000, - 256000 - ], - "fb": [ - 24400, - 64000, - 128000, - 384000 - ] - } - }, - "OMASA_ISM1_1TC_2DIR_b{bitrate}_{bandwidth}_cbr": { + "OMASA_ISM1_1TC_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", "1", @@ -5444,8 +5077,8 @@ "stereo": [], "EXT": [] }, - "in_config": "OMASA_ISM1_1TC2DIR", - "table_name": "OMASA ISM1 1TC 2DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "OMASA_ISM1_1TC", + "table_name": "OMASA ISM1 1TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 2, "metadatafilenames": [ "{item}_ISM1.csv", @@ -5476,7 +5109,7 @@ ] } }, - "OMASA_ISM2_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { + "OMASA_ISM2_2TC_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", "2", @@ -5492,8 +5125,8 @@ "mono": [], "stereo": [] }, - "in_config": "OMASA_ISM2_2TC1DIR", - "table_name": "OMASA ISM2 2TC 1DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "OMASA_ISM2_2TC", + "table_name": "OMASA ISM2 2TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 3, "metadatafilenames": [ "{item}_ISM1.csv", @@ -5551,7 +5184,7 @@ ] } }, - "OMASA_ISM2_2TC_2DIR_b{bitrate}_{bandwidth}_rs": { + "OMASA_ISM2_2TC_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_masa", "2", @@ -5567,8 +5200,8 @@ "mono": [], "stereo": [] }, - "in_config": "OMASA_ISM2_2TC2DIR", - "table_name": "OMASA ISM2 2TC 2DIR@{table_bitrate} RS {bandwidth}", + "in_config": "OMASA_ISM2_2TC", + "table_name": "OMASA ISM2 2TC @{table_bitrate} RS {bandwidth}", "nummetadata": 3, "metadatafilenames": [ "{item}_ISM1.csv", @@ -5590,54 +5223,7 @@ } } }, - "OMASA_ISM2_1TC_1DIR_b{bitrate}_{bandwidth}_cbr": { - "encmodeoption": [ - "-ism_masa", - "2", - "1" - ], - "encoptions": [ - "-max_band", - "{bandwidth}" - ], - "dec": { - "7_1_4": [], - "HOA3": [], - "mono": [], - "stereo": [], - "EXT": [] - }, - "in_config": "OMASA_ISM2_1TC1DIR", - "table_name": "OMASA ISM2 1TC 1DIR@{table_bitrate} kbps {bandwidth}", - "nummetadata": 3, - "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}.met" - ], - "rs": false, - "amr": false, - "mono": false, - "bitrates": { - "wb": [ - 80000, - 192000, - 512000 - ], - "swb": [ - 48000, - 96000, - 160000, - 256000 - ], - "fb": [ - 64000, - 128000, - 384000 - ] - } - }, - "OMASA_ISM2_1TC_2DIR_b{bitrate}_{bandwidth}_cbr": { + "OMASA_ISM2_1TC_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", "2", @@ -5653,8 +5239,8 @@ "mono": [], "stereo": [] }, - "in_config": "OMASA_ISM2_1TC2DIR", - "table_name": "OMASA ISM2 1TC 2DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "OMASA_ISM2_1TC", + "table_name": "OMASA ISM2 1TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 3, "metadatafilenames": [ "{item}_ISM1.csv", @@ -5687,7 +5273,7 @@ ] } }, - "OMASA_ISM3_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { + "OMASA_ISM3_2TC_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", "3", @@ -5703,8 +5289,8 @@ "mono": [], "stereo": [] }, - "in_config": "OMASA_ISM3_2TC1DIR", - "table_name": "OMASA ISM3 2TC 1DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "OMASA_ISM3_2TC", + "table_name": "OMASA ISM3 2TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 4, "metadatafilenames": [ "{item}_ISM1.csv", @@ -5763,7 +5349,7 @@ ] } }, - "OMASA_ISM3_2TC_2DIR_b{bitrate}_{bandwidth}_rs": { + "OMASA_ISM3_2TC_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_masa", "3", @@ -5779,8 +5365,8 @@ "mono": [], "stereo": [] }, - "in_config": "OMASA_ISM3_2TC2DIR", - "table_name": "OMASA ISM3 2TC 2DIR@{table_bitrate} RS {bandwidth}", + "in_config": "OMASA_ISM3_2TC", + "table_name": "OMASA ISM3 2TC @{table_bitrate} RS {bandwidth}", "nummetadata": 4, "metadatafilenames": [ "{item}_ISM1.csv", @@ -5803,52 +5389,7 @@ } } }, - "OMASA_ISM3_1TC_1DIR_b{bitrate}_{bandwidth}_cbr": { - "encmodeoption": [ - "-ism_masa", - "3", - "1" - ], - "encoptions": [ - "-max_band", - "{bandwidth}" - ], - "dec": { - "7_1_4": [], - "HOA3": [], - "mono": [], - "stereo": [], - "EXT": [] - }, - "in_config": "OMASA_ISM3_1TC1DIR", - "table_name": "OMASA ISM3 1TC 1DIR@{table_bitrate} kbps {bandwidth}", - "nummetadata": 4, - "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv", - "{item}.met" - ], - "rs": false, - "amr": false, - "mono": false, - "bitrates": { - "wb": [ - 192000, - 512000 - ], - "swb": [ - 96000, - 160000, - 256000 - ], - "fb": [ - 128000, - 384000 - ] - } - }, - "OMASA_ISM3_1TC_2DIR_b{bitrate}_{bandwidth}_cbr": { + "OMASA_ISM3_1TC_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", "3", @@ -5864,8 +5405,8 @@ "mono": [], "stereo": [] }, - "in_config": "OMASA_ISM3_1TC2DIR", - "table_name": "OMASA ISM3 1TC 2DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "OMASA_ISM3_1TC", + "table_name": "OMASA ISM3 1TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 4, "metadatafilenames": [ "{item}_ISM1.csv", @@ -5899,7 +5440,7 @@ ] } }, - "OMASA_ISM4_2TC_1DIR_b{bitrate}_{bandwidth}_cbr": { + "OMASA_ISM4_2TC_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", "4", @@ -5915,8 +5456,8 @@ "mono": [], "stereo": [] }, - "in_config": "OMASA_ISM4_2TC1DIR", - "table_name": "OMASA ISM4 2TC 1DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "OMASA_ISM4_2TC", + "table_name": "OMASA ISM4 2TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 5, "metadatafilenames": [ "{item}_ISM1.csv", @@ -5976,7 +5517,7 @@ ] } }, - "OMASA_ISM4_2TC_2DIR_b{bitrate}_{bandwidth}_rs": { + "OMASA_ISM4_2TC_b{bitrate}_{bandwidth}_rs": { "encmodeoption": [ "-ism_masa", "4", @@ -5992,8 +5533,8 @@ "mono": [], "stereo": [] }, - "in_config": "OMASA_ISM4_2TC2DIR", - "table_name": "OMASA ISM4 2TC 2DIR@{table_bitrate} RS {bandwidth}", + "in_config": "OMASA_ISM4_2TC", + "table_name": "OMASA ISM4 2TC @{table_bitrate} RS {bandwidth}", "nummetadata": 5, "metadatafilenames": [ "{item}_ISM1.csv", @@ -6017,52 +5558,7 @@ } } }, - "OMASA_ISM4_1TC_1DIR_b{bitrate}_{bandwidth}_cbr": { - "encmodeoption": [ - "-ism_masa", - "4", - "1" - ], - "encoptions": [ - "-max_band", - "{bandwidth}" - ], - "dec": { - "7_1_4": [], - "HOA3": [], - "mono": [], - "stereo": [], - "EXT": [] - }, - "in_config": "OMASA_ISM4_1TC1DIR", - "table_name": "OMASA ISM4 1TC 1DIR@{table_bitrate} kbps {bandwidth}", - "nummetadata": 5, - "metadatafilenames": [ - "{item}_ISM1.csv", - "{item}_ISM2.csv", - "{item}_ISM3.csv", - "{item}_ISM4.csv", - "{item}.met" - ], - "rs": false, - "amr": false, - "mono": false, - "bitrates": { - "wb": [ - 192000, - 512000 - ], - "swb": [ - 160000, - 256000 - ], - "fb": [ - 128000, - 384000 - ] - } - }, - "OMASA_ISM4_1TC_2DIR_b{bitrate}_{bandwidth}_cbr": { + "OMASA_ISM4_1TC_b{bitrate}_{bandwidth}_cbr": { "encmodeoption": [ "-ism_masa", "4", @@ -6078,8 +5574,8 @@ "mono": [], "stereo": [] }, - "in_config": "OMASA_ISM4_1TC2DIR", - "table_name": "OMASA ISM4 1TC 2DIR@{table_bitrate} kbps {bandwidth}", + "in_config": "OMASA_ISM4_1TC", + "table_name": "OMASA ISM4 1TC @{table_bitrate} kbps {bandwidth}", "nummetadata": 5, "metadatafilenames": [ "{item}_ISM1.csv", @@ -7460,4 +6956,4 @@ } } } -} \ No newline at end of file +}