Commit 0945d392 authored by bayers's avatar bayers
Browse files

better fix for OMASA JBM BR switch

parent 981863ba

lib_dec/ivas_dirac_dec.c

+4 −15
Original line number Diff line number Diff line
@@ -1602,24 +1602,13 @@ void ivas_dirac_dec_set_md_map( 


    ivas_jbm_dec_get_adapted_subframes( nCldfbTs, hSpatParamRendCom->subframe_nbslots, &hSpatParamRendCom->nb_subframes );

#ifdef API_5MS

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

#ifdef MASA_AND_OBJECTS

    {

        /* check if the general time resolution is different than the DirAC one (combinded formats)*/

        int16_t i, sf_fac;

        sf_fac = st_ivas->hTcBuffer->n_samples_granularity / hSpatParamRendCom->slot_size;

        for ( i = 0; i < hSpatParamRendCom->nb_subframes; i++ )

        {

#ifdef DEBUGGING

            /* only works if the nb of slots are a multiple of sf_fac, otherwise something was set up wrong */

            assert( ( hSpatParamRendCom->subframe_nbslots[i] % sf_fac ) == 0 );

    if ( st_ivas->ivas_format != MASA_ISM_FORMAT || st_ivas->ism_mode != ISM_MASA_MODE_DISC )

#endif

            st_ivas->hTcBuffer->subframe_nbslots[i] = hSpatParamRendCom->subframe_nbslots[i] / sf_fac;

        }

    }

#else

    {

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

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

#endif

    }

#endif



    /* set mapping according to dirac_read_idx */