Commit 350cbf3a authored by vaclav's avatar vaclav
Browse files

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

- Merge remote-tracking branch 'remotes/origin/main' into float-1525-format-switching-reading-of-uninitialized-memory-in-ivas_dec_readformat
parents 2df52092 b4f19614

ci/collect_artifacts.py

+6 −6
Original line number Diff line number Diff line
@@ -7,15 +7,13 @@ TEST_TYPES = ["sanitizers"] 




def main(args):



    test = args.test

    file = args.console_out_file

    if test == "sanitizers":

        collect_for_sanitizer_test(file)





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



def find_failed_files_for_sanitizer_test(console_log: list) -> dict:

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



    files_found = dict()
@@ -33,13 +31,15 @@ def find_failed_files_for_sanitizer_test(console_log: list) -> dict(): 




def collect_for_sanitizer_test(file):



    with open(file) as f:

        console_log = f.readlines()



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

    start_indicators = ["Adding config CLANG1" in line for line in console_log]

    assert sum(start_indicators) == 2



    idx_first_run = start_indicators.index(True)

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

    idx_second_run = start_indicators.index(True, idx_first_run + 1)



    no_plc_part = console_log[idx_first_run:idx_second_run]

    plc_part = console_log[idx_second_run:]

ci/setup_pages.py

+2 −3
Original line number Diff line number Diff line
@@ -182,11 +182,10 @@ def curl_for_artifacts(job_id: int, project_id: int, exdir: str): 
        "--output",

        ARTIFACTS,

    ]

    print(cmd)

    subprocess.run(cmd, check=True)



    # check for valid archive (if not, it is likely a 404 page, then display that)

    cmd = ["unzip", "-t", ARTIFACTS]

    cmd = ["unzip", "-t", "-qq", ARTIFACTS]

    try:

        subprocess.run(cmd, check=True)

    except subprocess.CalledProcessError:
@@ -195,7 +194,7 @@ def curl_for_artifacts(job_id: int, project_id: int, exdir: str): 
        raise subprocess.CalledProcessError(-1, "Unzip check failed")



    # do the actual unzipping

    cmd = ["unzip", ARTIFACTS, "-d", exdir]

    cmd = ["unzip", "-q", ARTIFACTS, "-d", exdir]

    subprocess.run(cmd, check=True)

lib_com/calc_st_com.c

+0 −12
Original line number Diff line number Diff line
@@ -292,27 +292,15 @@ void scale_st( 
void blend_subfr2(

    float *sigIn1,

    float *sigIn2,

#ifdef FIX_FLOAT_1533_BLEND_SUBFR2

    int16_t L_subfr,

#endif

    float *sigOut )

{

#ifdef FIX_FLOAT_1533_BLEND_SUBFR2

    float fac1 = 1.f - ( 1.f / L_subfr );

    float fac2 = 0.f + ( 1.f / L_subfr );

    float step = 1.f / ( L_subfr / 2 );

#else

    float fac1 = 1.f - ( 1.f / L_SUBFR );

    float fac2 = 0.f + ( 1.f / L_SUBFR );

    float step = 1.f / ( L_SUBFR / 2 );

#endif

    int16_t i;



#ifdef FIX_FLOAT_1533_BLEND_SUBFR2

    for ( i = 0; i < L_subfr / 2; i++ )

#else

    for ( i = 0; i < L_SUBFR / 2; i++ )

#endif

    {

        sigOut[i] = fac1 * sigIn1[i] + fac2 * sigIn2[i];

        fac1 -= step;

lib_com/ivas_prot.h

+0 −8
Original line number Diff line number Diff line
@@ -1111,17 +1111,9 @@ ivas_error ivas_param_ism_dec_open( 
    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */

);



#ifdef FIX_FLOAT_1526_DIRAC_MEM_LEAK

void ivas_param_ism_dec_close(

    PARAM_ISM_DEC_HANDLE *hParamIsmDec                          /* i/o: decoder ParamISM handle                     */

);

#else

void ivas_param_ism_dec_close(

    PARAM_ISM_DEC_HANDLE *hParamIsmDec,                         /* i/o: decoder ParamISM handle                     */

    SPAT_PARAM_REND_COMMON_DATA_HANDLE *hSpatParamRendCom_out,  /* i/o: common spatial renderer data                */

    const AUDIO_CONFIG output_config                            /* i  : output audio configuration                  */

);

#endif



void ivas_ism_dec_digest_tc(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */

lib_com/options.h

+3 −9
Original line number Diff line number Diff line
@@ -161,10 +161,8 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_2235_TD_RENDERER_WORD16                     /* Eri: For float: small synch with BASOP, removing unnecessary abs. BASOP: Use Word16 in TD renderer without converting to Word32 */

#define FIX_FLOAT_1526_DIRAC_MEM_LEAK                   /* FhG: potential memory leak in DirAC handles in case of format switching */

#define ALIGN_ACELP_CORE                                /* VA: align ACELP core functions with BASOP */

#define FIX_1532_MSAN_ERR_AMR_FIRST_FRAME_IS_SID        /* FhG: fix msan complaint in AMR-WB when first frame is an SID */

#define FIX_FLOAT_1535_ARI_RES_Q_CLEANUP                /* FhG: remove dead code from tcx_ari_res_Q_spec() */

#define FIX_FLOAT_1536_INIT_NO_PARAM_LPC                /* FhG: make sure no_param_lpc is initialized in core_encode_twodiv() */

#define FIX_1525_UNINIT_FORMAT_SWITCHING_DEC            /* VA: float issue 1525: fix reading of uninitialized memory in format switching at the decoder */



/* #################### End BE switches ################################## */
@@ -172,12 +170,8 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */

#define FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE    /* Nokia: float issue 1493: Improves float decision stability in MASA encoding by adjusting reduction code */

#define FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR         /* FhG: basop issue 2436 (related to basop 2283): fix garbage output for >1 object OMASA with extrend as ISAR prerenderer */



#define FIX_2432_ISM_SPIKES_16KHZ                       /* VA: basop issue 2432: fix spikes in ISM decoding at 16kHz output sampling rate */

#define FIX_FLOAT_1518                                  /* FhG: fix issue 1518: loudness differences in OSBA decoding to mono or stereo output */

#define FIX_FLOAT_1533_BLEND_SUBFR2                     /* FhG: float issue 1533: correct blending in blend_subfr2() */



#define FIX_1530_Codec_Level_Harmonization_Non_diegetic_panning /* FhG: Adjust non-diegetic panning law to harmonize codec levels with 3GPP reference software */



/* ##################### End NON-BE switches ########################### */