Commit c2616a26 authored by vaclav's avatar vaclav
Browse files

fixes

parent 8c6ce00b

lib_dec/ivas_init_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -2380,11 +2380,6 @@ ivas_error ivas_init_decoder( 


    k = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, ivas_total_brate );

#ifdef FIX_1330_JBM_MEMORY

    for ( n = 0; n < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; n++ )

    {

        st_ivas->p_output_f[n] = NULL;

    }



    if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, 0, k, hDecoderConfig->Opt_tsm, st_ivas->hTcBuffer ) ) != IVAS_ERR_OK )

    {

        return error;

lib_dec/ivas_osba_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -263,7 +263,11 @@ ivas_error ivas_osba_render_sf( 
#else

    int16_t n;

#endif

#ifdef FIX_1330_JBM_MEMORY

    float output_ism[MAX_OUTPUT_CHANNELS][2 * L_FRAME48k]; // VE: TBV!!!

#else

    float output_ism[MAX_OUTPUT_CHANNELS][L_FRAME48k];

#endif

    float *p_output_ism[MAX_OUTPUT_CHANNELS];

    ivas_error error;

lib_rend/ivas_output_init.c

+5 −0
Original line number Diff line number Diff line
@@ -419,6 +419,11 @@ ivas_error ivas_output_buff_dec( 
        /* JBM decoding: output audio buffers are shared with audio buffers from 'hTcBuffer' */

        int16_t nchan_tc_jbm, nsamp_to_allocate, n_samp_full, offset;



        for ( ch = 0; ch < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; ch++ )

        {

            p_output_f[ch] = NULL;

        }



        if ( hTcBuffer->tc_buffer2 != NULL )

        {

            free( hTcBuffer->tc_buffer2 );