Commit 6353be0b authored by vaclav's avatar vaclav
Browse files

fix remaining OSBA ASAN errors

parent 0250becb

lib_dec/ivas_init_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -1081,9 +1081,6 @@ ivas_error ivas_init_decoder( 
#ifdef MASA_AND_OBJECTS

    int32_t ism_total_brate;

#endif

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

    int32_t output_Fs_buffers;

#endif



    error = IVAS_ERR_OK;
@@ -2246,7 +2243,7 @@ ivas_error ivas_init_decoder( 


    if ( !st_ivas->hDecoderConfig->voip_active )

    {

        for ( n = 0; n < ivas_get_nchan_buffers( st_ivas ); n++ )

        for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas ); n++ )

        {

            /* note: these are intra-frame heap memories */

            if ( ( st_ivas->p_output_f[n] = (float *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL )

lib_dec/ivas_ism_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static ivas_error ivas_ism_bitrate_switching( 
    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

    st_ivas->ism_mode = ism_mode;

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

    nchan_out_buff_old = ivas_get_nchan_buffers( st_ivas );

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas );

#endif



    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL
@@ -353,7 +353,7 @@ static ivas_error ivas_ism_bitrate_switching( 


    if ( !st_ivas->hDecoderConfig->voip_active )

    {

        nchan_out_buff = ivas_get_nchan_buffers( st_ivas );

        nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas );



        if ( nchan_out_buff > nchan_out_buff_old )

        {

lib_dec/ivas_mc_paramupmix_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ void ivas_mc_paramupmix_dec( 
    }



#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

    for ( ch = first_empty_channel; ch < ivas_get_nchan_buffers( st_ivas ); ch++ )

    for ( ch = first_empty_channel; ch < ivas_get_nchan_buffers_dec( st_ivas ); ch++ )

    {

        set_f( output_f[ch], 0.0f, output_frame );

    }

lib_dec/ivas_omasa_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ ivas_error ivas_omasa_dec_config( 
    st_ivas->ivas_format = st_ivas->last_ivas_format;

    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

    nchan_out_buff_old = ivas_get_nchan_buffers( st_ivas );

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas );

#endif

    st_ivas->ivas_format = ivas_format_orig;
@@ -419,7 +419,7 @@ ivas_error ivas_omasa_dec_config( 


        if ( !st_ivas->hDecoderConfig->voip_active )

        {

            nchan_out_buff = ivas_get_nchan_buffers( st_ivas );

            nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas );



            if ( nchan_out_buff > nchan_out_buff_old )

            {

lib_dec/ivas_sba_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ ivas_error ivas_sba_dec_reconfigure( 
    nchan_transport_old = st_ivas->nchan_transport;

    sba_dirac_stereo_flag_old = st_ivas->sba_dirac_stereo_flag;

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

    nchan_out_buff_old = ivas_get_nchan_buffers( st_ivas );

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas );

#endif



    st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->sba_order );
@@ -534,7 +534,7 @@ ivas_error ivas_sba_dec_reconfigure( 


    if ( !st_ivas->hDecoderConfig->voip_active )

    {

        nchan_out_buff = ivas_get_nchan_buffers( st_ivas );

        nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas );



        if ( nchan_out_buff > nchan_out_buff_old )

        {