Commit f104d3bb authored by bayers's avatar bayers
Browse files

fix asan, put out at least zeroes for ParamUpmix in the JBM path

parent 52b54897

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ 
#define FIX_XXX_JITTER_SBA_BINAURAL_GAIN

#define FIX_XXX_HEADTRACKER_INIT

#define FIX_XXX_TDOBJRENDERER_INPUT

#define FIX_XXX_ISM_SBA_ASAN

#define API_5MS



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

lib_dec/ivas_jbm_dec.c

+7 −1
Original line number Diff line number Diff line
@@ -846,7 +846,13 @@ ivas_error ivas_jbm_dec_render( 
#ifdef API_5MS

        else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX )

        {

            return IVAS_ERR_NOT_IMPLEMENTED;

            /* zero output for now, not yet implemented...  */

            int16_t ch;

            *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

            for ( ch = 0; ch < nchan_out; ch++ )

            {

                set_zero( p_output[ch], *nSamplesRendered );

            }

        }

#endif

        else if ( st_ivas->mc_mode == MC_MODE_MCMASA )

lib_dec/ivas_sba_rendering_internal.c

+7 −0
Original line number Diff line number Diff line
@@ -365,15 +365,22 @@ void ivas_ism2sba_sf( 
        for ( j = 0; j < sba_num_chans; j++ )

        {

            g2 = hIsmRendererData->interpolator + offset;

#ifndef FIX_XXX_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_XXX_ISM_SBA_ASAN

                g1 = 1.0f - *g2;

#endif

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

#ifndef FIX_XXX_ISM_SBA_ASAN

                g1 = 1.0f - *g2;

#endif

            }

        }

    }