Commit fa2d3c5f authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'basop-ci-branch' into basop-ci/update-main-from-basop-ci-branch

parents 1410d691 8e02a759

ci/basop-pages/create_report_pages.py

+10 −3
Original line number Diff line number Diff line
@@ -198,10 +198,12 @@ def tr_from_row(row, id_current, id_previous): 
            try:

                if float(curr) > float(prev):

                    curr += f" {ARROW_UP}"

                    td_tmpl_curr = TD_TMPL_INCREASE

                    # increase is bad -> mark in red, execpt for SNR for which it is good -> mark in green

                    td_tmpl_curr = TD_TMPL_REDUCE if c == "MIN_SSNR" else TD_TMPL_INCREASE

                elif float(curr) < float(prev):

                    curr += f" {ARROW_DOWN}"

                    td_tmpl_curr = TD_TMPL_REDUCE

                    # reduce is good -> mark in green, execpt for SNR for which it is bad -> mark in red

                    td_tmpl_curr = TD_TMPL_INCREASE if c == "MIN_SSNR" else TD_TMPL_REDUCE

            except ValueError:

                # if we land here, one of the cells is not a number, this indicates a crash

                # or some error in the scripts, so mark with red as well
@@ -258,7 +260,12 @@ def merge_and_cleanup_mld_reports( 
            for col_pair in other_col_pairs:

                col_prev = col_pair[0]

                col_curr = col_pair[1]



                try:

                    diff_other += abs(float(x[col_curr]) - float(x[col_prev]))

                except ValueError:

                    # can't make float from the column contents, probably NONE -> put to top

                    diff_other += float("inf")



            if diff_other > 0:

                diff = -1000000

ci/remove_unsupported_testcases.py

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ TESTCASES = [ 
    "Multi-channel 5_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 32kHz out, EXT out",

    "Multi-channel 7_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 16kHz out, EXT out",

    "Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out",

    "SBA planar 2OA bitrate switching from 13.2 kbps to 128 kbps, 32kHz in, 32kHz out, DTX on, EXT out",

    "SBA planar FOA bitrate switching from 13.2 kbps to 512 kbps, 32kHz in, 32kHz out, EXT out",

    "SBA 2OA bitrate switching from 13.2 kbps to 512 kbps, 32kHz in, 32kHz out, EXT out",

    "SBA planar 3OA bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, random FER at 5%, EXT out",

    "Multi-channel 5_1 at 512 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (CREND)",

    "Multi-channel 5_1 at 64 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (FastConv)",

    "Multi-channel 5_1 at 32 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (ParamBin)",

]

tests/cmp_pcm.py

+2 −2
Original line number Diff line number Diff line
@@ -109,10 +109,10 @@ def cmp_pcm( 
            reason += f" > {mld_lim}"



    if get_ssnr:

        reason += " - "

        for i, s in enumerate(cmp_result["SSNR"], start=1):

            msg = f"Channel {i} SSNR: {s}"

            reason += " - " + msg

            print(msg)

            reason += msg + " - "



    if get_odg:

        for n in range(nchannels):

tests/conftest.py

+0 −1
Original line number Diff line number Diff line
@@ -872,7 +872,6 @@ def parse_properties(text_to_parse: str, output_differs: bool, props_to_record: 
            props["MIN_SSNR_CHANNEL"] = min_ssnr_channel

        elif prop == "ODG":

            odgs = re.findall(ODG_PATTERN, text_to_parse)

            print(odgs)

            min_odg = min(odgs)

            min_odg_channel = odgs.index(min_odg)

            props["MIN_ODG"] = min_odg

tests/constants.py

+1 −1
Original line number Diff line number Diff line
@@ -9,4 +9,4 @@ 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*)"

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