Commit aadf545e authored by Fabian Müller's avatar Fabian Müller
Browse files

Fix formatting and categories in P800-1

parent 861b3753
Loading
Loading
Loading
Loading
Loading
+11 −12
Original line number Diff line number Diff line
@@ -43,20 +43,18 @@ preprocessing:
### Configuration for conditions under test
################################################
conditions_to_generate:
    ### Reference and anchor conditions ##########################
    ### Reference and Anchor conditions ###
    # TODO: cat 2
    c01:
        type: ref

    ### MNRU conditions ###############################
    ### MNRU conditions ###
    c02:
        type: mnru
        q: 27
    # TODO: cat 1
    c03:
        type: mnru
        # Table F.1.2 specifies c03 as MNRU Q = 27 dB
        # This conflicts with Table F.1.3. Config reflects F.1.3.
        q: 22
    c04:
        type: mnru
@@ -66,7 +64,7 @@ conditions_to_generate:
        type: mnru
        q: 12

    ### ESDRU conditions ###############################
    ### ESDRU conditions ###
    # TODO: cat 3
    c06:
        type: esdru
@@ -83,7 +81,7 @@ conditions_to_generate:
        type: esdru
        alpha: 0.1

    ### IVAS FX/FL mix conditions ###############################
    ### IVAS FX/FL mix conditions ###
    c10:
        type: ivas
        bitrates:
@@ -157,8 +155,7 @@ conditions_to_generate:
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx

    ### IVAS FL conditions ###############################
    # TODO: cat 1
    ### IVAS FL conditions ###
    c19:
        type: ivas
        bitrates:
@@ -167,7 +164,7 @@ conditions_to_generate:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
    # TODO: cat 4
    # TODO: cat 1
    c20:
        type: ivas
        bitrates:
@@ -176,6 +173,7 @@ conditions_to_generate:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
    # TODO: cat 4
    c21:
        type: ivas
        bitrates:
@@ -210,6 +208,7 @@ conditions_to_generate:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
    # TODO: cat 2
    c25:
        type: ivas
        bitrates:
@@ -218,7 +217,7 @@ conditions_to_generate:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
    # TODO: cat 2
    # TODO: cat 3
    c26:
        type: ivas
        bitrates:
@@ -227,7 +226,6 @@ conditions_to_generate:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
    # TODO: cat 3
    c27:
        type: ivas
        bitrates:
@@ -237,7 +235,7 @@ conditions_to_generate:
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref

    ### IVAS FX conditions ###############################
    ### IVAS FX conditions ###
    c28:
        type: ivas
        bitrates:
@@ -311,6 +309,7 @@ conditions_to_generate:
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx


################################################
### Post-processing
################################################
+88 −62
Original line number Diff line number Diff line
@@ -43,20 +43,18 @@ preprocessing:
### Configuration for conditions under test
################################################
conditions_to_generate:
    ### Reference and anchor conditions ##########################
    ### Reference and Anchor conditions ###
    # TODO: cat 2
    c01:
        type: ref

    ### MNRU conditions ###############################
    ### MNRU conditions ###
    c02:
        type: mnru
        q: 27
    # TODO: cat 1
    c03:
        type: mnru
        # Table F.2.2 specifies c03 as MNRU Q = 27 dB
        # This conflicts with Table F.2.3. Config reflects F.2.3.
        q: 22
    c04:
        type: mnru
@@ -66,7 +64,7 @@ conditions_to_generate:
        type: mnru
        q: 12

    ### ESDRU conditions ###############################
    ### ESDRU conditions ###
    # TODO: cat 3
    c06:
        type: esdru
@@ -83,18 +81,19 @@ conditions_to_generate:
        type: esdru
        alpha: 0.1

    ### IVAS FX/FL mix conditions ###############################
    ### IVAS FX/FL mix conditions ###
    c10:
        type: ivas
        bitrates:
            - 13200
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c11:
        type: ivas
@@ -102,11 +101,12 @@ conditions_to_generate:
            - 16400
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c12:
        type: ivas
@@ -114,11 +114,12 @@ conditions_to_generate:
            - 24400
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c13:
        type: ivas
@@ -126,11 +127,12 @@ conditions_to_generate:
            - 32000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c14:
        type: ivas
@@ -138,11 +140,12 @@ conditions_to_generate:
            - 48000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c15:
        type: ivas
@@ -150,11 +153,12 @@ conditions_to_generate:
            - 64000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c16:
        type: ivas
@@ -162,11 +166,12 @@ conditions_to_generate:
            - 80000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c17:
        type: ivas
@@ -174,11 +179,12 @@ conditions_to_generate:
            - 96000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c18:
        type: ivas
@@ -186,14 +192,15 @@ conditions_to_generate:
            - 128000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5

    ### IVAS FL conditions ###############################
    ### IVAS FL conditions ###
    # TODO: cat 1
    c19:
        type: ivas
@@ -201,11 +208,12 @@ conditions_to_generate:
            - 13200
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    # TODO: cat 4
    c20:
