Commit 95c14db4 authored by norvell's avatar norvell
Browse files

Fixes for logging of Delta-ODG

parent 8bc970c9

scripts/parse_xml_report.py

+7 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ if __name__ == "__main__": 
        action="store_true",

        help="Extract clipping information. Available if encoder has been run with DEBUGGING active.",

    )

    parser.add_argument(

        "--delta_odg",

        action="store_true",

        help="Extract Delta ODG information.",

    )

    parser.add_argument(

        "--skip_formats",

        action="store_true",
@@ -90,6 +95,8 @@ if __name__ == "__main__": 
        CATEGORIES = IVAS_CATEGORIES

    if args.clipping:

        PROPERTIES += ["ENC_CORE_OVL","MAX_OVL","MIN_OVL"]

    if args.delta_odg:

        PROPERTIES += ["DELTA_ODG"]

    if args.skip_formats:

        FORMATS = NO_FORMATS

        CATEGORIES = NO_CATEGORIES

tests/conftest.py

+3 −1
Original line number Diff line number Diff line
@@ -1140,6 +1140,8 @@ def props_to_record( 
            props.append(SSNR)

        if get_odg:

            props.append(ODG)

        if get_odg_bin:

            props.append(DELTA_ODG)



    return props
@@ -1188,7 +1190,7 @@ def parse_properties(text_to_parse: str, output_differs: bool, props_to_record: 
        elif prop == DELTA_ODG:

            delta_odg = re.search(DELTA_ODG_PATTERN, text_to_parse)

            if delta_odg:

                props["DELTA_ODG"] = delta_odg.groups(0)

                props["DELTA_ODG"] = delta_odg.groups(1)[0]

    return props

tests/constants.py

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ DMX_SSNR = "DMX_SSNR" 
MLD_PATTERN = r"MLD: ([\d\.]*)"

MAX_DIFF_PATTERN = r"MAXIMUM ABS DIFF: (\d*)"

ODG_PATTERN_PQEVALAUDIO = r"Objective Difference Grade: (-*\d*\.\d*)"

ODG_PATTERN = r"ODG: (-*\d*\.\d*)"

DELTA_ODG_PATTERN = r"Delta-ODG: (-*\d*\.\d*)"

ODG_PATTERN = r"(?<!Delta-)ODG: (-*\d*\.\d*)"

DELTA_ODG_PATTERN = r"Delta-ODG: (-?\d*\.\d+)"

SSNR_PATTERN = r"Channel \d* SSNR: (nan|[+-]*inf|[-*\d\.]*)"

MAX_ENC_DIFF_PATTERN = r"MAXIMUM ENC DIFF: ([^ ]*) (\d+) \((\d+\.\d+)%\)"

ENC_CORE_OVL_PATTERN = r"Core input overload detected: (\d+)"