Commit 29828386 authored by bayers's avatar bayers
Browse files

fix compiler warning, fix channel mem on heap counting

parent 60dde54e

lib_dec/ivas_sba_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -122,9 +122,11 @@ ivas_error ivas_sba_dec_reconfigure( 
    int32_t last_ivas_total_brate;

    int16_t num_channels, num_md_sub_frames;

    int16_t ch, nchan_out_buff, nchan_out_buff_old;

#ifndef FIX_XXX_CHANNEL_MEM_COUNT

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

    int16_t sba_analysis_order_old;

#endif

#endif

#ifdef JBM_FOR_OSBA

    int16_t sba_analysis_order_old_flush;

#endif
@@ -809,6 +811,9 @@ ivas_error ivas_sba_dec_reconfigure( 
    if ( !st_ivas->hDecoderConfig->Opt_5ms )

#endif

    {

#ifdef FIX_XXX_CHANNEL_MEM_COUNT

        nchan_out_buff_old = ivas_count_nchan_buffers_dec( st_ivas );

#endif

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

        nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

#else

lib_rend/ivas_output_init.c

+10 −2
Original line number Diff line number Diff line
@@ -444,7 +444,11 @@ int16_t ivas_count_nchan_buffers_dec( 
)

{

    int16_t ch_idx, ch_cnt;

    for ( ch_idx = 0, ch_cnt = 0; ch_idx < MAX_OUTPUT_CHANNELS; ch_idx++, ch_cnt++ )

    for ( ch_idx = 0, ch_cnt = 0; ch_idx < MAX_OUTPUT_CHANNELS

#ifdef JBM_FOR_OSBA

                                               + MAX_NUM_OBJECTS

#endif

        ; ch_idx++, ch_cnt++ )

    {

        if ( st_ivas->p_output_f[ch_idx] == NULL )

        {
@@ -452,7 +456,11 @@ int16_t ivas_count_nchan_buffers_dec( 
        }

    }

#ifdef DEBUGGING

    for ( ; ch_idx < MAX_OUTPUT_CHANNELS; ch_idx++ )

    for ( ; ch_idx < MAX_OUTPUT_CHANNELS

#ifdef JBM_FOR_OSBA

                         + MAX_NUM_OBJECTS

#endif

        ; ch_idx++ )

    {

        assert( st_ivas->p_output_f[ch_idx] == NULL );

    }