Commit afd123c7 authored by vaclav's avatar vaclav
Browse files

fix merge

parent 5f0209bd

lib_dec/ivas_jbm_dec_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -4327,6 +4327,7 @@ static void ivas_jbm_dec_copy_masa_meta_to_buffer( 
 *

 * Map input MASA metadata subframes to slots in JBM processing

 *--------------------------------------------------------------------------*/



static void ivas_jbm_masa_sf_to_slot_map(

    Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure     */

    const Word16 nCldfbTs    /* i  : number of CLDFB time slots */
@@ -4338,6 +4339,10 @@ static void ivas_jbm_masa_sf_to_slot_map( 
    Word16 slot_idx;

    Word16 write_idx, sf_index;



#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );



#endif

    /* Set values */

    hJbmMetadata = st_ivas->hJbmMetadata;

    num_slots_in_subfr = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES;