Commit 02068671 authored by wkr's avatar wkr
Browse files

fix segfault in OSBA bitrate switching

parent d6ea9f02

lib_dec/ivas_sba_dec.c

+6 −5
Original line number Diff line number Diff line
@@ -706,18 +706,19 @@ if ( st_ivas->hDiracDecBin != NULL ) 


#ifdef JBM_FOR_OSBA

    /* resync SPAR and DirAC JBM info from TC Buffer */

    if ( st_ivas->hSpatParamRendCom->slot_size == st_ivas->hTcBuffer->n_samples_granularity )

    {

    if ( st_ivas->hSpatParamRendCom != NULL )

    {

        if ( st_ivas->hSpatParamRendCom->slot_size == st_ivas->hTcBuffer->n_samples_granularity )

        {

            mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

            st_ivas->hSpatParamRendCom->nb_subframes = st_ivas->hTcBuffer->nb_subframes;

            st_ivas->hSpatParamRendCom->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered;

        }



            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;

        }

    }



    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->ism_mode == ISM_SBA_MODE_DISC )

    {