Commit 3f78adfc authored by bayers's avatar bayers
Browse files

fix asan/msan errors for ParamISM and binaural output

parent 72fff207

lib_dec/ivas_ism_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static ivas_error ivas_ism_bitrate_switching( 
            tc_nchan_allocate_new = 2 * BINAURAL_CHANNELS;

            tc_nchan_full_new = tc_nchan_allocate_new;

        }

        if ( st_ivas->ism_mode == ISM_MODE_PARAM && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE ) )

        if ( st_ivas->ism_mode == ISM_MODE_PARAM && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

        {

            tc_nchan_full_new = 0;

        }

lib_dec/ivas_ism_param_dec.c

+15 −5
Original line number Diff line number Diff line
@@ -801,13 +801,23 @@ ivas_error ivas_param_ism_dec_open( 
        if ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE )

        {

            int16_t nchan_transport = st_ivas->nchan_transport;

            int16_t nchan_full = 0;

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM )

            {

                nchan_full = nchan_transport;

                hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc = NULL;

                hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc = NULL;

            }

            else

            {

                hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hDirAC->num_freq_bands * sizeof( float ) );

                set_zero( hDirAC->hParamIsmRendering->Cldfb_RealBuffer_tc, MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hDirAC->num_freq_bands );

                hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hDirAC->num_freq_bands * sizeof( float ) );

                set_zero( hDirAC->hParamIsmRendering->Cldfb_ImagBuffer_tc, MAX_JBM_CLDFB_TIMESLOTS * nchan_transport * hDirAC->num_freq_bands );

            }

            if ( st_ivas->hTcBuffer == NULL )

            {

                if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, 0, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )

                if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

lib_dec/ivas_spar_decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1457,7 +1457,7 @@ void ivas_spar_dec_upmixer( 
#ifdef SPAR_TUNING

    int16_t num_md_sub_frames;

#ifndef JBM_TSM_ON_TCS

    md_sf_idx;

    int16_t md_sf_idx;

#endif

#endif