Commit 800b0e71 authored by vaclav's avatar vaclav
Browse files

move last Opt_tsm instances from ivas_dec.c()

parent 3209f346

lib_dec/ivas_jbm_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -214,11 +214,13 @@ ivas_error ivas_dec( 
            {

                return error;

            }

#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS



            if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hDecoderConfig->Opt_tsm )

            {

                ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );

            }

#endif

        }

        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {
@@ -413,11 +415,13 @@ ivas_error ivas_dec( 
                /* Extract objects from MASA, output MASA + all objects (i.e., extracted and separated objects) */

                ivas_omasa_render_objects_from_mix( st_ivas, p_output, st_ivas->nchan_ism, output_frame );

            }

#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS



            if ( st_ivas->hDecoderConfig->Opt_tsm )

            {

                ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );

            }

#endif

        }

    }

    else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )
@@ -2855,6 +2859,10 @@ static void ivas_jbm_masa_sf_to_slot_map( 
    int16_t slot_idx;

    int16_t 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;