Commit 3547b957 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

save correct sba order for renderer flush

parent fa271821

lib_dec/ivas_sba_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ ivas_error ivas_sba_dec_reconfigure( 
    int16_t ch, nchan_out_buff, nchan_out_buff_old;

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

    int16_t sba_analysis_order_old;

#endif

#ifdef JBM_FOR_OSBA

    int16_t sba_analysis_order_old_flush;

#endif

    DECODER_CONFIG_HANDLE hDecoderConfig;

    ivas_error error;
@@ -138,6 +141,9 @@ ivas_error ivas_sba_dec_reconfigure( 
    hDecoderConfig = st_ivas->hDecoderConfig;

    ivas_total_brate = hDecoderConfig->ivas_total_brate;

    last_ivas_total_brate = st_ivas->last_active_ivas_total_brate;

#ifdef JBM_FOR_OSBA

    sba_analysis_order_old = st_ivas->sba_analysis_order;

#endif

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

    sba_analysis_order_old = ivas_sba_get_analysis_order( last_ivas_total_brate, st_ivas->sba_order );

#endif
@@ -235,7 +241,11 @@ ivas_error ivas_sba_dec_reconfigure( 
        if ( granularity_new < st_ivas->hTcBuffer->n_samples_granularity )

        {

            /* write back info for correct rendering of the flushable samples */

#ifdef JBM_FOR_OSBA

            st_ivas->sba_analysis_order = sba_analysis_order_old_flush;

#else

            st_ivas->sba_analysis_order = sba_analysis_order_old;

#endif

            st_ivas->hDecoderConfig->ivas_total_brate = last_ivas_total_brate;

            if ( ( error = ivas_jbm_dec_flush_renderer( st_ivas, granularity_new, st_ivas->renderer_type, st_ivas->intern_config, &st_ivas->hIntSetup, st_ivas->mc_mode, ism_mode_old, nSamplesFlushed,

#ifdef SPLIT_REND_WITH_HEAD_ROT