Commit c9de58b8 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_625_IDX_OOB

parent a102d41f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 






#define FIX_625_IDX_OOB                                 /* FhG: Fix index out-of-bounds UBSAN error (issue 625) */

#define FIX_613_DIRAC_NULL_PTR_USAN                     /* Nokia: Issue #613: USAN in DirAC decoder setup */

#define FIX_647_SILENT_W_PARAMBIN                       /* Nokia: Issue #647: Fix silent W SH inputs in parametric binauralizer */

lib_dec/ivas_spar_decoder.c

+0 −8
Original line number Diff line number Diff line
@@ -1063,22 +1063,14 @@ static void ivas_spar_calc_smooth_facs( 
    bin = 0;

    for ( b = 0; b < nbands_spar; b++ )

    {

#ifdef FIX_625_IDX_OOB

        if ( bin >= CLDFB_NO_CHANNELS_MAX || ( b > 0 && bin2band->p_cldfb_map_to_spar_band[bin] < bin2band->p_cldfb_map_to_spar_band[bin - 1] ) )

#else

        if ( b > 0 && bin2band->p_cldfb_map_to_spar_band[bin] < bin2band->p_cldfb_map_to_spar_band[bin - 1] )

#endif

        {

            break;

        }



        /* calculate band-wise subframe energies */

        subframe_band_nrg[b] = 0.f;

#ifdef FIX_625_IDX_OOB

        while ( bin < CLDFB_NO_CHANNELS_MAX && b == bin2band->p_cldfb_map_to_spar_band[bin] )

#else

        while ( b == bin2band->p_cldfb_map_to_spar_band[bin] )

#endif

        {

            for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ )

            {