Commit 5c6a54b6 authored by multrus's avatar multrus
Browse files

Merge branch '34-p800-1-p800-2-restrict-evs-ivas-conditions-to-max_band-swb' into 'main'

Resolve "P800-1, P800-2: Restrict EVS, IVAS conditions to "-max_band SWB"

See merge request !74
parents eff4239e 774a6889
Loading
Loading
Loading
Loading
+26 −16
Original line number Diff line number Diff line
@@ -74,56 +74,56 @@ conditions_to_generate:
        bitrates:
            - 7200
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c10:
        type: evs
        bitrates:
            - 8000
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c11:
        type: evs
        bitrates:
            - 9600
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c12:
        type: evs
        bitrates:
            - 13200
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c13:
        type: evs
        bitrates:
            - 16400
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c14:
        type: evs
        bitrates:
            - 24400
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c15:
        type: evs
        bitrates:
            - 32000
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c16:
        type: evs
        bitrates:
            - 7200
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
        tx:
            type: "FER"
@@ -133,7 +133,7 @@ conditions_to_generate:
        bitrates:
            - 8000
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
        tx:
            type: "FER"
@@ -143,7 +143,7 @@ conditions_to_generate:
        bitrates:
            - 9600
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
        tx:
            type: "FER"
@@ -153,7 +153,7 @@ conditions_to_generate:
        bitrates:
            - 13200
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
        tx:
            type: "FER"
@@ -163,7 +163,7 @@ conditions_to_generate:
        bitrates:
            - 16400
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
        tx:
            type: "FER"
@@ -173,7 +173,7 @@ conditions_to_generate:
        bitrates:
            - 24400
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
        tx:
            type: "FER"
@@ -183,7 +183,7 @@ conditions_to_generate:
        bitrates:
            - 32000
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
        tx:
            type: "FER"
@@ -195,6 +195,7 @@ conditions_to_generate:
        bitrates:
            - 13200
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c24:
@@ -202,6 +203,7 @@ conditions_to_generate:
        bitrates:
            - 16400
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c25:
@@ -209,6 +211,7 @@ conditions_to_generate:
        bitrates:
            - 24400
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c26:
@@ -216,6 +219,7 @@ conditions_to_generate:
        bitrates:
            - 32000
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c27:
@@ -223,6 +227,7 @@ conditions_to_generate:
        bitrates:
            - 48000
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c28:
@@ -230,6 +235,7 @@ conditions_to_generate:
        bitrates:
            - 13200
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
        tx:
@@ -240,6 +246,7 @@ conditions_to_generate:
        bitrates:
            - 16400
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
        tx:
@@ -250,6 +257,7 @@ conditions_to_generate:
        bitrates:
            - 24400
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
        tx:
@@ -260,6 +268,7 @@ conditions_to_generate:
        bitrates:
            - 32000
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
        tx:
@@ -270,6 +279,7 @@ conditions_to_generate:
        bitrates:
            - 48000
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
        tx:
@@ -281,7 +291,7 @@ conditions_to_generate:
        bitrates:
            - 24400
        cod:
            opts: ["-dtx"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
            fmt: "STEREO"

@@ -290,7 +300,7 @@ conditions_to_generate:
        bitrates:
            - 13200
        cod:
            opts: ["-dtx"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
            fmt: "STEREO"
        tx:
+24 −19
Original line number Diff line number Diff line
@@ -80,98 +80,98 @@ conditions_to_generate:
        bitrates:
            - 7200
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c10:
        type: evs
        bitrates:
            - 8000
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c11:
        type: evs
        bitrates:
            - 9600
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c12:
        type: evs
        bitrates:
            - 13200
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c13:
        type: evs
        bitrates:
            - 16400
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c14:
        type: evs
        bitrates:
            - 24400
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c15:
        type: evs
        bitrates:
            - 32000
        cod:
            opts: ["-max_band", "FB"]
            opts: ["-max_band", "SWB"]
        dec:
    c16:
        type: evs
        bitrates:
            - 7200
        cod:
            opts: ["-dtx", "-max_band", "FB"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
    c17:
        type: evs
        bitrates:
            - 8000
        cod:
            opts: ["-dtx", "-max_band", "FB"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
    c18:
        type: evs
        bitrates:
            - 9600
        cod:
            opts: ["-dtx", "-max_band", "FB"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
    c19:
        type: evs
        bitrates:
            - 13200
        cod:
            opts: ["-dtx", "-max_band", "FB"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
    c20:
        type: evs
        bitrates:
            - 16400
        cod:
            opts: ["-dtx", "-max_band", "FB"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
    c21:
        type: evs
        bitrates:
            - 24400
        cod:
            opts: ["-dtx", "-max_band", "FB"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
    c22:
        type: evs
        bitrates:
            - 32000
        cod:
            opts: ["-dtx", "-max_band", "FB"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:

    ### IVAS condition ###############################
@@ -180,6 +180,7 @@ conditions_to_generate:
        bitrates:
            - 13200
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c24:
@@ -187,6 +188,7 @@ conditions_to_generate:
        bitrates:
            - 16400
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c25:
@@ -194,6 +196,7 @@ conditions_to_generate:
        bitrates:
            - 24400
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c26:
@@ -201,6 +204,7 @@ conditions_to_generate:
        bitrates:
            - 32000
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c27:
@@ -208,6 +212,7 @@ conditions_to_generate:
        bitrates:
            - 48000
        cod:
            opts: ["-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c28:
@@ -215,7 +220,7 @@ conditions_to_generate:
        bitrates:
            - 13200
        cod:
            opts: ["-dtx"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c29:
@@ -223,7 +228,7 @@ conditions_to_generate:
        bitrates:
            - 16400
        cod:
            opts: ["-dtx"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c30:
@@ -231,7 +236,7 @@ conditions_to_generate:
        bitrates:
            - 24400
        cod:
            opts: ["-dtx"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c31:
@@ -239,7 +244,7 @@ conditions_to_generate:
        bitrates:
            - 32000
        cod:
            opts: ["-dtx"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
            fmt: "STEREO"
    c32:
@@ -247,7 +252,7 @@ conditions_to_generate:
        bitrates:
            - 48000
        cod:
            opts: ["-dtx"]
            opts: ["-dtx", "-max_band", "SWB"]
        dec:
            fmt: "STEREO"