Commit 2c13c2c5 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1060_USAN_ARRAY_BOUNDS

parent d1190eae

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ 
#define NONBE_FIX_1075                                  /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */

#define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB     /* FhG: fix bug in TD MDCT-Stereo concealment */

#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */

#define FIX_1060_USAN_ARRAY_BOUNDS                      /* FhG: issue 1060: USAN array-bounds errors */

#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */

#define NONBE_FIX_1065_ISM_MD_HANDLE                    /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */

lib_dec/ivas_dirac_dec_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -3777,18 +3777,10 @@ void ivas_dirac_dec_render_sf_fx( 
                                g_fx = Madd_32_16( Mpy_32_16_1( gain_fx, *w1_fx ), prev_gain_fx, w2_fx ); // Q15

                                FOR( l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )

                                {

#ifdef FIX_1060_USAN_ARRAY_BOUNDS

                                    Cldfb_RealBuffer_fx[j2][k][l] = Madd_32_32( Cldfb_RealBuffer_fx[j2][k][l], g_fx, *tc_re_fx );

#else

                                    Cldfb_RealBuffer_fx[j2][0][k * hSpatParamRendCom->num_freq_bands + l] = Madd_32_32( Cldfb_RealBuffer_fx[j2][0][k * hSpatParamRendCom->num_freq_bands + l], g_fx, *tc_re_fx );

#endif

                                    move32();

                                    tc_re_fx++;

#ifdef FIX_1060_USAN_ARRAY_BOUNDS

                                    Cldfb_ImagBuffer_fx[j2][k][l] = Madd_32_32( Cldfb_ImagBuffer_fx[j2][k][l], g_fx, *tc_im_fx );

#else

                                    Cldfb_ImagBuffer_fx[j2][0][k * hSpatParamRendCom->num_freq_bands + l] = Madd_32_32( Cldfb_ImagBuffer_fx[j2][0][k * hSpatParamRendCom->num_freq_bands + l], g_fx, *tc_im_fx );

#endif

                                    move32();

                                    tc_re_fx++;

                                }