Commit 9dc8cab2 authored by bayers's avatar bayers
Browse files

reviewed merge conflict solution

parent 00fe90ba

lib_dec/ivas_dirac_dec.c

+0 −12
Original line number Diff line number Diff line
@@ -1502,23 +1502,11 @@ void ivas_dirac_dec_set_md_map( 
    num_slots_in_subfr = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES;

    hSpatParamRendCom->subframes_rendered = 0;



// sgi2bay: please review

// <<<<<<< HEAD

//     ivas_jbm_dec_get_adapted_subframes( nCldfbTs, hDirAC->subframe_nbslots, &hDirAC->nb_subframes );

// #ifdef API_5MS

//     st_ivas->hTcBuffer->nb_subframes = hDirAC->nb_subframes;

//     mvs2s( hDirAC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, hDirAC->nb_subframes );

// #endif

// =======

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

// >>>>>>> main

// merged to:

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

#ifdef API_5MS

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

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

#endif

// end merge



    /* set mapping according to dirac_read_idx */