Commit c4d99ffe authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_678_ISM_SBA_ASAN

parent fea284dc

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ 
#define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */

#define FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

#define FIX_513_REND_MC_ALLOC                           /* FhG: issue 513, optimise external renderer allocation for multichannel */

#define FIX_678_ISM_SBA_ASAN                            /* FhG: Issue 678: ASAN in ISM to SBA conversion in JBM */

#define FIX_676_JBM_USAN                                /* FhG: Issue 676: USAN in JBM */

#define FIX_796_MCT_MODE_DIFF_JBM                       /* FhG: Issue 796: fix differences between JBM and non-JBM fOR MC */

#define LIB_REND_FIX_HRTFPARAMBIN_MEMLEAK               /* fix 755 */

lib_dec/ivas_sba_rendering_internal.c

+0 −8
Original line number Diff line number Diff line
@@ -441,22 +441,14 @@ void ivas_ism2sba_sf( 
        for ( j = 0; j < sba_num_chans; j++ )

        {

            g2 = hIsmRendererData->interpolator + offset;

#ifndef FIX_678_ISM_SBA_ASAN

            g1 = 1 - *g2;

#endif

            tc = buffer_in[i] + offset;

            out = buffer_out[j];

            gain = hIsmRendererData->gains[i][j];

            prev_gain = hIsmRendererData->prev_gains[i][j];

            for ( k = 0; k < n_samples_to_render; k++ )

            {

#ifdef FIX_678_ISM_SBA_ASAN

                g1 = 1.0f - *g2;

#endif

                *( out++ ) += ( ( *( g2++ ) ) * gain + g1 * prev_gain ) * ( *( tc++ ) );

#ifndef FIX_678_ISM_SBA_ASAN

                g1 = 1.0f - *g2;

#endif

            }

        }

    }