Commit 9cb4fc22 authored by norvell's avatar norvell
Browse files

Add EVS categories for improved parsing

parent 2f743053

scripts/create_histogram_summary.py

+13 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ matplotlib.use("Agg") 
import matplotlib.pyplot as plt

import csv

import os

from parse_xml_report import FORMATS, CATEGORIES

from parse_xml_report import IVAS_FORMATS, EVS_FORMATS, IVAS_CATEGORIES, EVS_CATEGORIES



"""

Parses a CSV report and creates a summary report.
@@ -44,11 +44,22 @@ if __name__ == "__main__": 
        help="Measure, any of: MLD, DIFF, SSNR, default: MLD",

        default=["MLD"],

    )

    parser.add_argument(

    "--evs",

    action="store_true",

    help="Parse using EVS 26.444 formats",

    )

    args = parser.parse_args()

    csv_report = args.csv_report

    csv_summary = args.csv_summary

    csv_image = args.csv_image

    measure = args.measure[0]

    if args.evs:

        FORMATS = EVS_FORMATS

        CATEGORIES = EVS_CATEGORIES

    else:

        FORMATS = IVAS_FORMATS

        CATEGORIES = IVAS_CATEGORIES

        

    limits_per_measure = {

        "MLD": ("MLD", [0, 5, 10, math.inf]),

scripts/parse_xml_report.py

+17 −7
Original line number Diff line number Diff line
@@ -24,15 +24,15 @@ IVAS_FORMATS = { 
}



EVS_FORMATS = {

    "AMRWB I/O dec": r"Readme_AMRWB_IO_dec",

    "AMRWB I/O enc": r"Readme_AMRWB_IO_enc",

    "EVS dec": r"Readme_EVS_dec",

    "EVS enc": r"Readme_EVS_enc",

    "EVS JBM dec": r"Readme_JBM_dec",

    "AMRWBIO_dec": r"Readme_AMRWB_IO_dec",

    "AMRWBIO_enc": r"Readme_AMRWB_IO_enc",

    "EVS_dec": r"Readme_EVS_dec",

    "EVS_enc": r"Readme_EVS_enc",

    "EVS_JBM_dec": r"Readme_JBM_dec",

}





CATEGORIES = {

IVAS_CATEGORIES = {

    "Normal operation": r".*",

    "DTX": r"DTX",

    "PLC": r"%",
@@ -40,6 +40,14 @@ CATEGORIES = { 
    "JBM": r"JBM",

}



EVS_CATEGORIES = {

    "Normal operation": r".*",

    "DTX": r"DTX",

    "PLC": r"b10|f06",

    "Bitrate switching": r"sw",

    "JBM": r"JBM",

}



# Main routine

if __name__ == "__main__":

    parser = argparse.ArgumentParser(
@@ -51,14 +59,16 @@ if __name__ == "__main__": 
        help="XML junit report input file, e.g. report-junit.xml",

    )

    parser.add_argument("csv_file", type=str, help="Output CSV file, e.g. report.csv")

    parser.add_argument("--evs", action="store_true")

    parser.add_argument("--evs", action="store_true", help="Parse using EVS 26.444 formats",)

    args = parser.parse_args()

    xml_report = args.xml_report

    csv_file = args.csv_file

    if (args.evs):

        FORMATS = EVS_FORMATS

        CATEGORIES = EVS_CATEGORIES

    else:

        FORMATS = IVAS_FORMATS

        CATEGORIES = IVAS_CATEGORIES

    tree = ElementTree.parse(xml_report)



    testsuite = tree.find(".//testsuite")