Commit bfa0ef1b authored by bayers's avatar bayers
Browse files

Merge branch '904-jbm-sba-rs-to-foa-decoding-triggers-assert' of... 

Merge branch '904-jbm-sba-rs-to-foa-decoding-triggers-assert' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 904-jbm-sba-rs-to-foa-decoding-triggers-assert
parents bf77d310 4370a535

lib_dec/ivas_jbm_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -876,6 +876,7 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
        {

#ifdef NONBE_FIX_904_JBM_SBA_RS_FOA

            ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );



#endif

            ivas_sba_dec_digest_tc( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );

        }

lib_dec/ivas_sba_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ ivas_error ivas_sba_dec_reconfigure( 
                return error;

            }

#ifdef NONBE_FIX_904_JBM_SBA_RS_FOA



            /* make sure the changed number of slots in the last subframe is not lost in the following steps */

            if ( st_ivas->hSpatParamRendCom != NULL )

            {
@@ -669,7 +670,6 @@ ivas_error ivas_sba_dec_reconfigure( 
    mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpar->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

    st_ivas->hSpar->nb_subframes = st_ivas->hTcBuffer->nb_subframes;

    st_ivas->hSpar->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered;



#else

    if ( st_ivas->hSpatParamRendCom != NULL )

    {