Commit 009b76be authored by norvell's avatar norvell
Browse files

Merge branch '423-add-ism-extended-metadata-to-ivas_modes-json-for-complexity-tests' into 'main'

Added extended metadata to ivas_modes.json for complexity tests

See merge request !579
parents 45676c9d c998c189
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,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:
+420 −0
Original line number Diff line number Diff line
@@ -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": [