merge issues

            e_y = sub( i_e, norm_y );

            e_z = sub( i_e, norm_z );

        }

        temp1 = BASOP_Util_Add_Mant32Exp( Mult_32_32( scaled_x, scaled_x ), shl( e_x, 1 ), Mult_32_32( scaled_y, scaled_y ), shl( e_y, 1 ), &exp1 );

        intensityNorm = BASOP_Util_Add_Mant32Exp( temp1, exp1, Mult_32_32( scaled_z, scaled_z ), shl( e_z, 1 ), &intensityNorm_e );

#define BASOP_NOGLOB_DECLARE_LOCAL

#endif

#define FIX_867_CLDFB_NRG_SCALE

#define FIX_1378_ACELP_OUT_OF_BOUNDS

#define FIX_1379_MASA_ANGLE_ROUND

/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

//#define OPT_STEREO_32KBPS_V1                    /* Optimization made in stereo decoding path for 32kbps decoding */

#define OPT_AVOID_STATE_BUF_RESCALE             /* Optimization made to avoid rescale of synth state buffer */

#define FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx                 /*FhG: WMOPS tuning, nonbe*/

#define FIX_1310_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot   /*FhG: WMOPS tuning, nonbe*/

/* Both following 2 macros (IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST*) are independent from each other, they refer to different code blocks */

#define IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE    /* FhG: reduces WMOPS of param_mc_prm_est, bit-exact to previous version */

//#define IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE /* FhG: reduces WMOPS of param_mc_prm_est, not bit-exact to previous version. Obsoleted by MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */

#define HARM_PUSH_BIT

#define HARM_ENC_INIT

//#define HARM_SCE_INIT

#define DIV32_OPT_NEWTON                               /* FhG: faster 32 by 32 bit division */ 

#define	MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of Cy calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Obsoletes IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE. */

#define FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat            /*FhG: reduces WMOPS - bit-exact*/

#define FIX_1439_SPEEDUP_stereo_icBWE_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/

#define FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/

#define FIX_1439_SPEEDUP_synthesise_fb_high_band_fx             /*FhG: reduces WMOPS - bit-exact*/

#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic              /*FhG: reduces maintenance complexity & reduces WMOPS & prepares STAGE2 patch*/

#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2       /*FhG: reduces WMOPS*/

#define FIX_1481_HARDCODE_DIV                          /* FhG: hardcode division results in stereo_dmx_evs_init_encoder_fx() */

#define FIX_1486_IND_SHB_RES                   /* VA: Fix for issue 1486: align the usage of IND_SHB_RES_GS indices with float code */

#define TEST_HR

#define REMOVE_EVS_DUPLICATES                   /* remove core-coder duplicated functions, ACELP low-band decoder */

//#define NONBE_FIX_SBA_TRANS_DET_PRECISION               /*Work in progress*/

//#define NONBE_FIX_SBA_FFT_PRECISION                     /*Work in progress*/

//#define NONBE_FIX_PRIOR_MIXER_Q

    cldfb_q = 0;

    move16();

    direction_vector_q = 0;

    move16();

    diffuseness_vector_q = 0;

                mono_frame_count,

                dirac_mono_flag );

            computeIntensityVector_enc_fx(

                hDirAC,

                Cldfb_RealBuffer_fx,

                intensity_real_fx,

                cldfb_q,

                intensity_real_q );

            IF( !hodirac_flag )

            {

                computeDirectionVectors_fixed(

                }

                Scale_sig32( dir_v_fx, 3, -1 );

                // should be Q29?

                ivas_qmetadata_direction_vector_to_azimuth_elevation_fx(

                    dir_v_fx,

                    Q29,

        move16();

        brange[1] = hDirAC->band_grouping[i + enc_param_start_band + 1]; /* Q0 */

        move16();

        Word16 num_bins = sub( brange[1], brange[0] );

        Word16 gb = find_guarded_bits_fx( num_bins );

        Word16 norm;

            move32();

            img = Cldfb_ImagBuffer[0][j];

            move32();

            Word64 t1, t2, t3;

            t1 = W_mac_32_32( W_mult_32_32( Cldfb_RealBuffer[3][j], real ), Cldfb_ImagBuffer[3][j], img ); /* 2 * q_cldfb + 1 */

            t2 = W_mac_32_32( W_mult_32_32( Cldfb_RealBuffer[1][j], real ), Cldfb_ImagBuffer[1][j], img ); /* 2 * q_cldfb + 1 */

            t3 = W_mac_32_32( W_mult_32_32( Cldfb_RealBuffer[2][j], real ), Cldfb_ImagBuffer[2][j], img ); /* 2 * q_cldfb + 1 */

            t1 = W_shr( t1, gb );

            t2 = W_shr( t2, gb );

            t3 = W_shr( t3, gb );

            /* Intensity is XYZ order, audio is WYZX order. */

            tmp_1 = W_add( tmp_1, t1 ); /* 2 * q_cldfb + 1 */

            tmp_2 = W_add( tmp_2, t2 ); /* 2 * q_cldfb + 1 */

            tmp_3 = W_add( tmp_3, t3 ); /* 2 * q_cldfb + 1 */

        Word16 gb = find_guarded_bits_fx( l_ts );

#endif

        ivas_fb_mixer_get_windowed_fr_fx( hParamMC->hFbMixer, pcm_in_fx, p_slot_frame_f_real_fx, p_slot_frame_f_imag_fx, l_ts, l_ts, hParamMC->hFbMixer->fb_cfg->num_in_chans, gb );

        ivas_fb_mixer_update_prior_input_fx( hParamMC->hFbMixer, pcm_in_fx, l_ts, hParamMC->hFbMixer->fb_cfg->num_in_chans );

        /* slot_frame_f buffer Q = 11 - gb : exponent = 20 + gb */