merge from main

    FOR( i = 0; i < frame_len; i++ )

    {

#ifdef FIX_BASOP_2642_INCORRECT_IF_THRESHOLD

        test();

        if ( LT_32( ppFilterbank_FRs_s_fx[i], 419430 ) )

#else

        if ( ppFilterbank_FRs_s_fx[i] < 0 )

#endif

        {

            ppFilterbank_FRs_s_fx[i] = 419430; // 0.1 in Q22

            move32();

#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define HARMONIZE_2502_GENERATE_COMFORT_NOISE_DEC       /* FhG: harmonize generate_comfort_noise_dec_fx() and generate_comfort_noise_dec_ivas_fx() */

#define FIX_BASOP_2650_DEC_PRM_TCX                      /* FhG: Simplify calculation of st->bits_frame_core in dec_prm_tcx(), align function name to float */

#define FIX_2648_IVAS_ISM_DEC_DIGEST_TC                 /* FhG: improvements on ivas_ism_dec_digest_tc_fx() */

/* #################### End BE switches ################################## */

#define FIX_FLOAT_1600_OMASA_WRONG_RENDER_PATH          /* Nokia: float issue 1600: fix initialization condition of stereo type detection for OMASA */

#define FIX_BASOP_2627_PARAM_MC_ILD_REMAP_EXP           /* FhG: BASOP #2627: accumulate 10^(ILD/10) using a dynamic exponent */

#define FIX_BASOP_2635_EFAP_ADD_VERTEX_ELE_ROUND        /* FhG: BASOP #2635: round |elevation| with anint_fx before the 90deg subtraction in add_vertex_fx */

#define FIX_BASOP_2642_INCORRECT_IF_THRESHOLD           /* Dolby: BASOP #2642: incorrect threshold 0.0 used instead of 0.1 in if condition */

#define FIX_BASOP_2639_INCORRECT_ARRAY_INDEX            /* Dolby: BASOP #2639: incorrect array index in ivas_spar_unquant_dtx_indicies */

#define FIX_BASOP_2640_MASA_STEREO_TYPE_ASSERT          /* Nokia: BASOP issue 2640: Fix assert by saturating shift when exponent difference is very large. */

#define FIX_2636_OMASA_INTERFORMAT_BRATE                /* VA: basop issue 2636: Correct condition in function ivas_interformat_brate_fx() */

    const Word16 nchan_out /* i  : number of output channels     */

);

#ifndef HARMONIZE_2502_GENERATE_COMFORT_NOISE_DEC

void generate_comfort_noise_dec_ivas_fx(

    Word32 **bufferReal, /* o   : matrix to real part of i   bands */

    Word32 **bufferImag, /* o   : matrix to imaginary part of i   bands */

    Word16 gen_exc,

    const Word16 nchan_out /* i  : number of output channels     */

);

#endif

void generate_comfort_noise_dec_hf_fx(

                }

                ELSE

                {

#ifdef HARMONIZE_2502_GENERATE_COMFORT_NOISE_DEC

                    generate_comfort_noise_dec_fx( NULL, NULL, NULL, st, &( st->Q_exc ), 1, nchan_out );

#else

                    generate_comfort_noise_dec_ivas_fx( NULL, NULL, NULL, st, &( st->Q_exc ), 1, nchan_out );

#endif

                }

                FdCng_exc( st->hFdCngDec->hFdCngCom, &st->CNG_mode, st->L_frame, st->lsp_old_fx, st->first_CNG, st->lspCNG_fx, Aq_fx, lsp_new_fx, lsf_new_fx, exc_fx, exc2_fx, bwe_exc_fx );