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

Merge branch 'main' into 614-ubsan-applying-non-zero-offset-240-to-null-pointer-in-ivas_dirac_dec

parents 36aa6d9b 833f0b5c

lib_com/ifft_rel.c

+4 −0
Original line number Diff line number Diff line
@@ -229,7 +229,11 @@ void ifft_rel( 
     *-----------------------------------------------------------------*/



    idx = fft256_read_indexes;

#ifdef FIX_622_SILENCE_USAN_WARNING

    xi0 = &temp[0] - 1;

#else

    xi0 = temp - 1;

#endif

    if ( n == 128 )

    {

        for ( i = 0; i < n; i++ )

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -887,7 +887,12 @@ enum fea_names 
#define MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE    3



typedef enum {

#ifdef FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE

    NOISE_GEN_MODE_UNDEF = -1,

    EQUAL_CORES = 0,

#else

    EQUAL_CORES,

#endif

    TCX10_IN_0_TCX20_IN_1,

    TCX20_IN_0_TCX10_IN_1,

} TONALMDCTCONC_NOISE_GEN_MODE;

lib_com/options.h

100644 → 100755
+3 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ 


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



#define FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE      /* FhG: fix usan error */

#define FIX_622_SILENCE_USAN_WARNING                    /* FhG: silenceusan warning in ifft code */



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

lib_dec/ivas_mdct_core_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -526,7 +526,11 @@ void ivas_mdct_core_invQ( 


    sts = hCPE->hCoreCoder;

    bfi = sts[0]->bfi;

#ifdef FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE

    noise_gen_mode_bfi = NOISE_GEN_MODE_UNDEF;

#else

    noise_gen_mode_bfi = -1;

#endif



    set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );

    set_s( total_nbbits, 0, CPE_CHANNELS );