@@ -214,11 +222,12 @@ conditions_to_generate:
            - 16400
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c21:
        type: ivas
@@ -226,11 +235,12 @@ conditions_to_generate:
            - 24400
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    # TODO: cat 6
    c22:
@@ -239,11 +249,12 @@ conditions_to_generate:
            - 32000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c23:
        type: ivas
@@ -251,11 +262,12 @@ conditions_to_generate:
            - 48000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    # TODO: cat 6
    c24:
@@ -264,11 +276,12 @@ conditions_to_generate:
            - 64000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c25:
        type: ivas
@@ -276,11 +289,12 @@ conditions_to_generate:
            - 80000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    # TODO: cat 2
    c26:
@@ -289,11 +303,12 @@ conditions_to_generate:
            - 96000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    # TODO: cat 3
    c27:
@@ -302,25 +317,27 @@ conditions_to_generate:
            - 128000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
        tx:
            type: "FER"
            type: FER
            error_rate: 5

    ### IVAS FX conditions ###############################
    ### IVAS FX conditions ###
    c28:
        type: ivas
        bitrates:
            - 13200
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c29:
        type: ivas
@@ -328,11 +345,12 @@ conditions_to_generate:
            - 16400
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c30:
        type: ivas
@@ -340,11 +358,12 @@ conditions_to_generate:
            - 24400
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c31:
        type: ivas
@@ -352,11 +371,12 @@ conditions_to_generate:
            - 32000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c32:
        type: ivas
@@ -364,11 +384,12 @@ conditions_to_generate:
            - 48000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c33:
        type: ivas
@@ -376,11 +397,12 @@ conditions_to_generate:
            - 64000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c34:
        type: ivas
@@ -388,11 +410,12 @@ conditions_to_generate:
            - 80000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c35:
        type: ivas
@@ -400,11 +423,12 @@ conditions_to_generate:
            - 96000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5
    c36:
        type: ivas
@@ -412,13 +436,15 @@ conditions_to_generate:
            - 128000
        cod:
            bin: ivas_processing_scripts/bin/IVAS_cod_fx
            opts: ["-dtx"]
            opts:
                - -dtx
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx
        tx:
            type: "FER"
            type: FER
            error_rate: 5


################################################
### Post-processing
################################################
+11 −12
Original line number Diff line number Diff line
@@ -43,20 +43,18 @@ preprocessing:
### Configuration for conditions under test
################################################
conditions_to_generate:
    ### Reference and anchor conditions ##########################
    ### Reference and Anchor conditions ###
    # TODO: cat 2
    c01:
        type: ref

    ### MNRU conditions ###############################
    ### MNRU conditions ###
    c02:
        type: mnru
        q: 32
    # TODO: cat 1
    c03:
        type: mnru
        # Table F.3.2 specifies c03 as MNRU Q = 32 dB
        # This conflicts with F.3.3. Config below reflects F.3.3.
        q: 27
    c04:
        type: mnru
@@ -66,7 +64,7 @@ conditions_to_generate:
        type: mnru
        q: 17

    ### ESDRU conditions ###############################
    ### ESDRU conditions ###
    # TODO: cat 3
    c06:
        type: esdru
@@ -83,7 +81,7 @@ conditions_to_generate:
        type: esdru
        alpha: 0.2

    ### IVAS FX/FL mix conditions ###############################
    ### IVAS FX/FL mix conditions ###
    c10:
        type: ivas
        bitrates:
@@ -157,7 +155,8 @@ conditions_to_generate:
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx

    ### IVAS FL conditions ###############################
    ### IVAS FL conditions ###
    # TODO: cat 1
    c19:
        type: ivas
        bitrates:
@@ -166,7 +165,7 @@ conditions_to_generate:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
    # TODO: cat 1
    # TODO: cat 4
    c20:
        type: ivas
        bitrates:
@@ -175,7 +174,6 @@ conditions_to_generate:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
    # TODO: cat 4
    c21:
        type: ivas
        bitrates:
@@ -210,7 +208,6 @@ conditions_to_generate:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
    # TODO: cat 2
    c25:
        type: ivas
        bitrates:
@@ -219,7 +216,7 @@ conditions_to_generate:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
    # TODO: cat 3
    # TODO: cat 2
    c26:
        type: ivas
        bitrates:
@@ -228,6 +225,7 @@ conditions_to_generate:
            bin: ivas_processing_scripts/bin/IVAS_cod_flt_ref
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref
    # TODO: cat 3
    c27:
        type: ivas
        bitrates:
@@ -237,7 +235,7 @@ conditions_to_generate:
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_flt_ref

    ### IVAS FX conditions ###############################
    ### IVAS FX conditions ###
    c28:
        type: ivas
        bitrates:
@@ -311,6 +309,7 @@ conditions_to_generate:
        dec:
            bin: ivas_processing_scripts/bin/IVAS_dec_fx


################################################
### Post-processing
################################################
+63 −118

File changed.

Preview size limit exceeded, changes collapsed.