Commit f87678b2 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 991-binary-file-hrtf-coefficients-not-used-in-parambin
parents a8f80323 a96149ca

ci/collect_artifacts.py

+16 −31
Original line number Diff line number Diff line
@@ -14,39 +14,20 @@ def main(args): 
        collect_for_sanitizer_test(file)





def find_failed_files_for_sanitizer_test(

    console_log: list, subfolder: str, which="LOGS"

) -> dict():

def find_failed_files_for_sanitizer_test(console_log: list) -> dict():



    assert which in ["LOGS", "FILE_BASENAMES"]



    pattern_line = "(Encoding|Decoding) failed .*for \/.*(CLANG.|VALGRIND)\/(.*)"

    pattern_file = "(.*_b[0-9]*_.*_rs|.*_b[0-9]*_.*_cbr).*"

    pattern_line = r"(CLANG.) reports . error\(s\) for (.*)"



    files_found = dict()

    for line in console_log:

        m_line = re.match(pattern_line, line)



        if m_line is not None:

            _, test, filename = m_line.groups()

            filename = pathlib.Path(filename).name

            m_file = re.match(pattern_file, filename)

            if m_file is None:

                print(f"Unexpected: no match on {filename} with {pattern_file} - skip")

                continue

            filename_start = m_file.groups()[0]



            if which == "LOGS":

                folder = pathlib.Path(f"{test}/{subfolder}/")

                files = [

                    f for f in folder.iterdir() if f.name.startswith(filename_start)

                ]

            elif which == "FILE_BASENAMES":

                files = [filename_start]

            test, filename = m_line.groups()

            if test in files_found:

                files_found[test].extend(files)

                files_found[test].append(filename)

            else:

                files_found[test] = files

                files_found[test] = [filename]



    return files_found
@@ -56,16 +37,20 @@ def collect_for_sanitizer_test(file): 
    with open(file) as f:

        console_log = f.readlines()



    files_to_archive_noPLC = find_failed_files_for_sanitizer_test(

        console_log, "logs_noPLC"

    )

    files_to_archive = find_failed_files_for_sanitizer_test(console_log, "logs")

    start_indicators = ["Adding config" in l for l in console_log]

    idx_first_run = start_indicators.index(True)

    idx_second_run = start_indicators[idx_first_run + 1:].index(True) + idx_first_run + 1

    no_plc_part = console_log[idx_first_run:idx_second_run]

    plc_part = console_log[idx_second_run:]



    files_to_archive_noPLC = find_failed_files_for_sanitizer_test(no_plc_part)

    files_to_archive_PLC = find_failed_files_for_sanitizer_test(plc_part)



    log_folder = pathlib.Path("./LOGS_PLC")

    log_folder.mkdir()

    for test in files_to_archive.keys():

    for test in files_to_archive_PLC.keys():

        log_folder.joinpath(test).mkdir()

    for test, files in files_to_archive.items():

    for test, files in files_to_archive_PLC.items():

        folder = log_folder.joinpath(test)

        for p in files:

            source = pathlib.Path(p)
@@ -79,7 +64,7 @@ def collect_for_sanitizer_test(file): 
    for test, files in files_to_archive_noPLC.items():

        folder = log_folder_noPLC.joinpath(test)

        for p in files:

            source = pathlib.Path(p)

            source = pathlib.Path(p.replace("/logs/", "/logs_noPLC/"))

            target = folder.joinpath(source.name)

            source.rename(target)

ci/run_scheduled_sanitizer_test.py

+1 −3
Original line number Diff line number Diff line
@@ -180,9 +180,7 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr 
    # delete bitstream files for all failed modes to prevent follow-up errors in decoder-only run

    with open(CONSOLE_OUT_FILE) as f:

        console_log = f.readlines()

    failed_files = find_failed_files_for_sanitizer_test(

        console_log, "logs", "FILE_BASENAMES"

    )

    failed_files = find_failed_files_for_sanitizer_test(console_log)

    for t in failed_files.keys():

        bs_folder = pathlib.Path(f"{t}/enc")

        file_starts = failed_files[t]

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1225,9 +1225,7 @@ enum 
#define MASA_BIT_REDUCT_PARAM                   10

#define MASA_MAXIMUM_TWO_DIR_BANDS              24

#define NBITS_HR_COH                            4

#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS

#define OMASA_TDREND_MATCHING_GAIN              0.7943f

#endif



#define MASA_JBM_RINGBUFFER_FRAMES              3

lib_com/options.h

+2 −12
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_777_COMBI_RENDER_CONFIG_FILE                      /* Philips: Fix for combined renderer config file support */

#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */
@@ -163,24 +164,13 @@ 








/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define BE_FIX_567_DOUBLE_STEREO_DMX                          /* NTT: Fix formal issues */   

#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */   

#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC

#define NONBE_FIX_947_STEREO_DMX_ROMOPT                       /* Orange: ROM optimisation for POC*/  

#endif

#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif                                                                                     

#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS                    /* FhG : issue #982 : 5ms and 20ms output different for OMASA */

#define NONBE_FIX_978_MC_TDREND_REVERB                        /* Eri : activate reverb for TDREND with headtracking */



#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_LCLD_5MS                                   /* Dlb: LCLD 5ms framing operation  */

lib_com/prot.h

+0 −2
Original line number Diff line number Diff line
@@ -132,12 +132,10 @@ float inv_sqrt( 
    const float x /* i  : input value                                     */

);



#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX

/*! r: inverse square root of input value (float) */

float inv_sqrtf(

    const float x /* i  : input value                                     */

);

#endif



/*! r: output random value */

int16_t own_random(