Commit 32358cc8 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix merge errors

parent b34b1d69

lib_dec/ivas_ism_param_dec.c

+14 −6
Original line number Diff line number Diff line
@@ -819,12 +819,16 @@ void ivas_param_ism_dec_digest_tc( 
    float *transport_channels_f[] /* i  : synthesized core-coder transport channels/DirAC output  */

)

{

#ifndef OBJ_EDITING_API

    int16_t ch, nchan_transport;

    int16_t slot_idx;

#ifndef OBJ_EDITING_API

    int16_t nchan_out, nchan_out_woLFE, i;

    int16_t bin_idx;

    int32_t ivas_total_brate;

#else

    int16_t ch, nchan_transport, nchan_out, nchan_out_woLFE, i;

    int16_t slot_idx, bin_idx;

    int32_t ivas_total_brate;

#endif

    int16_t output_frame;

#ifndef OBJ_EDITING_API
@@ -862,6 +866,7 @@ void ivas_param_ism_dec_digest_tc( 
        nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;

    }

#endif



    push_wmops( "ivas_param_ism_dec_digest_tc" );



#ifndef OBJ_EDITING_API
@@ -940,6 +945,7 @@ void ivas_param_ism_dec_digest_tc( 
        }

    }

#endif



    if ( st_ivas->hDecoderConfig->Opt_tsm )

    {

        /*TODO : FhG to check*/
@@ -961,6 +967,7 @@ void ivas_param_ism_dec_digest_tc( 
                mvr2r( RealBuffer, &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], hSpatParamRendCom->num_freq_bands );

                mvr2r( ImagBuffer, &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], hSpatParamRendCom->num_freq_bands );

            }



#ifndef OBJ_EDITING_API

            ivas_param_ism_collect_slot( hParamIsmDec, &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], ch, ref_power, cx_diag );

#endif
@@ -1486,25 +1493,26 @@ void ivas_param_ism_params_to_masa_param_mapping( 
    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure      */

)

{

#ifdef OBJ_EDITING_PARAMISM

    PARAM_ISM_DEC_HANDLE hParamIsmDec;

    int32_t ivas_total_brate;



#ifndef OBJ_EDITING_PARAMISM

    hParamIsmDec = st_ivas->hParamIsmDec;

#else

    PARAM_ISM_DEC_HANDLE hParamIsmDec;

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;



    int16_t nBins;

    int16_t band_idx, bin_idx, sf_idx;

    int16_t brange[2];

    int16_t azimuth[2];

    int16_t elevation[2];

    float power_ratio[2];

    int32_t ivas_total_brate;



    hParamIsmDec = st_ivas->hParamIsmDec;

    hSpatParamRendCom = st_ivas->hSpatParamRendCom;

    nBins = hSpatParamRendCom->num_freq_bands;

#endif



    hParamIsmDec = st_ivas->hParamIsmDec;



    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;



    if ( !( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) )

lib_dec/ivas_jbm_dec.c

+5 −2
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
    {

        ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );



        if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

        if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hDecoderConfig->Opt_tsm )

        {

            ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

        }
@@ -921,8 +921,11 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
        if ( st_ivas->renderer_type == RENDERER_OMASA_MIX_EXT || st_ivas->renderer_type == RENDERER_OMASA_OBJECT_EXT )

        {

            ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );

            if ( st_ivas->hDecoderConfig->Opt_tsm )

            {

                ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

            }

        }

        else

        {

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode == ISM_MASA_MODE_DISC )