Commit 205e9b0b authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'fix_decoder_formats_in_config_files' into 'main'

add decoder formats explicitly to correctly use external renderer

See merge request !63
parents bdc7ba79 f624219e
Loading
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -162,30 +162,35 @@ conditions_to_generate:
            - 13200
        cod:
        dec:
            fmt: "ISM1"
    c22:
        type: ivas
        bitrates:
            - 16400
        cod:
        dec:
            fmt: "ISM1"
    c23:
        type: ivas
        bitrates:
            - 24400
        cod:
        dec:
            fmt: "ISM1"
    c24:
        type: ivas
        bitrates:
            - 32000
        cod:
        dec:
            fmt: "ISM1"
    c25:
        type: ivas
        bitrates:
            - 13200
        cod:
        dec:
            fmt: "ISM1"
        tx:
            type: "FER"
            error_rate: 5
@@ -195,6 +200,7 @@ conditions_to_generate:
            - 16400
        cod:
        dec:
            fmt: "ISM1"
        tx:
            type: "FER"
            error_rate: 5
@@ -204,6 +210,7 @@ conditions_to_generate:
            - 24400
        cod:
        dec:
            fmt: "ISM1"
        tx:
            type: "FER"
            error_rate: 5
@@ -214,6 +221,7 @@ conditions_to_generate:
        cod:
            opts: ["-dtx"]
        dec:
            fmt: "ISM1"
    c29:
        type: ivas
        bitrates:
@@ -221,6 +229,7 @@ conditions_to_generate:
        cod:
            opts: ["-dtx"]
        dec:
            fmt: "ISM1"
    c30:
        type: ivas
        bitrates:
@@ -228,6 +237,7 @@ conditions_to_generate:
        cod:
            opts: ["-dtx"]
        dec:
            fmt: "ISM1"


################################################
+12 −0
Original line number Diff line number Diff line
@@ -176,30 +176,35 @@ conditions_to_generate:
            - 16400
        cod:
        dec:
            fmt: "ISM2"
    c24:
        type: ivas
        bitrates:
            - 24400
        cod:
        dec:
            fmt: "ISM2"
    c25:
        type: ivas
        bitrates:
            - 32000
        cod:
        dec:
            fmt: "ISM2"
    c26:
        type: ivas
        bitrates:
            - 48000
        cod:
        dec:
            fmt: "ISM2"
    c27:
        type: ivas
        bitrates:
            - 16400
        cod:
        dec:
            fmt: "ISM2"
        tx:
            type: "FER"
            error_rate: 5
@@ -209,6 +214,7 @@ conditions_to_generate:
            - 24400
        cod:
        dec:
            fmt: "ISM2"
        tx:
            type: "FER"
            error_rate: 5
@@ -218,6 +224,7 @@ conditions_to_generate:
            - 32000
        cod:
        dec:
            fmt: "ISM2"
        tx:
            type: "FER"
            error_rate: 5
@@ -227,6 +234,7 @@ conditions_to_generate:
            - 48000
        cod:
        dec:
            fmt: "ISM2"
        tx:
            type: "FER"
            error_rate: 5
@@ -237,6 +245,7 @@ conditions_to_generate:
        cod:
            opts: ["-dtx"]
        dec:
            fmt: "ISM2"
    c32:
        type: ivas
        bitrates:
@@ -244,6 +253,7 @@ conditions_to_generate:
        cod:
            opts: ["-dtx"]
        dec:
            fmt: "ISM2"
    c33:
        type: ivas
        bitrates:
@@ -251,6 +261,7 @@ conditions_to_generate:
        cod:
            opts: ["-dtx"]
        dec:
            fmt: "ISM2"
    c34:
        type: ivas
        bitrates:
@@ -258,6 +269,7 @@ conditions_to_generate:
        cod:
            opts: ["-dtx"]
        dec:
            fmt: "ISM2"


################################################