Commit fdeec7f0 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_614_ADD_TO_NULL_PTR_DIRAC_SETUP

parent d839f683

lib_com/options.h

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





#define FIX_614_ADD_TO_NULL_PTR_DIRAC_SETUP             /* FhG: Issue 614: prevent adding to a null pointer in dirac setup code */

#define UPDATE_REVERB_UTILS                             /* Use CLDFB HRTFs of the appropriate SBA order in get_IR_from_filter_taps() */

#define FIX_612_MSVQ_UBSAN_LEFTSHIFT                    /* Eri: Issue 612 :  UBSAN: left shift of negative values in 1st stage of MSVQ  */

#define FIX_621_MSVQ_UBSAN_NULL_PTR_OFFSET              /* Eri: Issue 621 :  UBSAN:  applying non-zero offset 7200 to null pointer in lsf_msvq_ma_enc.c  */

lib_dec/ivas_dirac_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1865,11 +1865,7 @@ void ivas_dirac_dec_render_sf( 
    reference_power = DirAC_mem.reference_power;

    reference_power_smooth = DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;

    onset_filter = DirAC_mem.onset_filter;

#ifdef FIX_614_ADD_TO_NULL_PTR_DIRAC_SETUP

    onset_filter_subframe = ( DirAC_mem.onset_filter == NULL ) ? NULL : DirAC_mem.onset_filter + hSpatParamRendCom->num_freq_bands;

#else

    onset_filter_subframe = DirAC_mem.onset_filter + hSpatParamRendCom->num_freq_bands;

#endif



    hodirac_flag = ivas_get_hodirac_flag( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->sba_analysis_order );

#ifdef SBA_AND_OBJECTS