Commit 041a38c3 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'ci/osba-ivas-modes' into 'main' 

[CI] add missing OSBA modes and input formats for the python test scripts

See merge request !1055
parents 85ec9dfe f93c1d8b

scripts/config/ivas_modes.json

+54 −98
Original line number Diff line number Diff line
@@ -1822,7 +1822,6 @@ 
                    "all": "{sw_files_path}/sw_13k2_512k.bin"

                }

            }

        

        },

        "MASA_2TC_1DIR_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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -7442,10 +7404,7 @@ 
            "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,
@@ -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,

scripts/self_test.py

+4 −2
Original line number Diff line number Diff line
@@ -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()