Commit e401e0bd authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix merge conflicts

parent f7fcc4c1

lib_dec/ivas_mc_param_dec.c

+5 −15
Original line number Diff line number Diff line
@@ -1489,12 +1489,11 @@ void ivas_param_mc_dec_prepare_renderer( 
    PARAM_MC_DEC_HANDLE hParamMC;

    int16_t i;



    int16_t i, ch;

#ifdef FIX_835_PARAMMC_BUFFER_VALUES

    int16_t is_next_band, skip_next_band;

#endif

    

    int16_t slot_idx, param_band_idx;

    int16_t param_band_idx;

    int16_t nchan_transport, nchan_out_transport, nchan_out_cldfb;

    int16_t nchan_out_cov;

    /*CLDFB*/
@@ -1585,15 +1584,6 @@ void ivas_param_mc_dec_prepare_renderer( 
        }

#endif



    /* slot loop for gathering the input data */

    for ( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )

    {

        if ( slot_idx >= 2 * hParamMC->hMetadataPMC->attackIndex )

        {

            ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot( &hParamMC->Cldfb_RealBuffer_tc[slot_idx * hParamMC->num_freq_bands * nchan_transport], &hParamMC->Cldfb_ImagBuffer_tc[slot_idx * hParamMC->num_freq_bands * nchan_transport], cx, cx_imag, hParamMC, nchan_transport );

        }

    }



        /* map from complex input covariance to real values */

#ifdef FIX_835_PARAMMC_BUFFER_VALUES

        for ( is_next_band = 0; is_next_band < 2; is_next_band++ )