Commit 9ef6a63e authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 1277-evs-float-and-basop-have-different-thresholds-for-dtx-high-rate-activation-2
parents 4acaa6ec 2f82c697

scripts/config/ivas_modes.json

+2 −5
Original line number Diff line number Diff line
@@ -1946,7 +1946,7 @@ 
                "EXT": []

            },

            "in_config": "MASA2TC",

            "table_name": "MASA 2TC @{table_bitrate} kbps {bandwidth}",

            "table_name": "MASA 2TC @{table_bitrate} kbps RS {bandwidth}",

            "nummetadata": 1,

            "metadatafilenames": [

                "{item}.met"
@@ -1954,9 +1954,6 @@ 
            "rs": true,

            "amr": false,

            "mono": false,

            "rs": true,

            "amr": false,

            "mono": false,

            "bitrates": {

                "wb": {

                    "all": "{sw_files_path}/sw_13k2_512k.bin"
@@ -3310,7 +3307,7 @@ 
                "EXT": []

            },

            "in_config": "ISM3",

            "table_name": "ISM3@{table_bitrate} kbps {bandwidth}",

            "table_name": "ISM3@{table_bitrate} kbps RS {bandwidth}",

            "nummetadata": 3,

            "metadatafilenames": [

                "stvISM{mdi}.csv"