From 0072713705c59a238d4a3ba2d337ee82e7b759fe Mon Sep 17 00:00:00 2001
From: Dmytro Bogovych <dmytro.bogovych@gmail.com>
Date: Mon, 15 Jun 2020 19:20:47 +0300
Subject: [PATCH] - more fixes for EVS enabled

---
 src/engine/media/MT_EvsCodec.cpp              |  24 +-
 src/engine/media/MT_EvsCodec.h                |   2 +-
 src/libs/libevs/lib_com/basop32.cpp           |   1 -
 src/libs/libevs/lib_com/basop32.h             |   2 +
 src/libs/libevs/lib_com/basop_com_lpc.cpp     |   5 +
 src/libs/libevs/lib_com/basop_lsf_tools.cpp   |   5 +
 src/libs/libevs/lib_com/basop_mpy.cpp         |   5 +
 src/libs/libevs/lib_com/basop_mpy.h           |   2 +
 src/libs/libevs/lib_com/basop_proto_func.h    |   2 +
 src/libs/libevs/lib_com/basop_settings.h      |   4 +
 src/libs/libevs/lib_com/basop_tcx_utils.cpp   |   5 +
 src/libs/libevs/lib_com/basop_util.cpp        |  60 +++-
 src/libs/libevs/lib_com/basop_util.h          |   3 +
 src/libs/libevs/lib_com/bastypes.h            |   5 +
 src/libs/libevs/lib_com/bitalloc.cpp          |   5 +
 src/libs/libevs/lib_com/bitallocsum.cpp       |   5 +
 src/libs/libevs/lib_com/bits_alloc.cpp        |   5 +
 src/libs/libevs/lib_com/bitstream.cpp         |  13 +-
 src/libs/libevs/lib_com/calc_st_com.cpp       |   5 +
 src/libs/libevs/lib_com/cb_shape.cpp          |   5 +
 src/libs/libevs/lib_com/cldfb.cpp             |   5 +
 src/libs/libevs/lib_com/cng_exc.cpp           |   5 +
 src/libs/libevs/lib_com/cnst.h                |   3 +
 src/libs/libevs/lib_com/codec_tcx_common.cpp  |   5 +
 src/libs/libevs/lib_com/control.h             |   5 +
 src/libs/libevs/lib_com/core_com_config.cpp   |   5 +
 src/libs/libevs/lib_com/deemph.cpp            |   5 +
 src/libs/libevs/lib_com/delay_comp.cpp        |   5 +
 src/libs/libevs/lib_com/disclaimer.cpp        |   5 +
 src/libs/libevs/lib_com/dlpc_bfi.cpp          |   5 +
 src/libs/libevs/lib_com/edct.cpp              |   5 +
 src/libs/libevs/lib_com/enh1632.cpp           |   5 +
 src/libs/libevs/lib_com/enh1632.h             |   3 +-
 src/libs/libevs/lib_com/enh40.cpp             |   5 +
 src/libs/libevs/lib_com/enh40.h               |  37 +--
 src/libs/libevs/lib_com/enhancer.cpp          |   5 +
 src/libs/libevs/lib_com/enr_1_az.cpp          |   5 +
 src/libs/libevs/lib_com/env_adj.cpp           |   5 +
 src/libs/libevs/lib_com/env_stab.cpp          |   5 +
 src/libs/libevs/lib_com/env_stab_trans.cpp    |   5 +
 src/libs/libevs/lib_com/est_tilt.cpp          |   5 +
 src/libs/libevs/lib_com/fd_cng_com.cpp        |   5 +
 src/libs/libevs/lib_com/fft.cpp               |   5 +
 src/libs/libevs/lib_com/fft_cldfb.cpp         |   5 +
 src/libs/libevs/lib_com/fft_rel.cpp           |   5 +
 src/libs/libevs/lib_com/fill_spectrum.cpp     |   5 +
 src/libs/libevs/lib_com/findpulse.cpp         |   5 +
 src/libs/libevs/lib_com/fine_gain_bits.cpp    |   5 +
 src/libs/libevs/lib_com/frame_ener.cpp        |   5 +
 src/libs/libevs/lib_com/g192.cpp              |   5 +
 src/libs/libevs/lib_com/g192.h                |   4 +
 src/libs/libevs/lib_com/get_gain.cpp          |   5 +
 src/libs/libevs/lib_com/gs_bitallocation.cpp  |   5 +
 src/libs/libevs/lib_com/gs_gains.cpp          |   5 +
 .../libevs/lib_com/gs_inact_switching.cpp     |   5 +
 src/libs/libevs/lib_com/gs_noisefill.cpp      |   5 +
 src/libs/libevs/lib_com/gs_preech.cpp         |   5 +
 src/libs/libevs/lib_com/guided_plc_util.cpp   |   5 +
 src/libs/libevs/lib_com/hp50.cpp              |   5 +
 src/libs/libevs/lib_com/hq2_bit_alloc.cpp     |   5 +
 src/libs/libevs/lib_com/hq2_core_com.cpp      |   5 +
 src/libs/libevs/lib_com/hq2_noise_inject.cpp  |   5 +
 src/libs/libevs/lib_com/hq_bit_allocation.cpp |   5 +
 src/libs/libevs/lib_com/hq_conf.cpp           |   5 +
 src/libs/libevs/lib_com/hq_tools.cpp          |   5 +
 src/libs/libevs/lib_com/hvq_pvq_bitalloc.cpp  |   5 +
 src/libs/libevs/lib_com/ifft_rel.cpp          |   5 +
 src/libs/libevs/lib_com/igf_base.cpp          |   5 +
 src/libs/libevs/lib_com/index_pvq_opt.cpp     |   5 +
 src/libs/libevs/lib_com/int_lsp.cpp           |   5 +
 .../libevs/lib_com/interleave_spectrum.cpp    |   5 +
 src/libs/libevs/lib_com/interpol.cpp          |   5 +
 src/libs/libevs/lib_com/isf_dec_amr_wb.cpp    |   5 +
 src/libs/libevs/lib_com/lag_wind.cpp          |   5 +
 src/libs/libevs/lib_com/lerp.cpp              |   5 +
 src/libs/libevs/lib_com/limit_t0.cpp          |   5 +
 src/libs/libevs/lib_com/logqnorm.cpp          |   5 +
 src/libs/libevs/lib_com/longarith.cpp         |   5 +
 src/libs/libevs/lib_com/low_rate_band_att.cpp |   5 +
 src/libs/libevs/lib_com/lpc_tools.cpp         |   5 +
 src/libs/libevs/lib_com/lsf_dec_bfi.cpp       |   5 +
 src/libs/libevs/lib_com/lsf_msvq_ma.cpp       |   5 +
 src/libs/libevs/lib_com/lsf_tools.cpp         |   5 +
 src/libs/libevs/lib_com/lsp_conv_poly.cpp     |   5 +
 src/libs/libevs/lib_com/mime.h                |   3 +
 src/libs/libevs/lib_com/modif_fs.cpp          |   5 +
 src/libs/libevs/lib_com/move.h                |   5 +
 src/libs/libevs/lib_com/mslvq_com.cpp         |   5 +
 src/libs/libevs/lib_com/nelp.cpp              |   5 +
 .../libevs/lib_com/parameter_bitmaping.cpp    |   5 +
 src/libs/libevs/lib_com/phase_dispersion.cpp  |   5 +
 src/libs/libevs/lib_com/ppp.cpp               |   5 +
 src/libs/libevs/lib_com/pred_lt4.cpp          |   5 +
 src/libs/libevs/lib_com/preemph.cpp           |   5 +
 src/libs/libevs/lib_com/prot.h                |   2 +
 src/libs/libevs/lib_com/pvq_com.cpp           |   5 +
 src/libs/libevs/lib_com/range_com.cpp         |   5 +
 src/libs/libevs/lib_com/re8_ppv.cpp           |   5 +
 src/libs/libevs/lib_com/re8_util.cpp          |   5 +
 src/libs/libevs/lib_com/realft.cpp            |   5 +
 src/libs/libevs/lib_com/recovernorm.cpp       |   5 +
 src/libs/libevs/lib_com/reordvct.cpp          |   5 +
 src/libs/libevs/lib_com/residu.cpp            |   5 +
 src/libs/libevs/lib_com/rom_com.cpp           | 314 +-----------------
 src/libs/libevs/lib_com/rom_com.h             |   4 +
 src/libs/libevs/lib_com/stab_est.cpp          |   5 +
 src/libs/libevs/lib_com/stat_com.h            |   3 +
 src/libs/libevs/lib_com/stat_noise_uv_mod.cpp |   5 +
 src/libs/libevs/lib_com/swb_bwe_com.cpp       |   5 +
 src/libs/libevs/lib_com/swb_bwe_com_hr.cpp    |   5 +
 src/libs/libevs/lib_com/swb_bwe_com_lr.cpp    |   5 +
 src/libs/libevs/lib_com/swb_tbe_com.cpp       |   5 +
 src/libs/libevs/lib_com/syn_12k8.cpp          |   5 +
 src/libs/libevs/lib_com/syn_filt.cpp          |   5 +
 .../libevs/lib_com/tcq_position_arith.cpp     |   5 +
 src/libs/libevs/lib_com/tcx_ltp.cpp           |   5 +
 src/libs/libevs/lib_com/tcx_mdct.cpp          |   5 +
 src/libs/libevs/lib_com/tcx_mdct_window.cpp   |   5 +
 src/libs/libevs/lib_com/tcx_utils.cpp         |   5 +
 src/libs/libevs/lib_com/tec_com.cpp           |   5 +
 src/libs/libevs/lib_com/tns_base.cpp          |   5 +
 src/libs/libevs/lib_com/tools.cpp             |   5 +
 src/libs/libevs/lib_com/trans_direct.cpp      |   5 +
 src/libs/libevs/lib_com/trans_inv.cpp         |   5 +
 src/libs/libevs/lib_com/typedef.h             |   5 +
 src/libs/libevs/lib_com/vlpc_2st_com.cpp      |   5 +
 src/libs/libevs/lib_com/weight.cpp            |   5 +
 src/libs/libevs/lib_com/weight_a.cpp          |   5 +
 src/libs/libevs/lib_com/wi.cpp                |   5 +
 src/libs/libevs/lib_com/window.cpp            |   5 +
 src/libs/libevs/lib_com/window_ola.cpp        |   5 +
 src/libs/libevs/lib_com/wtda.cpp              |   5 +
 src/libs/libevs/lib_dec/EvsRXlib.cpp          |   5 +
 src/libs/libevs/lib_dec/EvsRXlib.h            |   3 +
 src/libs/libevs/lib_dec/FEC.cpp               |   5 +
 src/libs/libevs/lib_dec/FEC_HQ_core.cpp       |   5 +
 src/libs/libevs/lib_dec/FEC_HQ_phase_ecu.cpp  |   5 +
 .../libevs/lib_dec/FEC_adapt_codebook.cpp     |   5 +
 src/libs/libevs/lib_dec/FEC_clas_estim.cpp    |   5 +
 src/libs/libevs/lib_dec/FEC_lsf_estim.cpp     |   5 +
 src/libs/libevs/lib_dec/FEC_pitch_estim.cpp   |   5 +
 src/libs/libevs/lib_dec/FEC_scale_syn.cpp     |   5 +
 .../libevs/lib_dec/LD_music_post_filter.cpp   |   5 +
 .../lib_dec/TonalComponentDetection.cpp       |   5 +
 src/libs/libevs/lib_dec/bass_psfilter.cpp     |   5 +
 src/libs/libevs/lib_dec/cng_dec.cpp           |   5 +
 src/libs/libevs/lib_dec/core_dec_init.cpp     |   5 +
 src/libs/libevs/lib_dec/core_dec_reconf.cpp   |   5 +
 src/libs/libevs/lib_dec/core_dec_switch.cpp   |   5 +
 .../libevs/lib_dec/core_switching_dec.cpp     |   5 +
 src/libs/libevs/lib_dec/d_gain2p.cpp          |   5 +
 src/libs/libevs/lib_dec/dec2t32.cpp           |   5 +
 src/libs/libevs/lib_dec/dec4t64.cpp           |   5 +
 src/libs/libevs/lib_dec/dec_LPD.cpp           |   5 +
 src/libs/libevs/lib_dec/dec_ace.cpp           |   5 +
 src/libs/libevs/lib_dec/dec_acelp.cpp         |   5 +
 .../libevs/lib_dec/dec_acelp_tcx_main.cpp     |   5 +
 src/libs/libevs/lib_dec/dec_amr_wb.cpp        |   5 +
 src/libs/libevs/lib_dec/dec_gen_voic.cpp      |   5 +
 src/libs/libevs/lib_dec/dec_higher_acelp.cpp  |   5 +
 src/libs/libevs/lib_dec/dec_nelp.cpp          |   5 +
 src/libs/libevs/lib_dec/dec_pit_exc.cpp       |   5 +
 src/libs/libevs/lib_dec/dec_post.cpp          |   5 +
 src/libs/libevs/lib_dec/dec_ppp.cpp           |   5 +
 src/libs/libevs/lib_dec/dec_prm.cpp           |   5 +
 src/libs/libevs/lib_dec/dec_tcx.cpp           |   5 +
 src/libs/libevs/lib_dec/dec_tran.cpp          |   5 +
 src/libs/libevs/lib_dec/dec_uv.cpp            |   5 +
 .../libevs/lib_dec/decision_matrix_dec.cpp    |   5 +
 src/libs/libevs/lib_dec/dlpc_avq.cpp          |   5 +
 src/libs/libevs/lib_dec/dlpc_stoch.cpp        |   5 +
 src/libs/libevs/lib_dec/er_dec_acelp.cpp      |   5 +
 src/libs/libevs/lib_dec/er_dec_tcx.cpp        |   5 +
 src/libs/libevs/lib_dec/er_scale_syn.cpp      |   5 +
 src/libs/libevs/lib_dec/er_sync_exc.cpp       |   5 +
 src/libs/libevs/lib_dec/er_util.cpp           |   5 +
 src/libs/libevs/lib_dec/evs_dec.cpp           |   5 +
 src/libs/libevs/lib_dec/fd_cng_dec.cpp        |   5 +
 src/libs/libevs/lib_dec/gain_dec.cpp          |   5 +
 src/libs/libevs/lib_dec/gaus_dec.cpp          |   5 +
 src/libs/libevs/lib_dec/gs_dec.cpp            |   5 +
 src/libs/libevs/lib_dec/gs_dec_amr_wb.cpp     |   5 +
 src/libs/libevs/lib_dec/hdecnrm.cpp           |   5 +
 src/libs/libevs/lib_dec/hf_synth.cpp          |   5 +
 src/libs/libevs/lib_dec/hq_classifier_dec.cpp |   5 +
 src/libs/libevs/lib_dec/hq_conf_fec.cpp       |   5 +
 src/libs/libevs/lib_dec/hq_core_dec.cpp       |   5 +
 src/libs/libevs/lib_dec/hq_env_dec.cpp        |   5 +
 src/libs/libevs/lib_dec/hq_hr_dec.cpp         |   5 +
 src/libs/libevs/lib_dec/hq_lr_dec.cpp         |   5 +
 src/libs/libevs/lib_dec/igf_dec.cpp           |   5 +
 src/libs/libevs/lib_dec/igf_scf_dec.cpp       |   5 +
 src/libs/libevs/lib_dec/init_dec.cpp          |   5 +
 src/libs/libevs/lib_dec/inov_dec.cpp          |   5 +
 .../libevs/lib_dec/jbm_jb4_circularbuffer.cpp |   5 +
 .../libevs/lib_dec/jbm_jb4_circularbuffer.h   |   5 +
 .../libevs/lib_dec/jbm_jb4_inputbuffer.cpp    |   5 +
 src/libs/libevs/lib_dec/jbm_jb4_inputbuffer.h |   3 +
 src/libs/libevs/lib_dec/jbm_jb4_jmf.cpp       |   5 +
 src/libs/libevs/lib_dec/jbm_jb4_jmf.h         |   4 +
 src/libs/libevs/lib_dec/jbm_jb4sb.cpp         |   5 +
 src/libs/libevs/lib_dec/jbm_jb4sb.h           |   4 +
 src/libs/libevs/lib_dec/jbm_pcmdsp_apa.cpp    |   5 +
 src/libs/libevs/lib_dec/jbm_pcmdsp_apa.h      |   4 +
 src/libs/libevs/lib_dec/jbm_pcmdsp_fifo.cpp   |   5 +
 src/libs/libevs/lib_dec/jbm_pcmdsp_fifo.h     |   5 +
 .../jbm_pcmdsp_similarityestimation.cpp       |   5 +
 .../lib_dec/jbm_pcmdsp_similarityestimation.h |   4 +
 src/libs/libevs/lib_dec/jbm_pcmdsp_window.cpp |   5 +
 src/libs/libevs/lib_dec/jbm_pcmdsp_window.h   |   3 +
 src/libs/libevs/lib_dec/jbm_types.h           |   4 +
 src/libs/libevs/lib_dec/lead_deindexing.cpp   |   5 +
 src/libs/libevs/lib_dec/lp_exc_d.cpp          |   5 +
 src/libs/libevs/lib_dec/lsf_dec.cpp           |   5 +
 src/libs/libevs/lib_dec/lsf_msvq_ma_dec.cpp   |   5 +
 src/libs/libevs/lib_dec/nelp_dec.cpp          |   5 +
 src/libs/libevs/lib_dec/peak_vq_dec.cpp       |   5 +
 src/libs/libevs/lib_dec/pit_dec.cpp           |   5 +
 src/libs/libevs/lib_dec/pitch_extr.cpp        |   5 +
 src/libs/libevs/lib_dec/post_dec.cpp          |   5 +
 src/libs/libevs/lib_dec/ppp_dec.cpp           |   5 +
 src/libs/libevs/lib_dec/pvq_core_dec.cpp      |   5 +
 src/libs/libevs/lib_dec/pvq_decode.cpp        |   5 +
 src/libs/libevs/lib_dec/range_dec.cpp         |   5 +
 src/libs/libevs/lib_dec/re8_dec.cpp           |   5 +
 src/libs/libevs/lib_dec/rom_dec.cpp           |   5 +
 src/libs/libevs/lib_dec/rom_dec.h             | 210 +++++++++++-
 src/libs/libevs/lib_dec/rst_dec.cpp           |   5 +
 src/libs/libevs/lib_dec/stat_dec.h            |   4 +
 src/libs/libevs/lib_dec/stat_noise_uv_dec.cpp |   5 +
 src/libs/libevs/lib_dec/swb_bwe_dec.cpp       |   5 +
 src/libs/libevs/lib_dec/swb_bwe_dec_hr.cpp    |   5 +
 src/libs/libevs/lib_dec/swb_bwe_dec_lr.cpp    |   5 +
 src/libs/libevs/lib_dec/swb_tbe_dec.cpp       |   5 +
 src/libs/libevs/lib_dec/syn_outp.cpp          |   5 +
 src/libs/libevs/lib_dec/tcq_core_dec.cpp      |   5 +
 src/libs/libevs/lib_dec/tcx_utils_dec.cpp     |   5 +
 src/libs/libevs/lib_dec/tns_base_dec.cpp      |   5 +
 .../libevs/lib_dec/tonalMDCTconcealment.cpp   |   5 +
 src/libs/libevs/lib_dec/transition_dec.cpp    |   5 +
 src/libs/libevs/lib_dec/updt_dec.cpp          |   5 +
 src/libs/libevs/lib_dec/vlpc_1st_dec.cpp      | 265 ++++++++++++++-
 src/libs/libevs/lib_dec/vlpc_2st_dec.cpp      |   5 +
 src/libs/libevs/lib_dec/voiced_dec.cpp        |   5 +
 src/libs/libevs/lib_dec/voip_client.cpp       |   5 +
 .../libevs/lib_dec/waveadjust_fec_dec.cpp     |   5 +
 src/libs/libevs/lib_enc/FEC_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/SNR_calc.cpp          |   5 +
 src/libs/libevs/lib_enc/analy_lp.cpp          |   2 +-
 src/libs/libevs/lib_enc/bass_psfilter_enc.cpp |   5 +
 src/libs/libevs/lib_enc/bw_detect.cpp         |   5 +
 src/libs/libevs/lib_enc/cng_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/cod2t32.cpp           |   5 +
 src/libs/libevs/lib_enc/cod4t64.cpp           |   5 +
 src/libs/libevs/lib_enc/cod_ace.cpp           |   5 +
 src/libs/libevs/lib_enc/cod_tcx.cpp           |   5 +
 src/libs/libevs/lib_enc/cod_uv.cpp            |   5 +
 src/libs/libevs/lib_enc/comvad_decision.cpp   |   5 +
 src/libs/libevs/lib_enc/cor_shif.cpp          |   5 +
 src/libs/libevs/lib_enc/core_enc_2div.cpp     |   5 +
 src/libs/libevs/lib_enc/core_enc_init.cpp     |   5 +
 src/libs/libevs/lib_enc/core_enc_ol.cpp       |   5 +
 src/libs/libevs/lib_enc/core_enc_reconf.cpp   |   5 +
 src/libs/libevs/lib_enc/core_enc_switch.cpp   |   5 +
 src/libs/libevs/lib_enc/core_enc_updt.cpp     |   5 +
 .../libevs/lib_enc/core_switching_enc.cpp     |   5 +
 src/libs/libevs/lib_enc/corr_xh.cpp           |   5 +
 .../libevs/lib_enc/decision_matrix_enc.cpp    |   5 +
 src/libs/libevs/lib_enc/detect_transient.cpp  |   5 +
 src/libs/libevs/lib_enc/diffcod.cpp           |   5 +
 src/libs/libevs/lib_enc/dtx.cpp               |   5 +
 src/libs/libevs/lib_enc/enc_acelp.cpp         |   5 +
 .../libevs/lib_enc/enc_acelp_tcx_main.cpp     |   5 +
 src/libs/libevs/lib_enc/enc_acelpx.cpp        |   5 +
 src/libs/libevs/lib_enc/enc_amr_wb.cpp        |   5 +
 src/libs/libevs/lib_enc/enc_gain.cpp          |   5 +
 src/libs/libevs/lib_enc/enc_gen_voic.cpp      |   5 +
 src/libs/libevs/lib_enc/enc_gen_voic_rf.cpp   |   5 +
 src/libs/libevs/lib_enc/enc_higher_acelp.cpp  |   5 +
 src/libs/libevs/lib_enc/enc_nelp.cpp          |   5 +
 src/libs/libevs/lib_enc/enc_pit_exc.cpp       |   5 +
 src/libs/libevs/lib_enc/enc_ppp.cpp           |   5 +
 src/libs/libevs/lib_enc/enc_prm.cpp           |   5 +
 src/libs/libevs/lib_enc/enc_tran.cpp          |   5 +
 src/libs/libevs/lib_enc/enc_uv.cpp            |   5 +
 src/libs/libevs/lib_enc/encoder.cpp           |   5 +
 src/libs/libevs/lib_enc/energy.cpp            |   5 +
 src/libs/libevs/lib_enc/eval_pit_contr.cpp    |   5 +
 src/libs/libevs/lib_enc/evs_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/ext_sig_ana.cpp       |   5 +
 src/libs/libevs/lib_enc/fd_cng_enc.cpp        |   5 +
 src/libs/libevs/lib_enc/find_tar.cpp          |   5 +
 src/libs/libevs/lib_enc/find_tilt.cpp         |   5 +
 src/libs/libevs/lib_enc/find_uv.cpp           |   5 +
 src/libs/libevs/lib_enc/find_wsp.cpp          |   5 +
 .../lib_enc/frame_spec_dif_cor_rate.cpp       |   5 +
 src/libs/libevs/lib_enc/gain_enc.cpp          |   5 +
 src/libs/libevs/lib_enc/gaus_enc.cpp          |   5 +
 src/libs/libevs/lib_enc/gp_clip.cpp           |   5 +
 src/libs/libevs/lib_enc/gs_enc.cpp            |   5 +
 src/libs/libevs/lib_enc/guided_plc_enc.cpp    |   5 +
 src/libs/libevs/lib_enc/hf_cod_amrwb.cpp      |   5 +
 src/libs/libevs/lib_enc/hq_classifier_enc.cpp |   5 +
 src/libs/libevs/lib_enc/hq_core_enc.cpp       |   5 +
 src/libs/libevs/lib_enc/hq_env_enc.cpp        |   5 +
 src/libs/libevs/lib_enc/hq_hr_enc.cpp         |   5 +
 src/libs/libevs/lib_enc/hq_lr_enc.cpp         |   5 +
 src/libs/libevs/lib_enc/hvq_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/igf_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/igf_scf_enc.cpp       |   5 +
 src/libs/libevs/lib_enc/init_enc.cpp          |   5 +
 src/libs/libevs/lib_enc/inov_enc.cpp          |   5 +
 src/libs/libevs/lib_enc/io_enc.cpp            |   5 +
 src/libs/libevs/lib_enc/isf_enc_amr_wb.cpp    |   5 +
 src/libs/libevs/lib_enc/lead_indexing.cpp     |   5 +
 src/libs/libevs/lib_enc/long_enr.cpp          |   5 +
 src/libs/libevs/lib_enc/lp_exc_e.cpp          |   5 +
 src/libs/libevs/lib_enc/lsf_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/lsf_msvq_ma_enc.cpp   |   5 +
 src/libs/libevs/lib_enc/ltd_stable.cpp        |   5 +
 src/libs/libevs/lib_enc/mdct_classifier.cpp   |   5 +
 src/libs/libevs/lib_enc/mdct_selector.cpp     |   5 +
 src/libs/libevs/lib_enc/mslvq_enc.cpp         |   5 +
 src/libs/libevs/lib_enc/multi_harm.cpp        |   5 +
 src/libs/libevs/lib_enc/nelp_enc.cpp          |   5 +
 src/libs/libevs/lib_enc/nois_est.cpp          |   5 +
 src/libs/libevs/lib_enc/noise_adjust.cpp      |   5 +
 src/libs/libevs/lib_enc/normalizecoefs.cpp    |   5 +
 src/libs/libevs/lib_enc/peak_vq_enc.cpp       |   5 +
 src/libs/libevs/lib_enc/pit_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/pitch_ol.cpp          |   5 +
 src/libs/libevs/lib_enc/pitch_ol2.cpp         |   5 +
 src/libs/libevs/lib_enc/plc_enc_ext.cpp       |   5 +
 src/libs/libevs/lib_enc/ppp_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/pre_proc.cpp          |   5 +
 src/libs/libevs/lib_enc/pvq_core_enc.cpp      |   5 +
 src/libs/libevs/lib_enc/pvq_encode.cpp        |   5 +
 src/libs/libevs/lib_enc/q_gain2p.cpp          |   5 +
 src/libs/libevs/lib_enc/qlpc_avq.cpp          |   5 +
 src/libs/libevs/lib_enc/qlpc_stoch.cpp        |   5 +
 src/libs/libevs/lib_enc/range_enc.cpp         |   5 +
 src/libs/libevs/lib_enc/re8_cod.cpp           |   5 +
 src/libs/libevs/lib_enc/reordernorm.cpp       |   5 +
 src/libs/libevs/lib_enc/rom_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/rom_enc.h             |   2 +
 src/libs/libevs/lib_enc/rst_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/set_impulse.cpp       |   5 +
 src/libs/libevs/lib_enc/setmodeindex.cpp      |   5 +
 src/libs/libevs/lib_enc/sig_clas.cpp          |   5 +
 src/libs/libevs/lib_enc/spec_center.cpp       |   5 +
 src/libs/libevs/lib_enc/spec_flatness.cpp     |   5 +
 .../libevs/lib_enc/speech_music_classif.cpp   |   5 +
 src/libs/libevs/lib_enc/stat_enc.h            |   2 +
 src/libs/libevs/lib_enc/stat_noise_uv_enc.cpp |   5 +
 src/libs/libevs/lib_enc/subband_fft.cpp       |   5 +
 src/libs/libevs/lib_enc/swb_bwe_enc.cpp       |   5 +
 src/libs/libevs/lib_enc/swb_bwe_enc_hr.cpp    |   5 +
 src/libs/libevs/lib_enc/swb_bwe_enc_lr.cpp    |   5 +
 src/libs/libevs/lib_enc/swb_pre_proc.cpp      |   5 +
 src/libs/libevs/lib_enc/swb_tbe_enc.cpp       |   5 +
 src/libs/libevs/lib_enc/tcq_core_enc.cpp      |   5 +
 src/libs/libevs/lib_enc/tcx_ltp_enc.cpp       |   5 +
 src/libs/libevs/lib_enc/tcx_utils_enc.cpp     |   5 +
 src/libs/libevs/lib_enc/tfa_enc.cpp           |   5 +
 src/libs/libevs/lib_enc/tns_base_enc.cpp      |   5 +
 .../libevs/lib_enc/transient_detection.cpp    |   5 +
 src/libs/libevs/lib_enc/transition_enc.cpp    |   5 +
 src/libs/libevs/lib_enc/update_decision.cpp   |   5 +
 src/libs/libevs/lib_enc/updt_enc.cpp          |   5 +
 src/libs/libevs/lib_enc/updt_tar.cpp          |   5 +
 src/libs/libevs/lib_enc/vad.cpp               |   5 +
 src/libs/libevs/lib_enc/vad_param_updt.cpp    |   5 +
 src/libs/libevs/lib_enc/vad_proc.cpp          |   5 +
 src/libs/libevs/lib_enc/vbr_average_rate.cpp  |   5 +
 src/libs/libevs/lib_enc/vlpc_1st_cod.cpp      |   5 +
 src/libs/libevs/lib_enc/vlpc_2st_cod.cpp      |   5 +
 src/libs/libevs/lib_enc/voiced_enc.cpp        |   5 +
 .../libevs/lib_enc/waveadjust_fec_cod.cpp     |   5 +
 378 files changed, 2357 insertions(+), 368 deletions(-)

diff --git a/src/engine/media/MT_EvsCodec.cpp b/src/engine/media/MT_EvsCodec.cpp
index a5e744bc..71072c5a 100644
--- a/src/engine/media/MT_EvsCodec.cpp
+++ b/src/engine/media/MT_EvsCodec.cpp
@@ -7,8 +7,8 @@
 *
 * lookup AMRWB IO mode
 *-------------------------------------------------------------------*/
-
-static Word16 rate2AMRWB_IOmode(
+namespace evs {
+extern Word16 rate2AMRWB_IOmode(
     Word32 rate                    /* i: bit rate */
 );
 
@@ -35,6 +35,7 @@ extern Word16 EVSmode2rate(
 #define CMR_ON		0
 #define CMR_ONLY	1
 
+}
 
 static const std::map<int, std::set<int>> BitrateToBandwidth_Tab{
     {5900,     {NB, WB}},
@@ -144,7 +145,7 @@ EVSCodec::EVSCodec(const StreamParameters &sp)
 {
 	EVSCodec::sp = sp;
 
-    if ((st_dec = (Decoder_State*)malloc(sizeof(Decoder_State))) == NULL)
+    if ((st_dec = (evs::Decoder_State*)malloc(sizeof(evs::Decoder_State))) == NULL)
 	{
 		std::stringstream out;
 		out << "Can not allocate memory for decoder state structure\n";
@@ -217,7 +218,7 @@ int EVSCodec::decode(const void* input, int input_length, void* output, int outp
 	/*if we have FixedPayload without ToC*/
     if (FixedPayload_EVSPrimary.find(input_length * 8) != FixedPayload_EVSPrimary.end())
     {
-        char c = rate2EVSmode(FixedPayload_EVSPrimary.find(input_length * 8)->second);
+        char c = evs::rate2EVSmode(FixedPayload_EVSPrimary.find(input_length * 8)->second);
         /* Add ToC byte.
          * WARNING maybe it will be work incorrect with 56bit payload,
          * see 3GPP TS 26.445 Annex A, A.2.1.3 */
@@ -233,7 +234,7 @@ int EVSCodec::decode(const void* input, int input_length, void* output, int outp
     /* Decode process */
     size_t buffer_processed = 0;
 
-    while (st_dec->bitstreamformat == G192 ? read_indices(st_dec, buffer.c_str(), buffer.size(), &buffer_processed, 0) : read_indices_mime(st_dec, buffer.c_str(), buffer.size(), &buffer_processed, 0))
+    while (st_dec->bitstreamformat == evs::G192 ? read_indices(st_dec, buffer.c_str(), buffer.size(), &buffer_processed, 0) : read_indices_mime(st_dec, buffer.c_str(), buffer.size(), &buffer_processed, 0))
 	{
 		if (st_dec->codec_mode == MODE1)
 		{
@@ -243,23 +244,23 @@ int EVSCodec::decode(const void* input, int input_length, void* output, int outp
 			}
 			else
 			{
-                evs_dec(st_dec, data, FRAMEMODE_NORMAL);
+                evs_dec(st_dec, data, evs::FRAMEMODE_NORMAL);
 			}
 		}
 		else
 		{
             if (!st_dec->bfi)
 			{
-                evs_dec(st_dec, data, FRAMEMODE_NORMAL);
+                evs_dec(st_dec, data, evs::FRAMEMODE_NORMAL);
 			}
 			else
 			{
-                evs_dec(st_dec, data, FRAMEMODE_MISSING);
+                evs_dec(st_dec, data, evs::FRAMEMODE_MISSING);
 			}
 		}
 
 		/* convert 'float' output data to 'short' */
-        syn_output(data, this->pcmLength(), static_cast<short*>(output) + offset);
+        evs::syn_output(data, this->pcmLength(), static_cast<short*>(output) + offset);
 		offset += this->pcmLength();
         if (st_dec->ini_frame < MAX_FRAME_COUNTER)
 		{
@@ -284,12 +285,12 @@ void EVSCodec::initDecoder(const StreamParameters& sp)
     st_dec->Opt_AMR_WB = 0;
     st_dec->Opt_VOIP = 0;
 
-	st_dec->bitstreamformat = G192;
+    st_dec->bitstreamformat = evs::G192;
 	st_dec->amrwb_rfc4867_flag = -1;
 
 	/*Set MIME type*/
 	if (sp.mime) {
-		st_dec->bitstreamformat = MIME;
+        st_dec->bitstreamformat = evs::MIME;
 		st_dec->amrwb_rfc4867_flag = 0;
 	}
 	/*Set Bandwidth*/
@@ -318,7 +319,6 @@ void EVSCodec::initDecoder(const StreamParameters& sp)
     reset_indices_dec(st_dec);
 
     srand(static_cast<unsigned int>(time(nullptr)));
-
 }
 
 } // end of namespace MT
diff --git a/src/engine/media/MT_EvsCodec.h b/src/engine/media/MT_EvsCodec.h
index c10618e7..6a110862 100644
--- a/src/engine/media/MT_EvsCodec.h
+++ b/src/engine/media/MT_EvsCodec.h
@@ -63,7 +63,7 @@ public:
     int plc(int lostFrames, void* output, int outputCapacity) ;
 
 private:
-    Decoder_State* st_dec;
+    evs::Decoder_State* st_dec;
     //Encoder_State_fx* st_enc;
     StreamParameters sp;
     void initDecoder(const StreamParameters& sp);
diff --git a/src/libs/libevs/lib_com/basop32.cpp b/src/libs/libevs/lib_com/basop32.cpp
index 7c698754..f8b44ba6 100644
--- a/src/libs/libevs/lib_com/basop32.cpp
+++ b/src/libs/libevs/lib_com/basop32.cpp
@@ -132,7 +132,6 @@ HISTORY:
 
 namespace evs {
 
-}
 /*___________________________________________________________________________
  |                                                                           |
  |   Local Functions                                                         |
diff --git a/src/libs/libevs/lib_com/basop32.h b/src/libs/libevs/lib_com/basop32.h
index f8126e96..2230d4b6 100644
--- a/src/libs/libevs/lib_com/basop32.h
+++ b/src/libs/libevs/lib_com/basop32.h
@@ -46,6 +46,7 @@
 #ifndef _BASIC_OP_H
 #define _BASIC_OP_H
 
+namespace evs {
 /* #define BASOP_OVERFLOW2 */
 
 /*___________________________________________________________________________
@@ -132,6 +133,7 @@ Word32 L_mult0(Word16 v1, Word16 v2); /* 32-bit Multiply w/o shift         1 */
 Word32 L_mac0(Word32 L_v3, Word16 v1, Word16 v2); /* 32-bit Mac w/o shift  1 */
 Word32 L_msu0(Word32 L_v3, Word16 v1, Word16 v2); /* 32-bit Msu w/o shift  1 */
 
+}
 
 #endif /* ifndef _BASIC_OP_H */
 
diff --git a/src/libs/libevs/lib_com/basop_com_lpc.cpp b/src/libs/libevs/lib_com/basop_com_lpc.cpp
index 9cd5ef75..963773a9 100644
--- a/src/libs/libevs/lib_com/basop_com_lpc.cpp
+++ b/src/libs/libevs/lib_com/basop_com_lpc.cpp
@@ -14,6 +14,9 @@
 #include "basop_util.h"
 #include "stl.h"
 
+namespace evs { 
+
+
 #define UNROLL_CHEBYSHEV_INNER_LOOP
 #define NC_MAX 8
 #define GUESS_TBL_SZ 256
@@ -235,3 +238,5 @@ void basop_lsf2lsp(const Word16 lsf[], Word16 lsp[])
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/basop_lsf_tools.cpp b/src/libs/libevs/lib_com/basop_lsf_tools.cpp
index 237c2db1..207d5337 100644
--- a/src/libs/libevs/lib_com/basop_lsf_tools.cpp
+++ b/src/libs/libevs/lib_com/basop_lsf_tools.cpp
@@ -10,6 +10,9 @@
 #include "control.h"
 #include "basop_util.h"
 
+namespace evs { 
+
+
 #define NC_MAX 8
 
 static Word16 E_LPC_f_lsp_pol_get(const Word16 lsp[], Word32 f[],  const Word16 n, const Word16 past_Ovf, const Word16 isMODE1);
@@ -260,3 +263,5 @@ Word16 E_LPC_f_lsp_pol_get(const Word16 lsp[], Word32 f[],  const Word16 n, cons
     }
     return Ovf;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/basop_mpy.cpp b/src/libs/libevs/lib_com/basop_mpy.cpp
index 2579a8bd..394485cd 100644
--- a/src/libs/libevs/lib_com/basop_mpy.cpp
+++ b/src/libs/libevs/lib_com/basop_mpy.cpp
@@ -6,6 +6,9 @@
 #include "basop_mpy.h"
 #include "options.h"
 
+namespace evs { 
+
+
 Word32 Mpy_32_16_1(Word32 x, Word16 y)
 {
     Word32 mh;
@@ -52,3 +55,5 @@ Word32 Mpy_32_32(Word32 x, Word32 y)
     return (mh);
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/basop_mpy.h b/src/libs/libevs/lib_com/basop_mpy.h
index 75e1559e..0a972053 100644
--- a/src/libs/libevs/lib_com/basop_mpy.h
+++ b/src/libs/libevs/lib_com/basop_mpy.h
@@ -8,6 +8,7 @@
 #include "stl.h"
 #include "options.h"
 
+namespace evs {
 /**
  * \brief   32*16 Bit fractional Multiplication using 40 bit OPS
  *          Performs a multiplication of a 32-bit variable x by
@@ -64,4 +65,5 @@ Word32 Mpy_32_16_r(Word32 x, Word16 y);
 Word32 Mpy_32_32(Word32 x,
                  Word32 y);
 
+}
 #endif /* __BASOP_SETTINGS_H */
diff --git a/src/libs/libevs/lib_com/basop_proto_func.h b/src/libs/libevs/lib_com/basop_proto_func.h
index 8f3c633b..b740eebc 100644
--- a/src/libs/libevs/lib_com/basop_proto_func.h
+++ b/src/libs/libevs/lib_com/basop_proto_func.h
@@ -8,6 +8,7 @@
 #include "stl.h"
 #include "basop_util.h"
 
+namespace evs {
 
 /* tcx_lpc_cdk.h */
 #define LSF_GAP_VAL(x) (Word16)((x)*2.0f*1.28f)
@@ -35,5 +36,6 @@ void basop_lpc2mdct(Word16 *lpcCoeffs, Word16 lpcOrder,
 void basop_PsychAdaptLowFreqDeemph(Word32 x[], const Word16 lpcGains[], const Word16 lpcGains_e[], Word16 lf_deemph_factors[]);
 void basop_mdct_noiseShaping_interp(Word32 x[], Word16 lg, Word16 gains[], Word16 gains_exp[]);
 
+} // end of namespace
 
 #endif
diff --git a/src/libs/libevs/lib_com/basop_settings.h b/src/libs/libevs/lib_com/basop_settings.h
index da9a3887..7f53dcc8 100644
--- a/src/libs/libevs/lib_com/basop_settings.h
+++ b/src/libs/libevs/lib_com/basop_settings.h
@@ -8,6 +8,8 @@
 #include "stl.h"
 #include "basop_mpy.h"
 
+namespace evs {
+
 #define _LONG                long
 #define _SHORT               short
 #ifdef _WIN32
@@ -82,4 +84,6 @@ typedef struct
     } v;
 } PWord16;
 
+} // end of namespace
+
 #endif /* __BASOP_SETTINGS_H */
diff --git a/src/libs/libevs/lib_com/basop_tcx_utils.cpp b/src/libs/libevs/lib_com/basop_tcx_utils.cpp
index 49260ebd..e47b7221 100644
--- a/src/libs/libevs/lib_com/basop_tcx_utils.cpp
+++ b/src/libs/libevs/lib_com/basop_tcx_utils.cpp
@@ -13,6 +13,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /* compare two positive normalized 16 bit mantissa/exponent values */
 /* return value: positive if first value greater, negative if second value greater, zero if equal */
 static Word16 compMantExp16Unorm(Word16 m1, Word16 e1, Word16 m2, Word16 e2)
@@ -405,3 +408,5 @@ void basop_PsychAdaptLowFreqDeemph(Word32 x[],
 
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/basop_util.cpp b/src/libs/libevs/lib_com/basop_util.cpp
index e2c5448d..b96acf8a 100644
--- a/src/libs/libevs/lib_com/basop_util.cpp
+++ b/src/libs/libevs/lib_com/basop_util.cpp
@@ -13,7 +13,61 @@
 #include "control.h"
 #include "cnst.h"
 
-extern const Word32 SqrtTable[32];
+namespace evs { 
+
+/* square root tables */
+const Word32 SqrtTable[32] =   /* Q31 */
+{
+    0x5A82D429, 0x5BEA10FE, 0x5D4BE6E5, 0x5EA89270, 0x60004BE2, 0x615347A1, 0x62A1B68C, 0x63EBC651,
+    0x6531A1B5, 0x667370D4, 0x67B1595F, 0x68EB7EC8, 0x6A220277, 0x6B5503F0, 0x6C84A0F9, 0x6DB0F5BD,
+    0x6EDA1CE9, 0x70002FC7, 0x7123465A, 0x72437773, 0x7360D8C5, 0x747B7EFA, 0x75937DC4, 0x76A8E7EB,
+    0x77BBCF60, 0x78CC4545, 0x79DA5A00, 0x7AE61D3E, 0x7BEF9E07, 0x7CF6EAC2, 0x7DFC113F, 0x7EFF1EC0
+};
+
+const Word16 SqrtDiffTable[32] =   /* Q21 */
+{
+    0x59CF, 0x5875, 0x572B, 0x55EE, 0x54BF, 0x539C, 0x5284, 0x5177,
+    0x5074, 0x4F7A, 0x4E89, 0x4DA1, 0x4CC0, 0x4BE7, 0x4B15, 0x4A4A,
+    0x4985, 0x48C6, 0x480C, 0x4758, 0x46AA, 0x4600, 0x455B, 0x44BA,
+    0x441D, 0x4385, 0x42F1, 0x4260, 0x41D3, 0x414A, 0x40C3, 0x4040
+};
+
+
+const Word32 ISqrtTable[32] =   /* Q31 */
+{
+    0x7FFE7F85, 0x7E0A4E25, 0x7C2C56C7, 0x7A63002C, 0x78ACD922, 0x7708939D, 0x75750088, 0x73F10C2D,
+    0x727BBB1A, 0x71142774, 0x6FB97EA5, 0x6E6AFF54, 0x6D27F79D, 0x6BEFC388, 0x6AC1CBA4, 0x699D83DA,
+    0x68826A53, 0x6770068E, 0x6665E882, 0x6563A7DF, 0x6468E364, 0x63754043, 0x62886999, 0x61A20FEE,
+    0x60C1E8C8, 0x5FE7AE45, 0x5F131EBE, 0x5E43FC76, 0x5D7A0D4F, 0x5CB51A81, 0x5BF4F061, 0x5B395E26
+};
+
+const Word16 ISqrtDiffTable[32] =   /* Q21 */
+{
+    0x7D0C, 0x777E, 0x7256, 0x6D8A, 0x6911, 0x64E5, 0x60FD, 0x5D54,
+    0x59E5, 0x56AA, 0x53A0, 0x50C2, 0x4E0D, 0x4B7E, 0x4912, 0x46C6,
+    0x4499, 0x4288, 0x4090, 0x3EB1, 0x3CE9, 0x3B36, 0x3996, 0x380A,
+    0x368F, 0x3524, 0x33C9, 0x327C, 0x313D, 0x300B, 0x2EE5, 0x2DCA
+};
+
+/* 1/x tables */
+const Word32 InvTable[32] =   /* Q31 */
+{
+    0x7FFBFE40, 0x7C1B608E, 0x78752176, 0x750440BA, 0x71C44C49, 0x6EB14D0A, 0x6BC7B6B4, 0x69045A19,
+    0x6664598A, 0x63E51EE2, 0x61845308, 0x5F3FD698, 0x5D15BB8E, 0x5B043FD0, 0x5909C861, 0x5724DD3C,
+    0x555425B2, 0x53966532, 0x51EA787F, 0x504F5331, 0x4EC3FD84, 0x4D479267, 0x4BD93DBE, 0x4A783ADC,
+    0x4923D31D, 0x47DB5CAE, 0x469E3974, 0x456BD608, 0x4443A8D9, 0x43253159, 0x420FF746, 0x41038A01
+};
+
+const Word16 InvDiffTable[32] =   /* Q20 */
+{
+    0x7C14, 0x74C8, 0x6E1C, 0x67FF, 0x6260, 0x5D33, 0x586C, 0x5400,
+    0x4FE7, 0x4C19, 0x4890, 0x4543, 0x422F, 0x3F4F, 0x3C9D, 0x3A17,
+    0x37B8, 0x357E, 0x3365, 0x316B, 0x2F8D, 0x2DCB, 0x2C20, 0x2A8D,
+    0x290F, 0x27A4, 0x264C, 0x2506, 0x23CF, 0x22A7, 0x218E, 0x2081
+};
+
+
+/*extern const Word32 SqrtTable[32];
 extern const Word16 SqrtDiffTable[32];
 
 extern const Word32 ISqrtTable[32];
@@ -21,7 +75,7 @@ extern const Word16 ISqrtDiffTable[32];
 
 extern const Word32 InvTable[32];
 extern const Word16 InvDiffTable[32];
-
+*/
 
 Word32 BASOP_Util_Log2(Word32 x)
 {
@@ -1040,3 +1094,5 @@ Word32 Sqrt_l(     /* o : output value,                          Q31 */
 
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/basop_util.h b/src/libs/libevs/lib_com/basop_util.h
index 5195f437..903070a6 100644
--- a/src/libs/libevs/lib_com/basop_util.h
+++ b/src/libs/libevs/lib_com/basop_util.h
@@ -10,6 +10,7 @@
 #include "basop32.h"
 #include "basop_mpy.h"
 
+namespace evs {
 
 #define LD_DATA_SCALE     (6)
 
@@ -383,4 +384,6 @@ Word32 dotWord32_16_guards(const Word32 * X, const Word16 * Y, Word16 n, Word16
 
 Word32 Sqrt_l(Word32 L_x, Word16 *exp);
 
+} // end of namespace
+
 #endif /* __BASOP_UTIL_H__ */
diff --git a/src/libs/libevs/lib_com/bastypes.h b/src/libs/libevs/lib_com/bastypes.h
index 57e958e6..7e8d4031 100644
--- a/src/libs/libevs/lib_com/bastypes.h
+++ b/src/libs/libevs/lib_com/bastypes.h
@@ -5,6 +5,9 @@
 #ifndef __BASTYPES_H
 #define __BASTYPES_H
 
+namespace evs {
+
+
 typedef unsigned char  BYTE;
 typedef unsigned short WORD;
 #if defined(__alpha__) || defined(__alpha) || defined(__sgi)
@@ -43,4 +46,6 @@ typedef unsigned long int ULINT;
 
 #define INVALID_HANDLE NULL
 
+} // end of namespace
+
 #endif
diff --git a/src/libs/libevs/lib_com/bitalloc.cpp b/src/libs/libevs/lib_com/bitalloc.cpp
index 268829f4..dd32d9fd 100644
--- a/src/libs/libevs/lib_com/bitalloc.cpp
+++ b/src/libs/libevs/lib_com/bitalloc.cpp
@@ -9,6 +9,9 @@
 #include "basop_util.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------
  * bitalloc()
@@ -971,3 +974,5 @@ short BitAllocWB (
 
     return (Word16)t_fx;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/bitallocsum.cpp b/src/libs/libevs/lib_com/bitallocsum.cpp
index e1ed7bf7..bbe6146e 100644
--- a/src/libs/libevs/lib_com/bitallocsum.cpp
+++ b/src/libs/libevs/lib_com/bitallocsum.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------
  *  bitallocsum()
@@ -58,3 +61,5 @@ void bitallocsum(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/bits_alloc.cpp b/src/libs/libevs/lib_com/bits_alloc.cpp
index d13a4ff9..cdb80ffe 100644
--- a/src/libs/libevs/lib_com/bits_alloc.cpp
+++ b/src/libs/libevs/lib_com/bits_alloc.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
 * Local function
 *--------------------------------------------------------------------*/
@@ -306,3 +309,5 @@ static int BITS_ALLOC_adjust_acelp_fixed_cdk(
 
     return bitsused;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/bitstream.cpp b/src/libs/libevs/lib_com/bitstream.cpp
index 793c72a2..fb2c7e6c 100644
--- a/src/libs/libevs/lib_com/bitstream.cpp
+++ b/src/libs/libevs/lib_com/bitstream.cpp
@@ -12,6 +12,9 @@
 #include "rom_com.h"
 #include "mime.h"
 
+namespace evs { 
+
+
 
 
 
@@ -20,7 +23,7 @@
 *
 * insert a bit into packed octet
 *-------------------------------------------------------------------*/
-static void pack_bit(
+void pack_bit(
     const Word16 bit,    /* i:   bit to be packed */
     UWord8 **pt,         /* i/o: pointer to octet array into which bit will be placed */
     UWord8 *omask        /* i/o: output mask to indicate where in the octet the bit is to be written */
@@ -49,7 +52,7 @@ static void pack_bit(
 *
 * unpack a bit from packed octet
 *-------------------------------------------------------------------*/
-static Word16 unpack_bit(
+Word16 unpack_bit(
     UWord8 **pt,         /* i/o: pointer to octet array from which bit will be read */
     UWord8 *mask         /* i/o: mask to indicate the bit in the octet */
 )
@@ -73,7 +76,7 @@ static Word16 unpack_bit(
 * lookup AMRWB IO mode
 *-------------------------------------------------------------------*/
 
-static Word16 rate2AMRWB_IOmode(
+Word16 rate2AMRWB_IOmode(
     Word32 rate                    /* i: bit rate */
 )
 {
@@ -110,7 +113,7 @@ static Word16 rate2AMRWB_IOmode(
 *
 * lookup EVS mode
 *-------------------------------------------------------------------*/
-static Word16 rate2EVSmode(
+Word16 rate2EVSmode(
     Word32 rate                    /* i: bit rate */
 )
 {
@@ -2192,3 +2195,5 @@ void evs_dec_previewFrame(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/calc_st_com.cpp b/src/libs/libevs/lib_com/calc_st_com.cpp
index cced1191..56dc54be 100644
--- a/src/libs/libevs/lib_com/calc_st_com.cpp
+++ b/src/libs/libevs/lib_com/calc_st_com.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 /*----------------------------------------------------------------------------
@@ -271,3 +274,5 @@ void blend_subfr2( float *sigIn1, float *sigIn2, float *sigOut)
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/cb_shape.cpp b/src/libs/libevs/lib_com/cb_shape.cpp
index 2626a4e8..966418ff 100644
--- a/src/libs/libevs/lib_com/cb_shape.cpp
+++ b/src/libs/libevs/lib_com/cb_shape.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * cb_shape()
@@ -86,3 +89,5 @@ void cb_shape(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/cldfb.cpp b/src/libs/libevs/lib_com/cldfb.cpp
index 94ec04af..f5c61c74 100644
--- a/src/libs/libevs/lib_com/cldfb.cpp
+++ b/src/libs/libevs/lib_com/cldfb.cpp
@@ -10,6 +10,9 @@
 #include "string.h"
 #include <assert.h>
 
+namespace evs { 
+
+
 #if defined __ICL
 #define restrict __restrict
 #else
@@ -801,3 +804,5 @@ int cldfb_reset_memory(
 
     return 0;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/cng_exc.cpp b/src/libs/libevs/lib_com/cng_exc.cpp
index 512623f4..2a5fd822 100644
--- a/src/libs/libevs/lib_com/cng_exc.cpp
+++ b/src/libs/libevs/lib_com/cng_exc.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local constants
  *---------------------------------------------------------------------*/
@@ -555,3 +558,5 @@ void cng_params_upd(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/cnst.h b/src/libs/libevs/lib_com/cnst.h
index 2b323db4..09e66e8a 100644
--- a/src/libs/libevs/lib_com/cnst.h
+++ b/src/libs/libevs/lib_com/cnst.h
@@ -7,6 +7,7 @@
 
 #include "options.h"
 
+namespace evs {
 /*----------------------------------------------------------------------------------*
  * General constants
  *----------------------------------------------------------------------------------*/
@@ -1998,4 +1999,6 @@ enum
     MIME
 };
 
+} // end of namespace
+
 #endif /* CNST_H */
diff --git a/src/libs/libevs/lib_com/codec_tcx_common.cpp b/src/libs/libevs/lib_com/codec_tcx_common.cpp
index 3430c895..ebf1acf0 100644
--- a/src/libs/libevs/lib_com/codec_tcx_common.cpp
+++ b/src/libs/libevs/lib_com/codec_tcx_common.cpp
@@ -6,6 +6,9 @@
 #include "prot.h"
 #include "options.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * tcxGetNoiseFillingTilt()
  *
@@ -171,3 +174,5 @@ void tcxInvertWindowGrouping(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/control.h b/src/libs/libevs/lib_com/control.h
index 30baac63..fb7ea800 100644
--- a/src/libs/libevs/lib_com/control.h
+++ b/src/libs/libevs/lib_com/control.h
@@ -9,6 +9,9 @@
 
 #include "stl.h"
 
+namespace evs {
+
+
 #define FOR( a) if( incrFor(), 0); else for( a)
 static __inline void incrFor( void)
 {
@@ -39,4 +42,6 @@ static __inline void incrSwitch( void)
 
 #define GOTO goto
 
+}
+
 #endif /* _CONTROL_H */
diff --git a/src/libs/libevs/lib_com/core_com_config.cpp b/src/libs/libevs/lib_com/core_com_config.cpp
index 42f5adc8..a4f367be 100644
--- a/src/libs/libevs/lib_com/core_com_config.cpp
+++ b/src/libs/libevs/lib_com/core_com_config.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * getTcxonly()
  *
@@ -417,3 +420,5 @@ short getTcxLpcShapedAri(
 
     return tcx_lpc_shaped_ari;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/deemph.cpp b/src/libs/libevs/lib_com/deemph.cpp
index cdf6f290..e303a258 100644
--- a/src/libs/libevs/lib_com/deemph.cpp
+++ b/src/libs/libevs/lib_com/deemph.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * deemph()
  *
@@ -35,3 +38,5 @@ void deemph(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/delay_comp.cpp b/src/libs/libevs/lib_com/delay_comp.cpp
index 3ad7cba5..7bf06a8e 100644
--- a/src/libs/libevs/lib_com/delay_comp.cpp
+++ b/src/libs/libevs/lib_com/delay_comp.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------
  *  get_delay()
@@ -37,3 +40,5 @@ float get_delay(                /* o  : delay value in ms
 
     return delay;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/disclaimer.cpp b/src/libs/libevs/lib_com/disclaimer.cpp
index fd2892d0..a8d93c7a 100644
--- a/src/libs/libevs/lib_com/disclaimer.cpp
+++ b/src/libs/libevs/lib_com/disclaimer.cpp
@@ -6,6 +6,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 int print_disclaimer(FILE *fPtr)
 {
 
@@ -15,3 +18,5 @@ int print_disclaimer(FILE *fPtr)
 
     return 0;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/dlpc_bfi.cpp b/src/libs/libevs/lib_com/dlpc_bfi.cpp
index 17868618..b4263d6e 100644
--- a/src/libs/libevs/lib_com/dlpc_bfi.cpp
+++ b/src/libs/libevs/lib_com/dlpc_bfi.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
 * routine:   dlpc_bfi()
@@ -46,3 +49,5 @@ void dlpc_bfi(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/edct.cpp b/src/libs/libevs/lib_com/edct.cpp
index d159398c..70355948 100644
--- a/src/libs/libevs/lib_com/edct.cpp
+++ b/src/libs/libevs/lib_com/edct.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 static float const * get_edct_table(short length)
 {
     float const * edct_table = NULL;
@@ -191,3 +194,5 @@ void iedct_short(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/enh1632.cpp b/src/libs/libevs/lib_com/enh1632.cpp
index d1a86253..b6b0d6cc 100644
--- a/src/libs/libevs/lib_com/enh1632.cpp
+++ b/src/libs/libevs/lib_com/enh1632.cpp
@@ -58,6 +58,9 @@
 #include <stdlib.h>
 #include "stl.h"
 
+namespace evs { 
+
+
 /*****************************************************************************
  *
  *   Constants and Globals
@@ -633,3 +636,5 @@ Word32 L_rotl( Word32 L_var1, Word16 var2, Word16 *var3)
 
 
 /* end of file */
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/enh1632.h b/src/libs/libevs/lib_com/enh1632.h
index 33a77270..ff8312ce 100644
--- a/src/libs/libevs/lib_com/enh1632.h
+++ b/src/libs/libevs/lib_com/enh1632.h
@@ -36,6 +36,7 @@
 #include "stl.h"
 
 
+namespace evs {
 /*****************************************************************************
  *
  *  Prototypes for enhanced 16/32 bit arithmetic operators
@@ -508,7 +509,7 @@ static __inline Word32 L_xor( Word32 L_var1, Word32 L_var2)
 
 
 
-
+} // end of namespace
 
 
 
diff --git a/src/libs/libevs/lib_com/enh40.cpp b/src/libs/libevs/lib_com/enh40.cpp
index 6f32c984..c8c906b3 100644
--- a/src/libs/libevs/lib_com/enh40.cpp
+++ b/src/libs/libevs/lib_com/enh40.cpp
@@ -65,6 +65,9 @@
 #include <stdlib.h>
 #include "stl.h"
 
+namespace evs { 
+
+
 /*****************************************************************************
  *
  *  Local Functions
@@ -1067,3 +1070,5 @@ Word40 L40_shl_r( Word40 L40_var1, Word16 var2)
 
 
 /* end of file */
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/enh40.h b/src/libs/libevs/lib_com/enh40.h
index bc13eda0..26998745 100644
--- a/src/libs/libevs/lib_com/enh40.h
+++ b/src/libs/libevs/lib_com/enh40.h
@@ -25,6 +25,7 @@
 
 #include "stl.h"
 
+namespace evs {
 
 #ifdef _MSC_VER
 #define MAX_40 (0x0000007fffffffff)
@@ -336,41 +337,7 @@ static __inline Word16 msu_r40( Word40 L40_var1, Word16 var2, Word16 var3)
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+} // end of namespace
 
 
 
diff --git a/src/libs/libevs/lib_com/enhancer.cpp b/src/libs/libevs/lib_com/enhancer.cpp
index 407a0c54..58cd4622 100644
--- a/src/libs/libevs/lib_com/enhancer.cpp
+++ b/src/libs/libevs/lib_com/enhancer.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local functions
  *---------------------------------------------------------------------*/
@@ -241,3 +244,5 @@ static void agc2(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/enr_1_az.cpp b/src/libs/libevs/lib_com/enr_1_az.cpp
index 133f7fd8..4d7f30dd 100644
--- a/src/libs/libevs/lib_com/enr_1_az.cpp
+++ b/src/libs/libevs/lib_com/enr_1_az.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * enr_1_Az()
  *
@@ -28,3 +31,5 @@ float enr_1_Az(        /* o  : impulse response energy */
 
     return enr_LP;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/env_adj.cpp b/src/libs/libevs/lib_com/env_adj.cpp
index 35a736b0..127cb810 100644
--- a/src/libs/libevs/lib_com/env_adj.cpp
+++ b/src/libs/libevs/lib_com/env_adj.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * env_adj()
@@ -131,3 +134,5 @@ void env_adj (
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/env_stab.cpp b/src/libs/libevs/lib_com/env_stab.cpp
index 57bd43fb..b2b06c63 100644
--- a/src/libs/libevs/lib_com/env_stab.cpp
+++ b/src/libs/libevs/lib_com/env_stab.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include <math.h>
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * Local constants
  *--------------------------------------------------------------------------*/
@@ -166,3 +169,5 @@ float env_stab_smo(
 
     return state;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/env_stab_trans.cpp b/src/libs/libevs/lib_com/env_stab_trans.cpp
index 875d97cd..dd28c1a7 100644
--- a/src/libs/libevs/lib_com/env_stab_trans.cpp
+++ b/src/libs/libevs/lib_com/env_stab_trans.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include <math.h>
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * env_stab_transient_detect()
@@ -121,3 +124,5 @@ void env_stab_transient_detect(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/est_tilt.cpp b/src/libs/libevs/lib_com/est_tilt.cpp
index da6759d0..bb4f3e37 100644
--- a/src/libs/libevs/lib_com/est_tilt.cpp
+++ b/src/libs/libevs/lib_com/est_tilt.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * est_tilt()
@@ -55,3 +58,5 @@ float est_tilt(             /* o  : tilt of the code             */
     return tilt_code;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/fd_cng_com.cpp b/src/libs/libevs/lib_com/fd_cng_com.cpp
index c41f86e4..9f2393b6 100644
--- a/src/libs/libevs/lib_com/fd_cng_com.cpp
+++ b/src/libs/libevs/lib_com/fd_cng_com.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 
 /*-------------------------------------------------------------------
@@ -1072,3 +1075,5 @@ void FdCng_exc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/fft.cpp b/src/libs/libevs/lib_com/fft.cpp
index 04adbaf9..306d0507 100644
--- a/src/libs/libevs/lib_com/fft.cpp
+++ b/src/libs/libevs/lib_com/fft.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local functions
  *-----------------------------------------------------------------*/
@@ -3596,3 +3599,5 @@ void BASOP_cfft(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/fft_cldfb.cpp b/src/libs/libevs/lib_com/fft_cldfb.cpp
index 08773e23..48113469 100644
--- a/src/libs/libevs/lib_com/fft_cldfb.cpp
+++ b/src/libs/libevs/lib_com/fft_cldfb.cpp
@@ -6,6 +6,9 @@
 #include <assert.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 #if defined __ICL
@@ -1192,3 +1195,5 @@ void fft_cldfb (
     }
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/fft_rel.cpp b/src/libs/libevs/lib_com/fft_rel.cpp
index 02a9d574..eec4b5dc 100644
--- a/src/libs/libevs/lib_com/fft_rel.cpp
+++ b/src/libs/libevs/lib_com/fft_rel.cpp
@@ -6,6 +6,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local constants
  *---------------------------------------------------------------------*/
@@ -264,3 +267,5 @@ void fft_rel(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/fill_spectrum.cpp b/src/libs/libevs/lib_com/fill_spectrum.cpp
index 80ed0e37..2a152f9e 100644
--- a/src/libs/libevs/lib_com/fill_spectrum.cpp
+++ b/src/libs/libevs/lib_com/fill_spectrum.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * fill_spectrum()
  *
@@ -234,3 +237,5 @@ void fill_spectrum(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/findpulse.cpp b/src/libs/libevs/lib_com/findpulse.cpp
index 9d410796..5be6ce21 100644
--- a/src/libs/libevs/lib_com/findpulse.cpp
+++ b/src/libs/libevs/lib_com/findpulse.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 
 /*----------------------------------------------------------------------------------*
  *  findpulse()
@@ -104,3 +107,5 @@ short findpulse(              /* o  : pulse position        */
 
     return(maxi);
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/fine_gain_bits.cpp b/src/libs/libevs/lib_com/fine_gain_bits.cpp
index 03ecaead..73287171 100644
--- a/src/libs/libevs/lib_com/fine_gain_bits.cpp
+++ b/src/libs/libevs/lib_com/fine_gain_bits.cpp
@@ -6,6 +6,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------
  * subband_gain_bits()
@@ -98,3 +101,5 @@ short assign_gain_bits(              /* o  : Number of assigned gain bits      *
 
     return gain_bits_tot;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/frame_ener.cpp b/src/libs/libevs/lib_com/frame_ener.cpp
index aadd7544..a0b566bc 100644
--- a/src/libs/libevs/lib_com/frame_ener.cpp
+++ b/src/libs/libevs/lib_com/frame_ener.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*----------------------------------------------------------------------------------*
 * fer_energy()
@@ -94,3 +97,5 @@ float frame_energy(
 
     return enern;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/g192.cpp b/src/libs/libevs/lib_com/g192.cpp
index 97c2b6fd..81ab1f19 100644
--- a/src/libs/libevs/lib_com/g192.cpp
+++ b/src/libs/libevs/lib_com/g192.cpp
@@ -23,6 +23,9 @@ typedef signed __int64     int64_t;
 #include "options.h"
 #include "g192.h"
 
+namespace evs { 
+
+
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4996 )
@@ -251,3 +254,5 @@ G192_Reader_Close(G192_HANDLE* phG192)
     return G192_NO_ERROR;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/g192.h b/src/libs/libevs/lib_com/g192.h
index 767e4c2e..4711c83b 100644
--- a/src/libs/libevs/lib_com/g192.h
+++ b/src/libs/libevs/lib_com/g192.h
@@ -7,6 +7,8 @@
 
 #include <stdio.h>
 
+namespace evs {
+
 /*
  * ENUMS
  */
@@ -63,4 +65,6 @@ G192_ReadVoipFrame_short(G192_HANDLE const hG192,
 G192_ERROR
 G192_Reader_Close(G192_HANDLE* phG192);
 
+} // end of namespace
+
 #endif /* G192_H */
diff --git a/src/libs/libevs/lib_com/get_gain.cpp b/src/libs/libevs/lib_com/get_gain.cpp
index 39087d96..aee13548 100644
--- a/src/libs/libevs/lib_com/get_gain.cpp
+++ b/src/libs/libevs/lib_com/get_gain.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*----------------------------------------------------------------------------------*
 *  get_gain()
@@ -35,3 +38,5 @@ float get_gain(     /* output: codebook gain (adaptive or fixed)    */
 
     return(corr/ener);
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/gs_bitallocation.cpp b/src/libs/libevs/lib_com/gs_bitallocation.cpp
index a605083a..6b0893d3 100644
--- a/src/libs/libevs/lib_com/gs_bitallocation.cpp
+++ b/src/libs/libevs/lib_com/gs_bitallocation.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local functions
@@ -449,3 +452,5 @@ static float Find_bit_frac(
 
     return (var_out);
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/gs_gains.cpp b/src/libs/libevs/lib_com/gs_gains.cpp
index 0b29acba..2ea27f9c 100644
--- a/src/libs/libevs/lib_com/gs_gains.cpp
+++ b/src/libs/libevs/lib_com/gs_gains.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local functions
@@ -569,3 +572,5 @@ static short VDQ_vec(
 
     return index;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/gs_inact_switching.cpp b/src/libs/libevs/lib_com/gs_inact_switching.cpp
index 6aae8b21..75587b10 100644
--- a/src/libs/libevs/lib_com/gs_inact_switching.cpp
+++ b/src/libs/libevs/lib_com/gs_inact_switching.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -105,3 +108,5 @@ void inact_switch_ematch(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/gs_noisefill.cpp b/src/libs/libevs/lib_com/gs_noisefill.cpp
index fd91976d..99ad9b89 100644
--- a/src/libs/libevs/lib_com/gs_noisefill.cpp
+++ b/src/libs/libevs/lib_com/gs_noisefill.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * gs_noisf()
@@ -684,3 +687,5 @@ void highband_exc_dct_in(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/gs_preech.cpp b/src/libs/libevs/lib_com/gs_preech.cpp
index 73fb5962..e00a74ee 100644
--- a/src/libs/libevs/lib_com/gs_preech.cpp
+++ b/src/libs/libevs/lib_com/gs_preech.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local constants
@@ -92,3 +95,5 @@ void pre_echo_att(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/guided_plc_util.cpp b/src/libs/libevs/lib_com/guided_plc_util.cpp
index 8991692b..7c09756b 100644
--- a/src/libs/libevs/lib_com/guided_plc_util.cpp
+++ b/src/libs/libevs/lib_com/guided_plc_util.cpp
@@ -5,6 +5,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local function
@@ -299,3 +302,5 @@ static void reorder_lsfs(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/hp50.cpp b/src/libs/libevs/lib_com/hp50.cpp
index daa72a29..7f1479d8 100644
--- a/src/libs/libevs/lib_com/hp50.cpp
+++ b/src/libs/libevs/lib_com/hp50.cpp
@@ -7,6 +7,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 
@@ -103,3 +106,5 @@ void hp20(Float32 signal[], Word32 lg, Float32 mem[], Word32 fs)
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/hq2_bit_alloc.cpp b/src/libs/libevs/lib_com/hq2_bit_alloc.cpp
index 3d68ecfe..48d1aa47 100644
--- a/src/libs/libevs/lib_com/hq2_bit_alloc.cpp
+++ b/src/libs/libevs/lib_com/hq2_bit_alloc.cpp
@@ -10,6 +10,9 @@
 #include "basop_mpy.h"
 #include "stl.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------
  * Local constants
@@ -991,3 +994,5 @@ void hq2_bit_alloc (
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/hq2_core_com.cpp b/src/libs/libevs/lib_com/hq2_core_com.cpp
index eab7ee17..b2748ed5 100644
--- a/src/libs/libevs/lib_com/hq2_core_com.cpp
+++ b/src/libs/libevs/lib_com/hq2_core_com.cpp
@@ -11,6 +11,9 @@
 #include "basop_util.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * mdct_spectrum_denorm()
  *
@@ -548,3 +551,5 @@ void spt_swb_peakpos_tmp_save(
     }
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/hq2_noise_inject.cpp b/src/libs/libevs/lib_com/hq2_noise_inject.cpp
index 8ca37801..78bc3a48 100644
--- a/src/libs/libevs/lib_com/hq2_noise_inject.cpp
+++ b/src/libs/libevs/lib_com/hq2_noise_inject.cpp
@@ -6,6 +6,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * hq2_noise_inject()
  *
@@ -241,3 +244,5 @@ void hq2_noise_inject(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/hq_bit_allocation.cpp b/src/libs/libevs/lib_com/hq_bit_allocation.cpp
index c377f00c..78cdce9e 100644
--- a/src/libs/libevs/lib_com/hq_bit_allocation.cpp
+++ b/src/libs/libevs/lib_com/hq_bit_allocation.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * hq_bit_allocation()
@@ -187,3 +190,5 @@ void hq_bit_allocation(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/hq_conf.cpp b/src/libs/libevs/lib_com/hq_conf.cpp
index 2f076bcb..a775f9bf 100644
--- a/src/libs/libevs/lib_com/hq_conf.cpp
+++ b/src/libs/libevs/lib_com/hq_conf.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * hq_configure()
@@ -204,3 +207,5 @@ void hq_configure(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/hq_tools.cpp b/src/libs/libevs/lib_com/hq_tools.cpp
index 9e8cf301..ec712f37 100644
--- a/src/libs/libevs/lib_com/hq_tools.cpp
+++ b/src/libs/libevs/lib_com/hq_tools.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * Local functions
  *--------------------------------------------------------------------------*/
@@ -1729,3 +1732,5 @@ void floating_point_add(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/hvq_pvq_bitalloc.cpp b/src/libs/libevs/lib_com/hvq_pvq_bitalloc.cpp
index a0086656..b72595a3 100644
--- a/src/libs/libevs/lib_com/hvq_pvq_bitalloc.cpp
+++ b/src/libs/libevs/lib_com/hvq_pvq_bitalloc.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*/
 /*  Function  hvq_pvq_bitalloc                                              */
 /*  ~~~~~~~~~~~~~~~~~~~~~~~~                                                */
@@ -155,3 +158,5 @@ short hvq_pvq_bitalloc(
     return num_bands;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/ifft_rel.cpp b/src/libs/libevs/lib_com/ifft_rel.cpp
index 6b840d0b..dc2cabae 100644
--- a/src/libs/libevs/lib_com/ifft_rel.cpp
+++ b/src/libs/libevs/lib_com/ifft_rel.cpp
@@ -6,6 +6,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * Local constants
@@ -253,3 +256,5 @@ void ifft_rel(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/igf_base.cpp b/src/libs/libevs/lib_com/igf_base.cpp
index d8ce1806..3c9be04b 100644
--- a/src/libs/libevs/lib_com/igf_base.cpp
+++ b/src/libs/libevs/lib_com/igf_base.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * IGF_ApplyTransFac()
  *
@@ -638,3 +641,5 @@ int IGFCommonFuncsIGFGetCFTables(            /**< out:    | error value: 0 -> er
 
     return retValue;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/index_pvq_opt.cpp b/src/libs/libevs/lib_com/index_pvq_opt.cpp
index 95fbf046..9dfd16a8 100644
--- a/src/libs/libevs/lib_com/index_pvq_opt.cpp
+++ b/src/libs/libevs/lib_com/index_pvq_opt.cpp
@@ -10,6 +10,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  *  LOCAL DEFINITIONS
@@ -1157,3 +1160,5 @@ void mpvq_decode_vec(               /* o :  void                        */
 
 
 #endif
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/int_lsp.cpp b/src/libs/libevs/lib_com/int_lsp.cpp
index 2de94211..8f8f0860 100644
--- a/src/libs/libevs/lib_com/int_lsp.cpp
+++ b/src/libs/libevs/lib_com/int_lsp.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * int_lsp()
  *
@@ -137,3 +140,5 @@ void int_lsp4(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/interleave_spectrum.cpp b/src/libs/libevs/lib_com/interleave_spectrum.cpp
index 70b8cb3e..755f18e8 100644
--- a/src/libs/libevs/lib_com/interleave_spectrum.cpp
+++ b/src/libs/libevs/lib_com/interleave_spectrum.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * interleave_spectrum()
  *
@@ -160,3 +163,5 @@ void de_interleave_spectrum(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/interpol.cpp b/src/libs/libevs/lib_com/interpol.cpp
index 04a5d8a3..3417d119 100644
--- a/src/libs/libevs/lib_com/interpol.cpp
+++ b/src/libs/libevs/lib_com/interpol.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * interpolation()
@@ -39,3 +42,5 @@ float interpolation(      /* o  : interpolated value   */
 
     return s;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/isf_dec_amr_wb.cpp b/src/libs/libevs/lib_com/isf_dec_amr_wb.cpp
index 3320d255..d81ba430 100644
--- a/src/libs/libevs/lib_com/isf_dec_amr_wb.cpp
+++ b/src/libs/libevs/lib_com/isf_dec_amr_wb.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
 * isf_dec_amr_wb()
 *
@@ -251,3 +254,5 @@ void disf_2s_36b(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/lag_wind.cpp b/src/libs/libevs/lib_com/lag_wind.cpp
index 50d070b5..5800ec1e 100644
--- a/src/libs/libevs/lib_com/lag_wind.cpp
+++ b/src/libs/libevs/lib_com/lag_wind.cpp
@@ -8,6 +8,9 @@
 #include "cnst.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -128,3 +131,5 @@ void adapt_lag_wind(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/lerp.cpp b/src/libs/libevs/lib_com/lerp.cpp
index 17a0bd95..041741ca 100644
--- a/src/libs/libevs/lib_com/lerp.cpp
+++ b/src/libs/libevs/lib_com/lerp.cpp
@@ -6,6 +6,9 @@
 #include <stdlib.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------*
  * procedure lerp()                                            *
@@ -140,3 +143,5 @@ void lerp_proc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/limit_t0.cpp b/src/libs/libevs/lib_com/limit_t0.cpp
index 876723bb..bfbe86a3 100644
--- a/src/libs/libevs/lib_com/limit_t0.cpp
+++ b/src/libs/libevs/lib_com/limit_t0.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------*
  * Local constants
  *-------------------------------------------------*/
@@ -198,3 +201,5 @@ void limit_T0_voiced(
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/logqnorm.cpp b/src/libs/libevs/lib_com/logqnorm.cpp
index 40c0c677..94d23c47 100644
--- a/src/libs/libevs/lib_com/logqnorm.cpp
+++ b/src/libs/libevs/lib_com/logqnorm.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"        /* Function prototypes                      */
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------
  * logqnorm()
  *
@@ -161,3 +164,5 @@ void calc_norm(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/longarith.cpp b/src/libs/libevs/lib_com/longarith.cpp
index 96a45166..84240d0b 100644
--- a/src/libs/libevs/lib_com/longarith.cpp
+++ b/src/libs/libevs/lib_com/longarith.cpp
@@ -6,6 +6,9 @@
 #include <assert.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 
@@ -160,3 +163,5 @@ void longshiftleft(unsigned short a[], int b, unsigned short d[], int len)
     }
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/low_rate_band_att.cpp b/src/libs/libevs/lib_com/low_rate_band_att.cpp
index 3ac6ef87..6e85cd65 100644
--- a/src/libs/libevs/lib_com/low_rate_band_att.cpp
+++ b/src/libs/libevs/lib_com/low_rate_band_att.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * fine_gain_pred()
@@ -161,3 +164,5 @@ void fine_gain_dec
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/lpc_tools.cpp b/src/libs/libevs/lib_com/lpc_tools.cpp
index cf59f077..9c7f66a6 100644
--- a/src/libs/libevs/lib_com/lpc_tools.cpp
+++ b/src/libs/libevs/lib_com/lpc_tools.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * Local constants
@@ -298,3 +301,5 @@ int E_LPC_lsp_unweight(
     return 0;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/lsf_dec_bfi.cpp b/src/libs/libevs/lib_com/lsf_dec_bfi.cpp
index 3313936e..8d3139c0 100644
--- a/src/libs/libevs/lib_com/lsf_dec_bfi.cpp
+++ b/src/libs/libevs/lib_com/lsf_dec_bfi.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
 * routine:   lsf_dec_bfi()
 *
@@ -265,3 +268,5 @@ float const * PlcGetlsfBase(
     /* narrowBand == 1 is left */
     return GENB_Ave;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/lsf_msvq_ma.cpp b/src/libs/libevs/lib_com/lsf_msvq_ma.cpp
index 9239642d..5e9366f2 100644
--- a/src/libs/libevs/lib_com/lsf_msvq_ma.cpp
+++ b/src/libs/libevs/lib_com/lsf_msvq_ma.cpp
@@ -12,6 +12,9 @@
 #include "stl.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * midlsf_dec()
  *
@@ -145,3 +148,5 @@ int lsf_ind_is_active(
 
     return sub(min_distance, min_distance_thr[narrowband][cdk]) < 0;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/lsf_tools.cpp b/src/libs/libevs/lib_com/lsf_tools.cpp
index 8b887c2d..ec7ebb9d 100644
--- a/src/libs/libevs/lib_com/lsf_tools.cpp
+++ b/src/libs/libevs/lib_com/lsf_tools.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local functions
  *-------------------------------------------------------------------*/
@@ -2312,3 +2315,5 @@ void a2isf(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/lsp_conv_poly.cpp b/src/libs/libevs/lib_com/lsp_conv_poly.cpp
index 9015f72c..910a8dcd 100644
--- a/src/libs/libevs/lib_com/lsp_conv_poly.cpp
+++ b/src/libs/libevs/lib_com/lsp_conv_poly.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local constants
@@ -627,3 +630,5 @@ static void cheb2poly(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/mime.h b/src/libs/libevs/lib_com/mime.h
index 286ea6fe..4a843438 100644
--- a/src/libs/libevs/lib_com/mime.h
+++ b/src/libs/libevs/lib_com/mime.h
@@ -2,6 +2,7 @@
     EVS Codec 3GPP TS26.443 Nov 13, 2018. Version 12.11.0 / 13.7.0 / 14.3.0 / 15.1.0
   ====================================================================================*/
 
+namespace evs {
 
 #define AMRWB_MAGIC_NUMBER "#!AMR-WB\n"             /* defined in  RFC4867  */
 #define EVS_MAGIC_NUMBER   "#!EVS_MC1.0\n"          /* defined in 26.445    */
@@ -421,3 +422,5 @@ static const Word16 amrwb_4bit_cmr[8] =
     0x05,  /* AMRWB_1825 */
     0x0f   /* invalid */
 };
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/modif_fs.cpp b/src/libs/libevs/lib_com/modif_fs.cpp
index 5a1d9eeb..81fc4611 100644
--- a/src/libs/libevs/lib_com/modif_fs.cpp
+++ b/src/libs/libevs/lib_com/modif_fs.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * modify_Fs()
@@ -855,3 +858,5 @@ void retro_interp5_4( float *pst_old_syn )
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/move.h b/src/libs/libevs/lib_com/move.h
index dd7e8af0..6490a2d6 100644
--- a/src/libs/libevs/lib_com/move.h
+++ b/src/libs/libevs/lib_com/move.h
@@ -9,6 +9,9 @@
 
 #include "stl.h"
 
+namespace evs {
+
+
 static __inline void move16( void)
 {
 }
@@ -39,4 +42,6 @@ static __inline void logic32( void)
 
 #define cast16 move16
 
+}
+
 #endif /* _MOVE_H */
diff --git a/src/libs/libevs/lib_com/mslvq_com.cpp b/src/libs/libevs/lib_com/mslvq_com.cpp
index ac7497af..4f61a918 100644
--- a/src/libs/libevs/lib_com/mslvq_com.cpp
+++ b/src/libs/libevs/lib_com/mslvq_com.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local functions
  *-----------------------------------------------------------------*/
@@ -731,3 +734,5 @@ static void divide_64_32(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/nelp.cpp b/src/libs/libevs/lib_com/nelp.cpp
index 30f5e9f7..ba35ce0a 100644
--- a/src/libs/libevs/lib_com/nelp.cpp
+++ b/src/libs/libevs/lib_com/nelp.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * dequantize_uvg()
  *
@@ -118,3 +121,5 @@ void generate_nelp_excitation(
     }
 
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/parameter_bitmaping.cpp b/src/libs/libevs/lib_com/parameter_bitmaping.cpp
index 2197e4d2..6e9afe20 100644
--- a/src/libs/libevs/lib_com/parameter_bitmaping.cpp
+++ b/src/libs/libevs/lib_com/parameter_bitmaping.cpp
@@ -6,6 +6,9 @@
 #include "prot.h"
 #include <assert.h>
 
+namespace evs { 
+
+
 
 
 
@@ -169,3 +172,5 @@ void ReadFromBitstream(ParamsBitMap const * paramsBitMap, int nArrayLength, Deco
     }
     *pnSize += nParams*nArrayLength;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/phase_dispersion.cpp b/src/libs/libevs/lib_com/phase_dispersion.cpp
index 48a9e11d..36b1c61a 100644
--- a/src/libs/libevs/lib_com/phase_dispersion.cpp
+++ b/src/libs/libevs/lib_com/phase_dispersion.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------------*
  * phase_dispersion()
@@ -121,3 +124,5 @@ void phase_dispersion(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/ppp.cpp b/src/libs/libevs/lib_com/ppp.cpp
index 31cef8c4..f65ae6ec 100644
--- a/src/libs/libevs/lib_com/ppp.cpp
+++ b/src/libs/libevs/lib_com/ppp.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Interpol_delay()
@@ -81,3 +84,5 @@ void deemph_lpc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/pred_lt4.cpp b/src/libs/libevs/lib_com/pred_lt4.cpp
index 1a54b03f..db9edc14 100644
--- a/src/libs/libevs/lib_com/pred_lt4.cpp
+++ b/src/libs/libevs/lib_com/pred_lt4.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * pred_lt4()
@@ -123,3 +126,5 @@ void pred_lt4_tc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/preemph.cpp b/src/libs/libevs/lib_com/preemph.cpp
index be8ab9cc..6081e21c 100644
--- a/src/libs/libevs/lib_com/preemph.cpp
+++ b/src/libs/libevs/lib_com/preemph.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------*
  * preemph()
@@ -33,3 +36,5 @@ void preemph(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/prot.h b/src/libs/libevs/lib_com/prot.h
index 4cd26dcd..1cf2dd50 100644
--- a/src/libs/libevs/lib_com/prot.h
+++ b/src/libs/libevs/lib_com/prot.h
@@ -15,6 +15,7 @@
 #include "cnst.h"
 #include "stl.h"
 
+namespace evs {
 
 /*----------------------------------------------------------------------------------*
  * Prototypes of global macros
@@ -9772,5 +9773,6 @@ void blend_subfr2(
 );
 
 
+} // end of namespace
 
 #endif
diff --git a/src/libs/libevs/lib_com/pvq_com.cpp b/src/libs/libevs/lib_com/pvq_com.cpp
index b4cb9621..d49beb38 100644
--- a/src/libs/libevs/lib_com/pvq_com.cpp
+++ b/src/libs/libevs/lib_com/pvq_com.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "stl.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local definitions
  *-------------------------------------------------------------------*/
@@ -886,3 +889,5 @@ Word16 atan2_fx(  /* o: Angle between 0 and EVS_PI/2 radian (Q14) */
     }
     return angle;  /* Q14 between 0 and EVS_PI/2 radian. */
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/range_com.cpp b/src/libs/libevs/lib_com/range_com.cpp
index 94cccd1d..a98ca567 100644
--- a/src/libs/libevs/lib_com/range_com.cpp
+++ b/src/libs/libevs/lib_com/range_com.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * rc_get_bits2()
  *
@@ -70,3 +73,5 @@ void rangeCoderFinalizationFBits(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/re8_ppv.cpp b/src/libs/libevs/lib_com/re8_ppv.cpp
index 1efb8738..2b21a19d 100644
--- a/src/libs/libevs/lib_com/re8_ppv.cpp
+++ b/src/libs/libevs/lib_com/re8_ppv.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local functions
  *-------------------------------------------------------------------*/
@@ -176,3 +179,5 @@ static void nearest_neighbor_2D8(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/re8_util.cpp b/src/libs/libevs/lib_com/re8_util.cpp
index b58d1be1..2924e02b 100644
--- a/src/libs/libevs/lib_com/re8_util.cpp
+++ b/src/libs/libevs/lib_com/re8_util.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local functions
@@ -398,3 +401,5 @@ void re8_k2y(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/realft.cpp b/src/libs/libevs/lib_com/realft.cpp
index 13956bd5..59286916 100644
--- a/src/libs/libevs/lib_com/realft.cpp
+++ b/src/libs/libevs/lib_com/realft.cpp
@@ -7,6 +7,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * four1()
  *
@@ -162,3 +165,5 @@ void realft(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/recovernorm.cpp b/src/libs/libevs/lib_com/recovernorm.cpp
index f4fcf3b2..49ac019b 100644
--- a/src/libs/libevs/lib_com/recovernorm.cpp
+++ b/src/libs/libevs/lib_com/recovernorm.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * recovernorm()
@@ -48,3 +51,5 @@ void recovernorm(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/reordvct.cpp b/src/libs/libevs/lib_com/reordvct.cpp
index 9d02eced..6faef7de 100644
--- a/src/libs/libevs/lib_com/reordvct.cpp
+++ b/src/libs/libevs/lib_com/reordvct.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * reordvct()
  *
@@ -42,3 +45,5 @@ void reordvct(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/residu.cpp b/src/libs/libevs/lib_com/residu.cpp
index 6f4a6184..39c48e21 100644
--- a/src/libs/libevs/lib_com/residu.cpp
+++ b/src/libs/libevs/lib_com/residu.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------*
  * residu()
  *
@@ -62,3 +65,5 @@ void calc_residu(
     }
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/rom_com.cpp b/src/libs/libevs/lib_com/rom_com.cpp
index 303ea428..2da33842 100644
--- a/src/libs/libevs/lib_com/rom_com.cpp
+++ b/src/libs/libevs/lib_com/rom_com.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "basop_util.h"
 
+namespace evs { 
+
+
 /*----------------------------------------------------------------------------------*
  * Table of bitrates
  *----------------------------------------------------------------------------------*/
@@ -7687,265 +7690,6 @@ const lsp_unw_triplet p16_gamma0_94to1[16] =
     { -0.33404f,  0.62528f,  0.00000f }
 };
 
-const float dico_lsf_abs_8b[256*M] =
-{
-    377.3749f,     688.0079f,    1147.3799f,    1461.0438f,    1786.7794f,    2143.6711f,    2522.1946f,    2889.7402f,    3263.6023f,    3628.4624f,    4005.4351f,    4379.4170f,    4783.9556f,    5157.1753f,    5555.1797f,    5926.6816f,
-    601.5123f,    1066.8242f,    1384.3585f,    1652.9448f,    1978.3910f,    2311.2676f,    2674.0537f,    3010.3896f,    3360.0623f,    3725.9336f,    4093.3335f,    4470.6431f,    4859.1006f,    5210.4717f,    5598.3716f,    5954.4204f,
-    552.5036f,     859.7047f,    1355.2023f,    1624.9041f,    1887.5609f,    2173.1638f,    2540.7429f,    2926.8169f,    3323.2173f,    3680.7197f,    4008.3447f,    4330.8442f,    4692.8228f,    5033.9697f,    5443.3467f,    5875.4497f,
-    459.4534f,     793.3189f,    1293.7278f,    1617.3970f,    1920.0642f,    2192.2153f,    2487.5627f,    2772.1514f,    3111.3823f,    3461.2671f,    3867.0176f,    4279.8550f,    4741.0664f,    5141.0181f,    5552.8237f,    5933.6934f,
-    327.9834f,     430.4954f,     723.9031f,    1528.6172f,    1763.1125f,    2013.7936f,    2334.2153f,    2569.0334f,    3017.9436f,    3308.0610f,    3591.7820f,    3865.5430f,    4693.5786f,    5286.7646f,    5647.7036f,    5987.2305f,
-    455.0753f,     606.0817f,     963.7564f,    1374.9937f,    1536.4897f,    1914.7618f,    2376.9631f,    2580.8184f,    2989.1501f,    3258.8386f,    3485.1460f,    3741.1270f,    4297.4912f,    5207.3779f,    5672.3818f,    5980.5322f,
-    434.9507f,     558.8508f,     890.7061f,    1355.7625f,    1552.6155f,    1895.7960f,    2222.5579f,    2502.6079f,    2841.8738f,    3137.5264f,    3367.7336f,    3860.7769f,    4795.2554f,    5090.9370f,    5421.8218f,    5874.4287f,
-    281.0164f,     404.5417f,     729.2898f,     997.1851f,    1699.8862f,    1961.3673f,    2255.7202f,    2540.9187f,    2804.4553f,    3057.1843f,    3750.2288f,    4340.9893f,    4716.8647f,    5002.7471f,    5477.2998f,    5965.7402f,
-    372.2410f,     505.3570f,     762.3755f,     997.3586f,    1174.4255f,    1986.1741f,    2368.1367f,    2624.1733f,    3194.6084f,    3403.2793f,    3877.7622f,    4425.7676f,    4824.7837f,    5158.1606f,    5532.7466f,    5893.5483f,
-    367.3766f,     501.1806f,     824.5358f,    1090.6857f,    1271.9792f,    1527.7137f,    2381.4382f,    2694.4634f,    2964.5359f,    3639.4832f,    3946.4038f,    4254.3916f,    4645.8076f,    5033.5396f,    5373.8735f,    5878.4385f,
-    229.4505f,     352.5671f,     701.0831f,    1226.4518f,    1678.3601f,    1895.7949f,    2140.0664f,    2526.5515f,    3080.3391f,    3297.8284f,    3845.3987f,    4427.9785f,    4704.4551f,    4997.4155f,    5434.0698f,    5918.4785f,
-    336.3082f,     516.7915f,     881.9847f,    1272.5824f,    1505.1870f,    1880.7520f,    2274.9458f,    2611.0083f,    3126.5256f,    3655.5332f,    4183.3877f,    4668.2993f,    5004.0029f,    5305.3491f,    5650.4985f,    5943.7383f,
-    296.0867f,     469.6519f,     956.5997f,    1224.1262f,    1443.0049f,    1727.6880f,    2216.1677f,    2689.3677f,    3060.4456f,    3520.9438f,    3916.6050f,    4343.7954f,    4763.8906f,    5156.0132f,    5553.8115f,    5936.9634f,
-    407.1503f,     577.5120f,     839.7361f,    1455.3907f,    1665.2137f,    1935.0054f,    2398.0537f,    2652.2605f,    3111.1831f,    3505.5962f,    3766.7554f,    4204.8730f,    4699.1631f,    4970.8652f,    5295.5962f,    5695.6919f,
-    281.0083f,     361.8386f,     950.9102f,    1464.1158f,    1634.7019f,    1965.4950f,    2211.1406f,    2662.1055f,    2846.0122f,    3585.8884f,    4048.7148f,    4358.9150f,    4683.8755f,    5046.0908f,    5400.0859f,    5956.1040f,
-    279.1811f,     393.9142f,     876.8306f,    1502.2417f,    1673.0590f,    2288.7161f,    2545.3674f,    3028.9507f,    3517.5840f,    3824.4246f,    4144.8486f,    4481.8140f,    4821.2769f,    5162.3975f,    5542.8560f,    5928.5854f,
-    379.7892f,     500.9199f,     725.0223f,     998.7143f,    1179.6127f,    1771.9886f,    2775.4812f,    3136.8457f,    3378.6143f,    3674.0188f,    3946.3604f,    4184.4824f,    4521.5454f,    4934.8940f,    5315.5029f,    5759.7544f,
-    317.4339f,     442.2628f,     778.7388f,    1167.8633f,    1356.1576f,    1578.5603f,    1840.1584f,    2870.7527f,    3236.1504f,    3502.7249f,    3876.3696f,    4100.5244f,    4650.2632f,    5235.1890f,    5665.2285f,    5999.0649f,
-    350.2696f,     492.2163f,     763.0640f,    1264.7550f,    1515.0244f,    1755.7783f,    2489.3274f,    2898.6252f,    3143.1018f,    3643.0640f,    4035.0657f,    4255.0889f,    4641.7231f,    5138.5107f,    5557.1318f,    5920.2402f,
-    301.3833f,     464.9852f,     762.3419f,    1012.2126f,    1803.5172f,    2192.4214f,    2651.6287f,    3013.6697f,    3251.3591f,    3539.4675f,    3946.3433f,    4469.3560f,    4890.7446f,    5200.4878f,    5509.6753f,    5910.2397f,
-    253.1752f,     356.8990f,     630.3325f,    1163.1683f,    1528.6230f,    2023.4438f,    2488.6001f,    2745.5627f,    2933.7024f,    3237.4414f,    3976.9258f,    4415.2534f,    4789.9131f,    5194.3423f,    5714.6445f,    6032.4160f,
-    265.1815f,     364.7549f,     590.0148f,     805.2595f,    1564.7582f,    2150.6536f,    2365.6501f,    2598.7876f,    2861.5334f,    3514.1265f,    4005.6328f,    4609.3091f,    4955.4478f,    5238.4116f,    5519.5884f,    5890.7925f,
-    209.3544f,     313.1497f,     503.2642f,     949.4504f,    1729.7280f,    1912.6814f,    2117.5051f,    2498.6272f,    3284.6587f,    3810.8555f,    4105.0195f,    4349.5151f,    4770.3682f,    5210.2910f,    5585.1533f,    5970.3638f,
-    302.3150f,     415.6502f,     684.1018f,     922.3598f,    1489.4418f,    2235.6252f,    2449.9773f,    2800.6938f,    3061.3721f,    3526.1001f,    3905.8174f,    4170.7891f,    4446.4209f,    4907.9937f,    5470.7158f,    5914.7261f,
-    264.9068f,     366.4342f,     582.8182f,     790.8568f,    1619.4548f,    2034.0782f,    2337.6724f,    2632.1714f,    2933.2356f,    3430.1858f,    3815.0198f,    4276.3931f,    4748.3149f,    5164.0098f,    5553.3320f,    5974.9092f,
-    249.6359f,     361.9234f,     581.9844f,     841.1097f,    1657.5543f,    2184.4114f,    2525.9739f,    2820.0503f,    3120.7190f,    3623.7678f,    4050.5435f,    4434.5742f,    4802.6782f,    5171.8438f,    5575.0068f,    5963.7402f,
-    290.1085f,     404.2538f,     664.1223f,     878.2748f,    1237.1085f,    2237.4707f,    2497.5647f,    2957.7786f,    3289.3928f,    3626.5276f,    4190.9243f,    4594.6450f,    4981.7456f,    5283.5513f,    5617.1538f,    5938.3760f,
-    182.7846f,     270.3831f,     490.2131f,    1070.2524f,    1674.5724f,    2092.4905f,    2524.1472f,    2929.3523f,    3334.8005f,    3712.0061f,    4101.2896f,    4475.7324f,    4866.1919f,    5231.7559f,    5606.4077f,    5960.9644f,
-    286.7701f,     386.1487f,     577.4210f,     764.3087f,    1151.2404f,    2014.4502f,    2399.8547f,    2879.0371f,    3160.2502f,    3450.6274f,    3869.8240f,    4368.3618f,    4816.7861f,    5187.6450f,    5564.7231f,    5962.0386f,
-    179.9538f,     266.0682f,     647.9122f,    1380.2810f,    1776.1240f,    2208.4592f,    2590.6843f,    2993.6758f,    3368.2034f,    3753.2156f,    4125.2124f,    4508.6050f,    4878.9932f,    5249.3291f,    5612.5049f,    5965.2134f,
-    309.2416f,     434.7111f,     724.6614f,     936.5360f,    1264.9886f,    2272.1338f,    2548.4519f,    2904.0798f,    3313.4990f,    3579.7854f,    3914.5811f,    4297.5938f,    4756.9072f,    5163.2017f,    5592.2822f,    5943.7222f,
-    256.9009f,     393.7155f,     769.3966f,    1200.9640f,    1774.4797f,    2307.9629f,    2794.6799f,    3165.9431f,    3507.7952f,    3840.5791f,    4142.8877f,    4453.5078f,    4790.6973f,    5142.6123f,    5530.5977f,    5923.2188f,
-    394.1425f,     602.0079f,     934.5173f,    1352.9718f,    1813.9639f,    2172.5435f,    2603.7295f,    2963.9590f,    3335.2344f,    3732.0515f,    4120.0151f,    4487.9668f,    4877.6294f,    5238.9336f,    5596.1479f,    5939.6489f,
-    373.0307f,     665.4328f,    1227.4684f,    1524.6017f,    1947.3784f,    2361.6384f,    2778.1921f,    3134.5396f,    3462.3992f,    3752.4592f,    4069.0352f,    4404.2720f,    4782.2241f,    5145.0581f,    5541.9980f,    5932.9136f,
-    449.9942f,     814.1862f,    1344.2784f,    1682.7061f,    2086.3599f,    2486.9709f,    2916.1177f,    3265.9099f,    3616.3977f,    3919.6345f,    4218.5342f,    4519.2207f,    4857.5220f,    5193.5269f,    5573.7339f,    5934.5400f,
-    531.4455f,     965.7403f,    1458.5353f,    1773.3784f,    2236.0146f,    2650.9109f,    3099.2871f,    3467.1567f,    3809.7056f,    4094.6472f,    4378.5811f,    4660.2471f,    4962.5078f,    5270.9863f,    5629.4160f,    5973.6450f,
-    565.5986f,    1091.1300f,    1561.4944f,    1983.5482f,    2492.8821f,    2897.5085f,    3233.5361f,    3539.8831f,    3838.6494f,    4093.4460f,    4372.1924f,    4678.2251f,    4999.2646f,    5325.0371f,    5672.8887f,    5998.9990f,
-    581.0623f,     976.0275f,    1447.0302f,    1779.9243f,    2148.2158f,    2543.8347f,    2979.5061f,    3373.6099f,    3796.8259f,    4164.8242f,    4510.5493f,    4853.5527f,    5175.6318f,    5465.3647f,    5763.2334f,    6050.6582f,
-    429.4613f,     802.5781f,    1229.0529f,    1512.6678f,    1835.8625f,    2216.9915f,    2625.3999f,    2995.9927f,    3379.5146f,    3764.7837f,    4156.1382f,    4532.4570f,    4906.4678f,    5262.8960f,    5626.6519f,    5970.6504f,
-    224.5468f,     328.6938f,     615.8844f,    1207.4470f,    1520.9565f,    1865.9806f,    2182.4731f,    2431.4897f,    3239.3486f,    3490.9065f,    3775.7139f,    4291.4312f,    4740.0815f,    5192.0786f,    5532.9302f,    5928.7236f,
-    312.1133f,     424.3103f,     716.4448f,     921.9969f,    1244.5491f,    2017.9143f,    2248.4170f,    2840.0688f,    3138.9390f,    3399.7288f,    3723.3479f,    3999.6824f,    4582.2339f,    5148.5166f,    5631.8989f,    6000.7192f,
-    373.5378f,     506.7356f,     789.6149f,     942.6201f,    1695.8035f,    2021.6426f,    2323.3867f,    2649.5979f,    2853.1729f,    3169.5815f,    3524.9375f,    3848.6399f,    4261.7319f,    4978.9668f,    5505.4004f,    5924.7939f,
-    503.2296f,     724.8124f,     940.3833f,    1220.5646f,    1439.8641f,    1726.9827f,    2215.5464f,    2476.0925f,    2846.8127f,    3232.0950f,    3638.5989f,    3986.3333f,    4371.3052f,    5022.0664f,    5657.4897f,    6040.3452f,
-    398.3355f,     530.8898f,     835.5377f,    1058.3699f,    1327.2036f,    1814.9178f,    2114.2439f,    2515.8892f,    2754.9077f,    3094.8794f,    3598.7061f,    3981.2385f,    4605.9160f,    5110.8364f,    5550.1899f,    5953.9600f,
-    327.7583f,     454.8903f,     825.9029f,    1025.4349f,    1321.1567f,    1551.4836f,    1978.2037f,    2838.9021f,    3111.9041f,    3417.3940f,    3841.0564f,    4696.0547f,    5126.1641f,    5409.5347f,    5711.7163f,    5968.3394f,
-    327.1260f,     431.3983f,     721.9533f,     871.1266f,    1507.7616f,    1847.8716f,    2144.9641f,    2491.1108f,    2702.0847f,    3483.1516f,    3917.5173f,    4254.1260f,    4704.4863f,    4981.6284f,    5450.1035f,    5937.7861f,
-    443.5867f,     610.7686f,     818.9614f,     999.3525f,    1181.9182f,    1884.4948f,    2243.3950f,    2522.8867f,    2993.8594f,    3196.6631f,    3835.5020f,    4233.2568f,    4506.8604f,    4985.0249f,    5544.1382f,    5980.0083f,
-    395.7788f,     582.9504f,     822.1151f,    1013.0453f,    1224.6812f,    1988.4263f,    2452.4744f,    2686.4263f,    2952.8831f,    3135.0867f,    3562.5471f,    4006.6929f,    4401.7471f,    5038.5654f,    5567.4189f,    5986.0850f,
-    264.3071f,     372.0398f,     616.4940f,     842.1705f,    1350.0250f,    1822.1957f,    2165.8896f,    2662.2937f,    3055.4390f,    3502.6787f,    3923.4236f,    4352.6587f,    4772.5068f,    5158.1309f,    5573.9385f,    5972.6895f,
-    218.7390f,     325.2024f,     635.0441f,    1103.4701f,    1636.4287f,    2070.2615f,    2274.2910f,    2453.2002f,    3069.4382f,    3615.7065f,    3980.0811f,    4484.8662f,    4848.6416f,    5093.7163f,    5522.6973f,    5907.4048f,
-    260.0797f,     461.2137f,    1049.2261f,    1334.1865f,    1628.6233f,    2014.9823f,    2413.4802f,    2844.4973f,    3232.3040f,    3661.0122f,    4069.8274f,    4466.5210f,    4857.6553f,    5234.4463f,    5608.4517f,    5954.7920f,
-    301.7969f,     406.3861f,     706.7324f,    1387.1207f,    1581.4719f,    2004.7585f,    2291.9421f,    2548.9978f,    3076.8755f,    3343.1306f,    3623.1770f,    4279.7432f,    4777.6563f,    5084.3960f,    5473.4536f,    5872.0615f,
-    344.0269f,     472.3550f,     776.6819f,    1455.1270f,    1611.6870f,    2012.4386f,    2417.4033f,    2621.8564f,    3318.9663f,    3709.0132f,    3944.1958f,    4299.0293f,    4776.4038f,    5184.1089f,    5545.5454f,    5913.9531f,
-    332.1463f,     433.0623f,     992.1605f,    1254.8217f,    1498.4819f,    1824.6357f,    2118.3374f,    2444.6484f,    2684.8369f,    2930.4683f,    3557.4851f,    4292.9014f,    4786.7251f,    5138.2168f,    5616.2739f,    5996.8369f,
-    281.7202f,     372.7708f,    1074.7051f,    1443.0428f,    1687.6460f,    1980.7075f,    2275.4241f,    2632.2017f,    2848.1765f,    3118.7881f,    3628.5857f,    4522.9585f,    4876.2163f,    5177.2739f,    5600.6675f,    5960.9634f,
-    412.0151f,     535.6881f,     768.8618f,    1462.2601f,    1789.1055f,    1947.8196f,    2224.6890f,    2447.9089f,    2834.6140f,    3472.6721f,    3729.8525f,    4008.2893f,    4525.7271f,    4822.9194f,    5204.6611f,    5895.0942f,
-    263.8760f,     379.7789f,     825.0498f,    1113.1218f,    1465.8749f,    1846.7463f,    2146.0496f,    2487.2766f,    2845.8447f,    3388.4800f,    3883.8447f,    4440.7603f,    4867.0815f,    5214.7280f,    5535.8149f,    5906.9932f,
-    409.8116f,     583.7237f,     859.1983f,    1172.0491f,    1377.6473f,    1984.8322f,    2361.7292f,    2688.9368f,    3238.6563f,    3542.6716f,    3944.3005f,    4441.0840f,    4881.1211f,    5224.6045f,    5604.3711f,    5909.3657f,
-    318.0743f,     438.8244f,     852.9153f,    1061.4503f,    1290.7609f,    1552.5408f,    2053.1118f,    2373.2883f,    2926.1560f,    3452.9551f,    4098.6626f,    4585.2773f,    4967.0898f,    5271.2720f,    5644.6709f,    5961.9585f,
-    370.3631f,     496.5860f,     932.6390f,    1213.4189f,    1452.6641f,    1803.1532f,    2092.2354f,    2607.5247f,    2883.8086f,    3112.1086f,    3687.5657f,    4525.1274f,    4846.9404f,    5130.0537f,    5416.4141f,    5804.5122f,
-    247.8941f,     343.9862f,     751.6780f,    1526.2566f,    1712.5012f,    2038.0667f,    2324.0371f,    2727.9749f,    3005.8975f,    3378.9817f,    3858.2002f,    4339.2017f,    4716.4580f,    5125.0918f,    5564.3589f,    5969.7163f,
-    297.6552f,     401.7544f,     891.9346f,    1380.2275f,    1540.3125f,    1782.6058f,    2009.2045f,    2614.2092f,    2899.5396f,    3379.9722f,    3804.1169f,    4284.8540f,    4696.3335f,    5118.4551f,    5525.9839f,    5934.2686f,
-    226.1444f,     333.4511f,     682.9995f,    1307.4166f,    1554.1943f,    1849.3679f,    2116.3438f,    2756.3567f,    3204.3018f,    3540.4106f,    4002.1895f,    4402.7734f,    4796.4395f,    5192.6812f,    5600.6841f,    5960.1855f,
-    196.3791f,     299.9716f,     572.3173f,    1201.8826f,    1804.7235f,    2012.0171f,    2264.7415f,    2790.3406f,    3272.6926f,    3668.4863f,    4063.0435f,    4442.4419f,    4810.5957f,    5156.0923f,    5512.8501f,    5900.7441f,
-    280.1911f,     391.5190f,     705.9903f,    1435.5063f,    1588.2345f,    2116.5032f,    2357.1875f,    2670.7461f,    3299.0071f,    3507.9336f,    4044.3057f,    4591.9023f,    4981.4575f,    5281.1270f,    5654.7158f,    5949.9263f,
-    262.5740f,     370.5089f,     654.7243f,    1278.9299f,    1847.3096f,    2087.3394f,    2553.8892f,    2887.8269f,    3254.0747f,    3810.6626f,    4258.4390f,    4528.8022f,    4872.9741f,    5206.0483f,    5565.2876f,    5918.5596f,
-    193.6133f,     356.3127f,    1076.8109f,    1485.8608f,    1887.7994f,    2273.1333f,    2676.7832f,    3052.3513f,    3419.1294f,    3792.5024f,    4161.7036f,    4532.6431f,    4898.5176f,    5262.0498f,    5622.8901f,    5976.4863f,
-    302.7377f,     409.7598f,     899.1851f,    1176.6501f,    1531.3615f,    1933.6494f,    2229.9561f,    2819.8936f,    3031.6248f,    3807.0129f,    4118.7495f,    4412.7339f,    4704.6758f,    5012.0190f,    5351.4160f,    5892.3232f,
-    421.1889f,     587.3521f,     835.9208f,    1248.0127f,    1475.8882f,    1779.3772f,    2330.6294f,    2606.6780f,    3026.0417f,    3513.8035f,    3754.6023f,    4081.0518f,    4536.3438f,    4815.9336f,    5117.6392f,    5802.9902f,
-    378.0719f,     722.0884f,    1327.5808f,    1665.8940f,    1954.7782f,    2238.9473f,    2608.8538f,    2958.7910f,    3341.5112f,    3721.2021f,    4095.8457f,    4457.6865f,    4843.8672f,    5212.5142f,    5589.5122f,    5945.3730f,
-    468.4631f,     962.3222f,    1541.0238f,    1919.1746f,    2347.4365f,    2650.7366f,    2927.5945f,    3166.4202f,    3451.0664f,    3757.8477f,    4109.2383f,    4467.9443f,    4858.6045f,    5211.8428f,    5593.3311f,    5951.0137f,
-    422.2508f,     845.8956f,    1495.2552f,    1811.3933f,    2128.1157f,    2371.2532f,    2656.0715f,    2942.9011f,    3294.5308f,    3652.0935f,    4031.2534f,    4399.2222f,    4801.9497f,    5163.3721f,    5559.4517f,    5934.4063f,
-    423.1028f,     661.7286f,     991.1974f,    1204.3813f,    1472.8564f,    2003.0298f,    2443.5833f,    2789.2795f,    3354.1692f,    3722.7822f,    4032.7351f,    4320.9727f,    4621.8140f,    4963.7310f,    5429.8203f,    5900.1465f,
-    361.2513f,     485.9720f,     828.4865f,    1340.9952f,    1497.8477f,    2072.8511f,    2437.9839f,    2674.9912f,    3259.3357f,    3539.0474f,    3789.1389f,    4087.5015f,    4404.8867f,    4771.0947f,    5500.2227f,    6015.7041f,
-    301.8146f,     392.9569f,     685.1938f,    1783.6246f,    2034.8542f,    2257.1614f,    2519.8713f,    2782.6279f,    3152.1135f,    3400.8662f,    3614.3801f,    3906.7375f,    4233.1968f,    4712.3682f,    5596.0396f,    5998.5742f,
-    242.0591f,     371.0809f,     729.0743f,    1190.6813f,    1851.5691f,    2132.6724f,    2334.7773f,    2522.3608f,    3091.8643f,    3621.4614f,    3854.5227f,    4174.7017f,    4490.7510f,    4780.1230f,    5157.6147f,    5865.4756f,
-    431.2477f,     562.1808f,     888.5207f,    1034.2062f,    1443.2480f,    2109.8850f,    2337.1443f,    2829.1870f,    3070.1301f,    3252.6370f,    3510.3967f,    4366.2236f,    4843.2139f,    5133.0537f,    5549.8911f,    5850.3252f,
-    420.2594f,     668.9339f,     911.1281f,    1218.0372f,    1806.5541f,    2050.8423f,    2394.5708f,    2761.3542f,    3021.1716f,    3414.0020f,    3970.9626f,    4342.2900f,    4691.6074f,    5062.5386f,    5452.6655f,    5792.8384f,
-    257.3011f,     370.8905f,     604.8825f,    1096.4209f,    1711.8464f,    1934.4335f,    2319.4717f,    2769.0144f,    3019.0200f,    3354.3726f,    4119.8809f,    4354.8589f,    4557.7979f,    4893.5776f,    5450.3042f,    5910.4136f,
-    241.4264f,     347.9253f,     622.2432f,    1248.8121f,    1559.7318f,    1848.8098f,    2315.5635f,    2571.5894f,    2879.5754f,    3624.1069f,    3968.0334f,    4238.9727f,    4713.4746f,    5156.6792f,    5568.5596f,    5975.8716f,
-    478.7131f,     629.4184f,     918.1857f,    1342.7815f,    1535.1541f,    1803.0487f,    2483.7764f,    2724.4321f,    2998.1257f,    3634.9932f,    3915.9443f,    4119.2837f,    4327.0283f,    4980.3516f,    5532.6880f,    5964.3052f,
-    265.7818f,     373.8575f,     723.3755f,    1186.0619f,    1509.2827f,    2064.2075f,    2298.1992f,    2566.4395f,    2785.7659f,    3423.1396f,    3883.9011f,    4136.8940f,    4463.0386f,    5010.6592f,    5539.0337f,    5931.4414f,
-    221.4221f,     347.7610f,     707.4465f,    1187.0800f,    1575.9095f,    1824.3983f,    1979.3307f,    2299.3174f,    2967.6799f,    3472.3381f,    3955.8469f,    4292.6079f,    4794.8745f,    5127.5181f,    5652.6729f,    5953.0132f,
-    397.2769f,     510.2605f,     746.8268f,    1588.0735f,    1991.5200f,    2150.6843f,    2439.0486f,    2712.2754f,    2972.5825f,    3501.2673f,    3917.5459f,    4143.6069f,    4443.4414f,    4829.1929f,    5490.0376f,    6028.3794f,
-    280.5184f,     370.6464f,     640.7120f,    1721.3899f,    1948.9806f,    2149.9592f,    2400.4678f,    2674.0542f,    3146.3154f,    3419.8850f,    3813.9553f,    4417.4497f,    4818.3652f,    5139.6323f,    5465.0669f,    5879.7183f,
-    325.2418f,     431.2627f,    1008.7708f,    1271.9235f,    1527.4150f,    2066.6370f,    2242.3311f,    2883.4065f,    3180.6614f,    3352.5015f,    3756.9688f,    4386.6904f,    4857.6621f,    5189.2212f,    5514.7573f,    5856.8086f,
-    451.8427f,     582.4401f,     925.8821f,    1363.4249f,    1503.2460f,    1961.5940f,    2265.6001f,    2574.4414f,    3123.0769f,    3345.1587f,    3634.3022f,    4266.0137f,    4880.8052f,    5223.5776f,    5567.8901f,    5880.3770f,
-    411.0873f,     553.3847f,     809.2106f,    1023.4841f,    1189.0618f,    1786.0770f,    2121.8489f,    2454.6458f,    2947.4700f,    3220.3210f,    3828.0911f,    4218.0229f,    4831.2383f,    5322.1445f,    5727.3906f,    6033.3887f,
-    310.5608f,     442.2204f,     742.7755f,    1097.5740f,    1340.9608f,    1854.4385f,    2261.6399f,    2634.8315f,    3297.8879f,    3638.6956f,    3925.8770f,    4232.9146f,    4559.9287f,    4893.5830f,    5403.0981f,    5917.7056f,
-    377.5583f,     488.4103f,     945.2491f,    1234.1572f,    1416.0774f,    1666.5979f,    1932.9910f,    2746.2000f,    2997.4753f,    3216.6152f,    3559.3999f,    3843.8130f,    4359.6626f,    5014.2920f,    5560.6162f,    5992.7212f,
-    285.2173f,     389.6116f,     825.5790f,    1238.8229f,    1459.6588f,    1860.8855f,    2178.6296f,    2519.1597f,    2828.0032f,    3278.8101f,    3560.8286f,    4142.0552f,    4691.0698f,    5117.7778f,    5558.7944f,    5954.6680f,
-    465.7002f,     631.7491f,     914.5521f,    1340.0057f,    1562.5760f,    1844.1741f,    2186.1208f,    2483.7080f,    2901.9417f,    3190.3162f,    3474.7651f,    3873.4065f,    4240.1973f,    4761.1255f,    5428.2832f,    5958.5273f,
-    340.5456f,     449.2341f,     793.7005f,    1387.7467f,    1555.8701f,    1938.7877f,    2201.6155f,    2579.5762f,    2914.9724f,    3149.8584f,    3699.3984f,    3985.6790f,    4331.7534f,    4999.4805f,    5514.6924f,    5969.4897f,
-    395.8350f,     564.1188f,     774.8214f,    1276.3201f,    1721.8716f,    1864.0143f,    2267.5696f,    2790.2031f,    3003.9434f,    3377.6140f,    3917.7395f,    4167.3867f,    4465.2529f,    4936.1138f,    5464.0479f,    5905.0444f,
-    324.1844f,     443.0006f,     728.8958f,    1398.6589f,    1584.1820f,    1923.8724f,    2348.0903f,    2561.5554f,    3154.5991f,    3449.1746f,    3771.7927f,    4182.1899f,    4937.0791f,    5361.6509f,    5727.7656f,    6002.7505f,
-    267.1790f,     373.7663f,     703.5949f,    1173.7009f,    1390.2002f,    1905.7941f,    2177.4961f,    2703.2627f,    3022.9121f,    3308.9612f,    3798.5823f,    4187.1533f,    4703.2163f,    5136.0918f,    5571.1655f,    5966.6577f,
-    272.9294f,     399.3804f,     797.7335f,    1180.1516f,    1426.4850f,    2097.2839f,    2355.4727f,    2793.8774f,    3137.1907f,    3458.7727f,    3893.6628f,    4245.8047f,    4652.3794f,    5106.5293f,    5568.1885f,    5948.3169f,
-    324.5529f,     431.7663f,     759.6147f,    1494.8739f,    1668.8168f,    2110.5635f,    2427.4104f,    2672.9270f,    3170.5266f,    3448.2080f,    3717.1240f,    4034.2280f,    4375.3647f,    5041.1372f,    5666.9517f,    6014.7217f,
-    306.4759f,     404.5361f,     795.7795f,    1675.9967f,    1835.0950f,    2160.6624f,    2430.8855f,    2734.2646f,    3270.1426f,    3586.1355f,    3821.9670f,    4102.0078f,    4372.9404f,    4918.9146f,    5412.0376f,    5868.5225f,
-    421.3803f,     607.7995f,     813.0241f,    1286.8525f,    1827.2451f,    2026.8683f,    2333.9453f,    2730.9817f,    2988.4067f,    3303.8513f,    3759.1897f,    4057.5264f,    4441.5493f,    4890.0078f,    5212.0469f,    5672.2188f,
-    423.8560f,     599.5201f,     829.0651f,    1082.6381f,    1245.9272f,    1623.7075f,    2453.0420f,    2855.6631f,    3171.3855f,    3475.5881f,    3715.4219f,    3972.1326f,    4419.1597f,    4894.0283f,    5363.8691f,    5919.2681f,
-    441.2789f,     634.8879f,     921.6287f,    1189.0240f,    1368.7466f,    2012.1312f,    2383.7656f,    2638.5222f,    2975.0288f,    3163.6150f,    3433.9958f,    3838.9917f,    4186.6426f,    4856.8477f,    5559.1196f,    5977.2290f,
-    349.2039f,     466.2342f,     724.2582f,     904.4043f,    1190.4492f,    1981.7565f,    2226.5554f,    2592.5098f,    2865.5525f,    3195.8196f,    3735.6345f,    4267.1660f,    4810.9893f,    5207.5093f,    5605.1445f,    5952.0361f,
-    497.7713f,     719.9073f,     925.0815f,    1146.3021f,    1326.7095f,    1574.5039f,    2306.7678f,    2714.8022f,    2967.5190f,    3400.1121f,    3732.0544f,    3981.7878f,    4553.4819f,    5090.0869f,    5426.2085f,    5833.5220f,
-    471.7526f,     648.3213f,     902.1542f,    1245.7086f,    1423.3403f,    1701.1757f,    2125.8530f,    2407.0481f,    2969.5583f,    3294.1296f,    3712.8398f,    4140.7930f,    4808.4668f,    5322.3896f,    5662.1255f,    5950.6211f,
-    345.3843f,     485.9887f,     841.2579f,    1035.9401f,    1244.8905f,    1488.1833f,    2340.4253f,    2607.0859f,    2845.4153f,    3223.1768f,    3557.0696f,    4119.7944f,    4666.8896f,    5145.8589f,    5565.7534f,    5976.6875f,
-    332.4270f,     427.5984f,     829.9191f,    1138.0469f,    1339.4468f,    1589.0535f,    1926.0630f,    2432.9331f,    2699.7964f,    3311.4355f,    3716.1003f,    4270.4990f,    4760.3647f,    5208.3950f,    5619.2080f,    5971.2715f,
-    249.0114f,     381.2982f,     925.7067f,    1520.3356f,    1842.8396f,    2368.2908f,    2783.4033f,    3272.5757f,    3673.7402f,    4046.3950f,    4370.4966f,    4688.0269f,    5002.6772f,    5316.3594f,    5650.2192f,    5977.6587f,
-    263.3275f,     451.6255f,    1252.2307f,    1503.0652f,    1786.7695f,    2082.7554f,    2451.1829f,    2804.7590f,    3116.7583f,    3493.8892f,    3884.6575f,    4349.6724f,    4770.0156f,    5143.1636f,    5542.5913f,    5931.5522f,
-    252.9447f,     341.5762f,     632.7664f,    1766.8096f,    2084.1511f,    2272.7332f,    2531.1006f,    2765.2080f,    3134.5417f,    3380.6223f,    3640.8015f,    3932.7854f,    4532.1172f,    5245.2070f,    5597.0776f,    5973.6831f,
-    234.9979f,     324.6731f,    1239.8643f,    1663.1921f,    1858.7769f,    2171.1614f,    2403.8818f,    2680.6433f,    2836.4985f,    3192.6577f,    3864.8811f,    4385.8066f,    4845.9766f,    5150.2412f,    5631.1519f,    6011.7773f,
-    284.5302f,     410.1263f,     985.4119f,    1298.3987f,    1789.4304f,    1996.9287f,    2450.8525f,    2831.6011f,    2994.2073f,    3214.1306f,    3525.0498f,    3819.9141f,    4672.7544f,    5424.3545f,    5691.0732f,    5980.3096f,
-    244.2704f,     415.5891f,    1038.3009f,    1317.5186f,    1686.4528f,    2081.3147f,    2476.9873f,    2959.5393f,    3214.9561f,    3569.1431f,    3934.4736f,    4308.7114f,    4728.3687f,    5105.7964f,    5488.1938f,    5908.9443f,
-    335.8417f,     468.3464f,    1003.6253f,    1275.0145f,    1534.2854f,    1985.3167f,    2348.3411f,    2743.3169f,    2956.0967f,    3408.5063f,    3866.8574f,    4287.0034f,    4556.7222f,    4922.7832f,    5259.7480f,    5800.2876f,
-    388.2726f,     518.0591f,     832.5999f,    1325.0247f,    1528.8624f,    1808.1732f,    2151.0820f,    2486.1331f,    2815.4980f,    3158.5391f,    3635.3606f,    3960.5383f,    4671.7686f,    5371.8140f,    5777.8940f,    6056.4722f,
-    506.5153f,     673.0771f,     900.0349f,    1154.2124f,    1378.2689f,    1786.9409f,    2081.9631f,    2398.6965f,    2859.7441f,    3075.4841f,    3546.6563f,    4322.6694f,    4732.0049f,    4992.5542f,    5267.5859f,    5807.1812f,
-    487.2466f,     653.6116f,     968.5656f,    1389.2708f,    1601.5822f,    1910.9694f,    2282.4038f,    2608.7063f,    3032.6233f,    3361.9692f,    3629.8552f,    3908.8335f,    4318.4009f,    4646.5781f,    5043.5962f,    5792.7393f,
-    432.8733f,     591.7551f,     899.2619f,    1490.1176f,    1789.8751f,    2060.3750f,    2434.8779f,    2840.3374f,    3122.1292f,    3472.8079f,    3830.8870f,    4097.2622f,    4353.5464f,    4650.2075f,    4981.5752f,    5482.9565f,
-    378.4767f,     508.5656f,     802.8280f,     947.2892f,    1532.0898f,    2038.8177f,    2349.1965f,    2650.2039f,    2863.8018f,    3591.6697f,    3918.9211f,    4256.6255f,    4604.8467f,    4899.0996f,    5237.6084f,    5791.5029f,
-    407.0908f,     546.0364f,     866.1215f,    1098.6927f,    1347.2009f,    1657.1525f,    1965.5845f,    2717.7190f,    3033.4961f,    3509.9031f,    3873.4150f,    4131.4438f,    4389.5693f,    4774.2295f,    5450.1768f,    5977.5151f,
-    429.3459f,     568.8134f,     903.5659f,    1099.2942f,    1379.4979f,    2207.5940f,    2479.9919f,    2780.9072f,    3206.3960f,    3425.4084f,    3682.5911f,    3950.1941f,    4324.0840f,    4689.4922f,    5068.2534f,    5787.2852f,
-    371.9443f,     524.7249f,     890.0464f,    1670.7485f,    1958.5308f,    2182.7007f,    2558.5007f,    2835.4937f,    3192.0740f,    3634.4817f,    3950.0942f,    4259.6953f,    4628.0049f,    4999.1616f,    5364.9893f,    5801.6855f,
-    323.1922f,     451.0327f,     787.1655f,    1011.6555f,    1323.8138f,    2177.6636f,    2401.1392f,    2826.8796f,    3432.8999f,    3653.1851f,    3883.9897f,    4082.7559f,    4361.6753f,    4635.1475f,    5084.7544f,    5823.3062f,
-    377.0061f,     524.2181f,     743.6288f,    1378.9187f,    1857.6434f,    2056.4695f,    2453.7949f,    2902.1995f,    3127.2651f,    3463.3523f,    3980.1316f,    4241.2578f,    4528.5859f,    4881.4521f,    5239.3145f,    5580.5986f,
-    308.7965f,     403.7058f,     705.9506f,    1823.8571f,    2126.9387f,    2369.2810f,    2647.2048f,    2855.8276f,    3209.7708f,    3498.2310f,    3747.6047f,    3972.8647f,    4254.3325f,    4574.4292f,    5087.3965f,    5890.4219f,
-    274.7571f,     383.7251f,     573.6029f,    1142.8372f,    2151.7173f,    2558.8972f,    2751.9468f,    2987.4412f,    3234.3350f,    3526.0127f,    3922.9927f,    4189.0249f,    4483.3774f,    4877.1860f,    5396.7798f,    5921.8125f,
-    248.5916f,     423.6264f,    1260.9626f,    1696.0492f,    1972.9108f,    2298.5972f,    2592.9307f,    2947.2292f,    3266.2227f,    3614.3572f,    3980.3892f,    4359.4067f,    4770.2842f,    5158.9058f,    5554.6597f,    5936.9043f,
-    320.5471f,     429.6766f,     657.1440f,    1390.1080f,    2194.6426f,    2507.6086f,    2712.3662f,    2980.3408f,    3216.1682f,    3544.8467f,    3956.9790f,    4227.5308f,    4463.7563f,    4745.7124f,    5088.6650f,    5525.8516f,
-    245.5478f,     520.3131f,    1177.0693f,    1454.0125f,    1770.2620f,    2160.8779f,    2551.2700f,    2950.2324f,    3326.8621f,    3710.4624f,    4104.3936f,    4481.9971f,    4865.9736f,    5230.6396f,    5608.5649f,    5965.6162f,
-    514.5864f,     956.9897f,    1287.9597f,    1520.3473f,    1802.0631f,    2116.4980f,    2509.8552f,    2865.9822f,    3238.7510f,    3611.3108f,    4016.4353f,    4431.8457f,    4860.3442f,    5231.4814f,    5614.6016f,    5963.9976f,
-    537.0523f,     932.2803f,    1380.2690f,    1709.4702f,    2079.9902f,    2446.4014f,    2859.4204f,    3229.6975f,    3623.4031f,    4012.5327f,    4373.7568f,    4724.3359f,    5078.2686f,    5397.6040f,    5721.9639f,    6028.1167f,
-    452.5153f,     798.2777f,    1099.3080f,    1317.0807f,    1652.6885f,    2059.7708f,    2471.0164f,    2808.5396f,    3146.5076f,    3494.0779f,    3870.6912f,    4310.8281f,    4777.5024f,    5181.2617f,    5574.4912f,    5934.3813f,
-    340.3716f,     430.5102f,     872.3513f,    1636.3792f,    1772.8615f,    2074.0161f,    2295.1008f,    2693.0037f,    3177.7710f,    3391.7559f,    3670.8718f,    4224.3926f,    4896.3877f,    5199.9883f,    5580.4512f,    5911.7671f,
-    317.8269f,     414.8185f,     881.1970f,    1658.4944f,    1852.0098f,    2136.0415f,    2380.8228f,    2668.9141f,    3046.8027f,    3299.0051f,    3523.0593f,    3758.9412f,    4116.9063f,    5061.2124f,    5624.1777f,    5989.4761f,
-    374.0671f,     488.0840f,     734.0546f,    1415.9261f,    1648.7783f,    1852.8462f,    2099.1895f,    2347.5562f,    2954.8359f,    3269.6714f,    3536.7920f,    4116.1743f,    4481.4355f,    4913.8838f,    5467.2817f,    5909.8779f,
-    340.4291f,     448.5775f,    1041.4979f,    1426.0011f,    1637.8165f,    1968.6743f,    2210.7976f,    2647.5144f,    2913.8650f,    3131.7698f,    3429.8755f,    3722.6763f,    4104.6479f,    4969.0093f,    5574.2231f,    5978.2070f,
-    254.2538f,     412.7710f,     947.8206f,    1209.3683f,    1690.4813f,    2040.7881f,    2401.4314f,    2728.0066f,    3016.2290f,    3530.3865f,    3964.6563f,    4393.6934f,    4804.2168f,    5187.9302f,    5586.4399f,    5954.8950f,
-    241.0244f,     347.0750f,     835.2348f,    1601.9089f,    1786.4336f,    2134.3950f,    2396.0139f,    2848.9712f,    3239.9138f,    3623.8250f,    4029.5088f,    4400.3936f,    4797.3564f,    5195.7310f,    5596.6689f,    5965.9878f,
-    309.3683f,     453.6776f,     812.9343f,    1125.9915f,    1423.5935f,    2149.2227f,    2514.9277f,    3031.3599f,    3463.7219f,    3790.7839f,    4064.0039f,    4297.9839f,    4653.4551f,    5189.7061f,    5721.2954f,    6033.0752f,
-    469.4284f,     730.1902f,     973.0643f,    1170.5016f,    1572.2559f,    2084.2769f,    2567.8604f,    2963.4592f,    3286.9617f,    3580.3228f,    3882.8706f,    4335.5483f,    4859.7197f,    5258.2827f,    5627.9785f,    5957.8623f,
-    454.6165f,     795.2360f,    1078.7705f,    1294.9473f,    1761.6650f,    2235.2788f,    2695.8455f,    3095.7695f,    3473.4897f,    3833.0889f,    4185.7290f,    4528.9863f,    4893.0039f,    5240.7627f,    5608.8594f,    5951.0718f,
-    563.4587f,     875.8987f,    1139.0026f,    1378.2317f,    1855.7401f,    2279.7683f,    2651.3079f,    2968.4397f,    3279.4453f,    3607.2500f,    3975.5796f,    4358.3574f,    4768.7969f,    5135.3706f,    5525.3501f,    5904.2617f,
-    461.7852f,     855.0644f,    1367.4387f,    1702.5593f,    2141.0093f,    2500.9055f,    2853.8596f,    3123.9744f,    3406.0178f,    3694.0481f,    4028.9985f,    4373.1113f,    4768.2891f,    5137.6895f,    5541.3721f,    5921.4507f,
-    438.6031f,     753.0179f,    1269.3203f,    1630.4396f,    2027.2959f,    2350.9695f,    2672.1396f,    2957.1809f,    3250.1545f,    3546.5315f,    3894.0161f,    4249.9346f,    4666.2266f,    5061.2524f,    5490.7749f,    5904.6362f,
-    543.3182f,     828.4835f,    1239.1818f,    1471.1134f,    1737.8622f,    2037.2484f,    2434.5112f,    2801.3242f,    3162.3250f,    3508.1255f,    3849.0903f,    4165.7588f,    4588.3809f,    5020.0952f,    5475.2813f,    5904.6377f,
-    519.5982f,     837.6639f,    1171.2003f,    1363.0320f,    1617.4617f,    1976.1787f,    2472.0303f,    2901.3264f,    3340.7300f,    3736.0830f,    4103.3843f,    4444.8657f,    4800.9482f,    5145.6011f,    5544.2002f,    5933.0981f,
-    433.3774f,     582.7663f,     899.6142f,    1150.7437f,    1321.1309f,    1947.8643f,    2557.8604f,    2733.1497f,    3240.4907f,    3634.7915f,    3855.9856f,    4058.0281f,    4364.2568f,    5096.5225f,    5659.0952f,    6013.8145f,
-    424.9731f,     604.3164f,     868.1793f,    1207.7882f,    1414.2374f,    1713.2893f,    2520.2900f,    2960.8887f,    3210.8542f,    3584.5403f,    3914.5796f,    4149.8550f,    4505.7705f,    4886.9575f,    5214.5361f,    5597.8389f,
-    347.0334f,     494.2440f,     753.7191f,    1451.0435f,    1700.7461f,    1925.4844f,    2605.7988f,    2870.4744f,    3173.7312f,    3758.7219f,    4112.1929f,    4400.3882f,    4866.1016f,    5165.8799f,    5433.0371f,    5781.1509f,
-    318.4942f,     464.3939f,     783.5214f,    1491.0234f,    1708.4984f,    2280.2876f,    2533.3354f,    2885.1736f,    3443.7451f,    3669.8506f,    4000.6792f,    4269.6626f,    4571.2739f,    4827.2158f,    5277.3813f,    5850.4736f,
-    386.8698f,     519.0056f,     725.0029f,     981.5649f,    1156.1665f,    1500.4691f,    2421.7993f,    2962.4722f,    3175.0166f,    3548.4756f,    3860.7961f,    4146.4150f,    4658.9897f,    5088.3999f,    5531.8945f,    5951.4624f,
-    315.9294f,     738.5538f,    1171.9581f,    1553.7167f,    1949.9159f,    2319.6641f,    2707.5493f,    3069.2996f,    3444.6157f,    3811.2139f,    4177.5469f,    4545.6943f,    4905.0444f,    5271.3926f,    5622.6831f,    5974.4141f,
-    216.5136f,     598.1122f,    1059.3214f,    1466.4785f,    1880.1747f,    2263.6533f,    2658.3081f,    3030.4099f,    3413.6802f,    3780.1853f,    4157.1455f,    4519.1919f,    4893.5439f,    5244.3530f,    5603.1064f,    5926.8379f,
-    375.4021f,     487.0890f,     844.4013f,    1574.3596f,    1794.5249f,    2106.2878f,    2418.5217f,    2657.8938f,    3116.6096f,    3457.8625f,    3691.0596f,    3930.1062f,    4259.5928f,    4592.4370f,    5020.5078f,    5840.3989f,
-    474.3148f,     724.2144f,     974.0716f,    1283.4182f,    1521.2632f,    1746.4248f,    2333.0957f,    2874.2966f,    3111.9636f,    3440.0410f,    3752.9678f,    3975.7139f,    4294.7056f,    4821.9893f,    5201.5562f,    5658.8301f,
-    400.0291f,     564.9626f,     808.2393f,    1083.2745f,    1300.4403f,    2080.7405f,    2588.6882f,    2858.4629f,    3206.4502f,    3429.8623f,    3746.9080f,    4341.4868f,    4713.2803f,    4986.4258f,    5336.7339f,    5710.1123f,
-    354.4416f,     480.1495f,     834.1089f,    1037.7775f,    1350.0652f,    1791.1736f,    2193.0159f,    2504.6775f,    2776.0623f,    3153.0994f,    4108.1357f,    4597.4082f,    4861.9688f,    5092.8613f,    5473.2295f,    5932.0332f,
-    237.3935f,     346.9133f,     675.5335f,    1481.0535f,    1716.8414f,    1884.7153f,    2099.3057f,    2725.5403f,    3022.8506f,    3276.2922f,    3639.1001f,    4185.3926f,    4941.6597f,    5292.0093f,    5682.0391f,    5981.0215f,
-    367.4981f,     469.7130f,     820.7811f,    1219.7736f,    1368.4479f,    1624.6671f,    1804.2581f,    2607.8589f,    2891.3174f,    3212.2432f,    3760.7290f,    4015.6111f,    4618.0068f,    5129.3213f,    5652.1582f,    6042.1113f,
-    312.6796f,     415.8322f,     674.1500f,     853.7709f,    1808.7385f,    2232.5310f,    2497.8157f,    2834.2991f,    3039.7012f,    3301.4050f,    3659.2969f,    4455.9453f,    4841.4912f,    5111.6167f,    5502.2534f,    5924.6357f,
-    341.9309f,     471.7513f,     758.1926f,     979.7221f,    1287.4463f,    1737.0303f,    2160.7915f,    2664.5562f,    2961.8315f,    3461.7439f,    3732.6611f,    4109.0928f,    4568.9111f,    5037.4331f,    5511.3169f,    5966.1304f,
-    351.3721f,     462.1897f,     765.1075f,     946.3102f,    1322.8093f,    2292.2400f,    2503.6494f,    2819.7234f,    3079.2803f,    3297.6252f,    3571.4668f,    3872.0823f,    4337.6426f,    5079.1504f,    5562.8110f,    5942.7153f,
-    435.4323f,     614.4746f,     892.8980f,    1215.9469f,    1395.9762f,    1814.3936f,    2155.9590f,    2465.0427f,    3201.6211f,    3490.9224f,    3853.2620f,    4410.1855f,    4786.0625f,    5095.0181f,    5394.4805f,    5715.3364f,
-    294.6053f,     417.1553f,    1046.2922f,    1443.0247f,    1636.7180f,    1956.4248f,    2189.9697f,    2869.8071f,    3129.9385f,    3462.5681f,    3895.2805f,    4213.4541f,    4541.8950f,    5009.1958f,    5472.7642f,    5983.0063f,
-    322.1185f,     446.8733f,     689.4188f,    1338.2788f,    1643.1023f,    1903.8652f,    2494.2722f,    2804.6968f,    3103.8682f,    3640.1233f,    3965.9861f,    4172.5596f,    4404.7388f,    4670.7544f,    5240.3682f,    5893.4600f,
-    209.7024f,     336.5508f,     729.0126f,    1217.3285f,    1699.0111f,    1891.2837f,    2146.8486f,    2830.0850f,    3108.6204f,    3446.0396f,    3754.1230f,    3945.1038f,    4474.5806f,    5191.6987f,    5613.3076f,    5970.2695f,
-    346.6580f,     470.5094f,     663.3455f,    1266.9061f,    2020.5759f,    2270.5173f,    2527.3550f,    2826.9104f,    3078.3403f,    3401.2625f,    3804.3770f,    4100.3091f,    4407.7876f,    4732.2319f,    5150.2749f,    5808.2559f,
-    283.7796f,     391.4603f,    1165.6863f,    1456.1125f,    1692.9001f,    2008.4825f,    2322.7837f,    2784.0608f,    2998.5811f,    3268.5164f,    3548.9373f,    4167.1289f,    4643.9878f,    5099.2881f,    5473.0781f,    5929.8242f,
-    301.0849f,     383.1578f,     692.0848f,    1648.9374f,    1873.0947f,    2109.6113f,    2345.0110f,    2613.1121f,    2922.0193f,    3170.0020f,    3405.0774f,    3881.9875f,    4778.3154f,    5092.5205f,    5445.7100f,    5920.7896f,
-    509.1023f,     750.8580f,     963.8820f,    1295.3452f,    1634.8796f,    1818.7975f,    2151.1250f,    2590.3354f,    2867.5596f,    3238.7666f,    3747.2834f,    4053.8911f,    4457.8164f,    4928.0151f,    5295.3521f,    5789.0571f,
-    421.8951f,     547.9814f,     967.4185f,    1153.8607f,    1461.4230f,    1813.0994f,    2155.2703f,    2570.9712f,    2777.6597f,    3048.9863f,    3432.0986f,    3729.3877f,    4395.7461f,    5028.7402f,    5486.4946f,    5951.5024f,
-    340.6758f,     445.7014f,     931.8882f,    1253.4775f,    1521.9260f,    1969.5759f,    2267.5332f,    2735.0112f,    2948.7678f,    3236.5166f,    3529.5505f,    3882.3674f,    4699.5781f,    5089.6641f,    5377.7842f,    5880.7778f,
-    284.1882f,     408.6918f,     786.3123f,    1670.3220f,    2042.9493f,    2265.2275f,    2691.2012f,    3035.8762f,    3334.1719f,    3863.1194f,    4276.8916f,    4571.0420f,    4996.4404f,    5336.5205f,    5647.9556f,    5944.5996f,
-    300.0066f,     616.4817f,    1238.7324f,    1614.8296f,    1997.6188f,    2367.4343f,    2784.5605f,    3168.8354f,    3569.8250f,    3965.6011f,    4336.3804f,    4689.5874f,    5044.2012f,    5365.7456f,    5697.5654f,    6010.6572f,
-    242.9420f,     476.8371f,    1250.6661f,    1671.6031f,    2159.6443f,    2637.7417f,    3049.8589f,    3371.6045f,    3674.8706f,    3951.1006f,    4230.6416f,    4543.2827f,    4887.4478f,    5220.5581f,    5595.2686f,    5962.1313f,
-    242.6795f,     331.1335f,     635.2861f,    1801.5236f,    2084.1472f,    2264.4692f,    2506.2891f,    2799.4441f,    3236.7134f,    3489.6038f,    3859.3291f,    4424.8008f,    4964.6348f,    5298.6533f,    5640.2031f,    5988.0552f,
-    254.0538f,     336.2447f,    1216.6261f,    1717.7201f,    1886.0708f,    2176.6338f,    2405.8547f,    2762.3037f,    2934.8816f,    3167.0657f,    3385.5457f,    3804.4346f,    4848.8198f,    5286.0352f,    5630.5391f,    6086.4492f,
-    295.2298f,     426.2079f,     630.7856f,    1155.5609f,    1827.6831f,    2120.5283f,    2462.4373f,    2759.6152f,    2990.9526f,    3253.4216f,    3910.9834f,    4204.2754f,    4462.7944f,    4909.7529f,    5579.9653f,    5985.8579f,
-    298.9633f,     410.3875f,     810.1115f,    1346.1040f,    1499.2391f,    2210.3948f,    2467.9424f,    2792.7122f,    3284.0874f,    3493.0740f,    3784.1899f,    4319.6396f,    4860.6548f,    5213.8540f,    5609.8672f,    5949.6890f,
-    437.9900f,     575.3093f,     866.0077f,    1104.2080f,    1307.4966f,    1959.9323f,    2293.9365f,    2604.6704f,    2966.6514f,    3228.0056f,    3548.8499f,    4096.4424f,    4769.5420f,    5086.5449f,    5416.5317f,    5853.6909f,
-    412.4955f,     569.1867f,     864.0179f,    1117.6798f,    1348.6332f,    1976.5171f,    2334.3960f,    2640.3381f,    3006.5347f,    3327.5784f,    3695.8564f,    4042.1753f,    4362.7837f,    4687.4751f,    5389.8662f,    5966.5825f,
-    406.8686f,     542.0319f,     867.3541f,    1436.3810f,    1678.6399f,    2000.1501f,    2358.1204f,    2651.3806f,    3042.1216f,    3339.2766f,    3617.9963f,    3933.3860f,    4249.0278f,    4591.8530f,    5502.0400f,    6020.7910f,
-    375.4336f,     519.7731f,     764.5574f,    1215.1381f,    1482.9417f,    1696.8020f,    1957.0332f,    2169.1169f,    2973.4634f,    3687.7449f,    3966.8525f,    4258.8042f,    4680.6567f,    4947.0225f,    5230.9824f,    5843.2466f,
-    443.2378f,     574.0562f,     813.3345f,    1282.7894f,    1538.0752f,    1727.8997f,    2007.8584f,    2194.5601f,    2755.8220f,    3460.9243f,    3654.1399f,    4030.5530f,    4572.4727f,    4904.7847f,    5400.6147f,    5934.2656f,
-    423.6246f,     540.1947f,     862.8629f,    1386.7659f,    1577.2052f,    1811.0304f,    2046.7363f,    2309.0366f,    3129.1145f,    3533.0020f,    3738.4211f,    4021.1111f,    4357.3677f,    4634.8740f,    5307.2920f,    5944.9155f,
-    287.7661f,     401.5490f,     725.6079f,     950.8911f,    1186.5465f,    1490.1750f,    2114.7920f,    2562.4019f,    3028.3977f,    3519.6277f,    3940.5737f,    4339.3086f,    4765.8188f,    5172.3428f,    5582.8022f,    5971.0273f,
-    382.6039f,     537.7234f,     836.8093f,    1371.3546f,    1578.9803f,    1869.8213f,    2292.5596f,    2540.8601f,    3032.9834f,    3402.5059f,    3737.0569f,    4053.9937f,    4446.6240f,    5251.8457f,    5710.7935f,    6022.2925f,
-    313.2195f,     415.0511f,     690.6860f,    1561.4832f,    1815.6521f,    2059.9187f,    2345.5095f,    2614.8701f,    3006.9604f,    3291.9744f,    3590.4119f,    3996.1516f,    4365.4995f,    4853.4956f,    5465.1572f,    5954.5718f,
-    361.7959f,     448.4001f,     921.3198f,    1343.1167f,    1488.6287f,    1736.7700f,    1950.8906f,    2536.0193f,    2768.7393f,    3062.4473f,    3484.6570f,    3888.5618f,    4618.4038f,    5092.6641f,    5523.3657f,    5966.6772f,
-    249.5541f,     366.6601f,     684.6592f,    1203.0931f,    1642.2089f,    1961.8837f,    2227.3289f,    2421.1348f,    2660.5676f,    3229.5410f,    3822.5837f,    4232.7266f,    4782.5181f,    5127.2612f,    5570.2676f,    5978.9858f,
-    287.4206f,     421.3210f,     704.0352f,    1279.8597f,    1562.7307f,    2115.4241f,    2492.4517f,    2780.9470f,    3317.3616f,    3606.1492f,    4026.6375f,    4337.9014f,    4699.6895f,    4997.2573f,    5431.1787f,    5903.8628f,
-    487.9554f,     740.9349f,    1021.9616f,    1327.3262f,    1620.8544f,    1890.7717f,    2269.1218f,    2584.4868f,    2911.2896f,    3424.9221f,    3855.1670f,    4205.9272f,    4707.2466f,    5147.1846f,    5601.1152f,    5953.4673f,
-    400.8269f,     513.4500f,     786.8242f,    1269.3298f,    1441.4178f,    1696.9789f,    1911.0537f,    2223.0684f,    2847.1619f,    3113.3845f,    3670.6318f,    4146.2900f,    4555.9204f,    5083.8579f,    5574.8120f,    5987.6030f,
-    379.0329f,     487.7222f,     914.8179f,    1130.9854f,    1430.1394f,    1830.0769f,    2088.8796f,    2613.6855f,    2803.1633f,    3457.1777f,    4032.6118f,    4306.7344f,    4662.6899f,    4959.6348f,    5245.5234f,    5787.3940f,
-    340.6941f,     451.0338f,     656.2767f,     911.5805f,    1124.9330f,    1733.8730f,    2518.7861f,    2768.6851f,    3211.3733f,    3717.7583f,    3929.6772f,    4176.2993f,    4522.4517f,    5011.5547f,    5575.8784f,    6006.7222f,
-    341.5027f,     441.6417f,     807.2695f,    1060.2080f,    1251.2837f,    1478.9895f,    1750.0796f,    2594.8977f,    2924.5027f,    3401.4751f,    3852.0557f,    4292.4683f,    4718.2930f,    5159.4775f,    5562.4067f,    5972.5571f,
-    313.8985f,     421.5380f,     667.2407f,     873.6023f,    1110.1119f,    2060.7332f,    2381.0916f,    2746.2288f,    3080.5649f,    3399.9905f,    3897.5884f,    4434.9990f,    5048.1343f,    5390.8149f,    5744.3931f,    6007.9326f,
-    252.1832f,     354.2392f,     673.5427f,    1339.1161f,    1554.8853f,    2014.9351f,    2300.4138f,    2829.6182f,    3213.1714f,    3409.5105f,    3604.3242f,    3927.8020f,    4622.3218f,    5103.4565f,    5559.5024f,    5971.5986f,
-    385.2648f,     513.7607f,     760.7678f,     983.5819f,    1175.7727f,    2134.7810f,    2592.9614f,    2822.0161f,    3232.2524f,    3445.3516f,    3750.7583f,    4094.6714f,    4401.5830f,    4753.4204f,    5549.2319f,    6034.7148f,
-    220.6833f,     314.5706f,     622.2172f,    1350.8225f,    1785.5879f,    2077.5837f,    2504.2158f,    3057.6992f,    3436.0974f,    3695.2976f,    3953.4272f,    4267.8701f,    4660.6865f,    5073.6831f,    5501.9478f,    5929.9780f,
-    207.8814f,     310.4071f,     646.2098f,    1270.5835f,    1542.7271f,    2079.3804f,    2440.0339f,    2843.4690f,    3272.4854f,    3657.9851f,    4061.2014f,    4444.9780f,    4841.6060f,    5224.5947f,    5620.9141f,    5972.7261f,
-    326.1488f,     456.7737f,     740.3350f,     961.4597f,    1262.7579f,    2190.7178f,    2483.5300f,    2872.4180f,    3328.4910f,    3811.0334f,    4153.1602f,    4441.8271f,    4801.1802f,    5065.2988f,    5381.6309f,    5693.2886f,
-    206.2046f,     328.0855f,     618.9507f,     980.9994f,    1695.9775f,    1982.3051f,    2275.5444f,    2806.0271f,    3269.5178f,    3491.2456f,    3722.1775f,    4145.9121f,    4843.1167f,    5266.8677f,    5656.8794f,    5992.1201f,
-    308.1086f,     407.7706f,     806.7985f,    1045.7629f,    1401.8912f,    2108.3472f,    2331.7849f,    2952.5391f,    3174.1865f,    3374.0686f,    3645.4260f,    4292.7183f,    4939.2969f,    5250.4829f,    5607.2358f,    5932.8657f,
-    267.5990f,     378.7492f,     642.2629f,     871.7917f,    1691.7523f,    2087.5117f,    2423.1462f,    2686.1487f,    3021.7893f,    3724.0247f,    4035.5454f,    4369.5903f,    4680.1167f,    4991.4175f,    5323.6875f,    5811.7471f,
-    312.3856f,     437.4281f,     714.5340f,     899.5771f,    1632.7545f,    1938.5369f,    2295.5544f,    2625.6189f,    2900.5576f,    3295.4934f,    3557.1260f,    3960.1123f,    4731.6079f,    5141.8447f,    5502.7793f,    5954.0049f,
-    332.2842f,     449.0976f,     875.9957f,    1206.1912f,    1422.6793f,    2097.5745f,    2354.2483f,    2715.8494f,    3093.4697f,    3344.5132f,    3623.4814f,    3889.3655f,    4256.2002f,    4994.5742f,    5593.8428f,    5985.9575f,
-    286.9586f,     434.7701f,     781.3996f,    1248.3495f,    1835.5530f,    2137.1155f,    2573.7449f,    2869.9299f,    3126.0564f,    3459.1448f,    3769.4475f,    4138.3076f,    4688.0298f,    5084.9028f,    5436.8086f,    5894.2520f,
-    327.0000f,     429.0804f,     663.7327f,     849.7463f,    1174.9340f,    2383.3875f,    2695.9597f,    2941.2026f,    3214.4724f,    3433.6287f,    3778.9312f,    4134.8096f,    4504.8022f,    5066.7559f,    5599.2290f,    5985.7334f,
-    244.4052f,     499.2254f,    1294.8232f,    1689.3677f,    2123.5024f,    2572.4958f,    3042.9067f,    3446.8752f,    3836.3740f,    4175.6729f,    4485.3213f,    4792.3755f,    5094.9077f,    5386.1816f,    5699.6411f,    6008.2114f,
-    561.9757f,    1020.3204f,    1494.1995f,    1841.8171f,    2297.0906f,    2772.6184f,    3204.8804f,    3565.8628f,    3935.4106f,    4253.4141f,    4559.7021f,    4849.9653f,    5140.2852f,    5428.6934f,    5731.2251f,    6023.5078f,
-    581.6182f,    1053.5670f,    1478.5878f,    1784.4789f,    2125.1157f,    2454.5889f,    2809.0256f,    3141.7256f,    3490.7529f,    3848.5923f,    4201.7271f,    4568.7720f,    4945.9619f,    5288.6289f,    5647.7642f,    5981.9341f,
-    258.9683f,     364.0963f,     722.5463f,    1763.2114f,    1969.3870f,    2265.5239f,    2532.1821f,    2883.3557f,    3388.1838f,    3725.3120f,    4080.9338f,    4390.3818f,    4716.3599f,    5068.4941f,    5452.2778f,    5847.1401f,
-    271.5428f,     401.4228f,     695.5894f,     857.3072f,    1776.5358f,    2008.5603f,    2554.4143f,    2844.4021f,    3018.6877f,    3226.1279f,    3482.3398f,    3810.6858f,    4549.3071f,    5266.2764f,    5614.6157f,    5945.6904f,
-    330.3132f,     444.6271f,     669.0279f,     874.5479f,    1102.9247f,    2052.1780f,    2436.2378f,    2711.1165f,    3037.7537f,    3298.2036f,    3898.6858f,    4241.5415f,    4606.7637f,    5086.6919f,    5569.7397f,    5988.6797f,
-    232.3014f,     344.5512f,     578.5155f,    1213.9569f,    1880.9729f,    2105.6685f,    2335.4148f,    2550.3965f,    3147.6501f,    3491.9253f,    3791.5613f,    4159.6694f,    4642.2441f,    5103.3340f,    5605.4106f,    5989.7969f,
-    346.3687f,     444.8047f,     714.3775f,     889.1195f,    1211.8463f,    2168.7598f,    2430.2490f,    2760.6326f,    3012.4961f,    3268.8750f,    3565.1558f,    4172.5791f,    4781.5391f,    5127.6704f,    5512.6323f,    5911.3779f,
-    398.0477f,     553.8537f,     845.8521f,    1119.3066f,    1309.7244f,    1928.3351f,    2351.2095f,    2649.8230f,    3050.6750f,    3297.0566f,    3592.7275f,    3916.1785f,    4723.3325f,    5318.1221f,    5703.9697f,    5996.7651f,
-    371.4409f,     471.0789f,     896.4924f,    1197.7544f,    1400.8007f,    1611.1555f,    1867.3550f,    2818.4475f,    3002.5906f,    3250.1440f,    3546.5891f,    4265.0371f,    4890.3369f,    5274.4722f,    5659.3560f,    5946.9644f,
-    330.9331f,     448.7211f,     808.3973f,     978.2021f,    1652.6361f,    1969.0725f,    2357.0146f,    2680.4792f,    2859.9165f,    3078.9578f,    3423.6895f,    4233.3169f,    4856.7813f,    5086.5723f,    5393.9961f,    5938.6035f,
-    323.9659f,     433.8731f,    1045.5168f,    1369.1907f,    1561.9178f,    1984.2457f,    2224.0959f,    2747.3657f,    2995.0359f,    3242.9248f,    3501.0344f,    4022.2388f,    4847.4985f,    5210.9922f,    5658.1357f,    6005.0718f,
-    354.6574f,     501.6520f,     852.5305f,    1020.8707f,    1540.5925f,    1998.5675f,    2253.1487f,    2845.3960f,    3056.5273f,    3305.0466f,    3954.2900f,    4591.7471f,    4915.2856f,    5221.9082f,    5544.7285f,    5879.9150f,
-    363.1311f,     474.7310f,     907.5490f,    1106.8586f,    1367.2662f,    1646.6934f,    2031.3650f,    2326.4382f,    2568.6519f,    3030.1091f,    3905.6482f,    4265.9111f,    4716.1831f,    5017.0454f,    5469.8149f,    5958.6182f,
-    379.9262f,     524.4459f,     845.4813f,    1275.4414f,    1458.2488f,    1772.5863f,    2067.7981f,    2526.8850f,    3066.4063f,    3307.8713f,    3807.2900f,    4199.1509f,    4452.4653f,    4854.7471f,    5464.8833f,    5947.7842f,
-    371.8218f,     483.9148f,     778.2747f,    1208.0812f,    1366.3983f,    1623.4895f,    1798.8777f,    2224.6445f,    3103.7175f,    3386.0408f,    3782.8284f,    4307.4727f,    4698.8994f,    5118.1255f,    5505.1919f,    5921.1724f,
-    217.9059f,     323.3224f,     639.7305f,    1026.5331f,    1312.9242f,    1885.6948f,    2361.8403f,    2805.5396f,    3213.2600f,    3631.5017f,    4033.4087f,    4426.3423f,    4821.3203f,    5208.3833f,    5590.5205f,    5956.1538f,
-    211.9971f,     311.2018f,     504.6345f,     858.3289f,    1574.7019f,    1934.9866f,    2381.4163f,    2786.2043f,    3238.9326f,    3611.0518f,    4005.2578f,    4401.0615f,    4802.1479f,    5192.5493f,    5587.1479f,    5965.5977f,
-    219.3884f,     319.3835f,     604.0102f,    1114.8630f,    1481.3870f,    2036.0469f,    2303.4883f,    2616.1384f,    3253.6335f,    3556.5107f,    3946.6567f,    4520.3555f,    5091.0479f,    5416.3037f,    5748.5737f,    5946.5757f,
-    350.3716f,     515.4462f,     756.5206f,    1061.4270f,    1251.9570f,    1723.2751f,    2687.6689f,    3036.2019f,    3273.9678f,    3744.2939f,    4098.6284f,    4391.4160f,    4917.6777f,    5244.2852f,    5551.4976f,    5880.1572f,
-    311.6069f,     458.7317f,     795.9418f,     969.5021f,    1511.2507f,    1952.5673f,    2273.6116f,    2795.8657f,    3049.7053f,    3578.0598f,    3911.1873f,    4327.2598f,    4735.3105f,    5122.3423f,    5479.7817f,    5858.1504f,
-    267.8399f,     390.6757f,     886.2357f,    1179.5110f,    1466.6409f,    2088.7725f,    2328.1262f,    2993.5786f,    3283.5256f,    3593.2822f,    4095.7588f,    4500.4009f,    4887.5132f,    5219.0859f,    5553.4224f,    5915.6831f,
-    279.2209f,     413.3200f,     648.4438f,    1282.1798f,    1793.2556f,    1952.1060f,    2484.9436f,    2857.3630f,    3077.2114f,    3548.2585f,    4045.4526f,    4309.5947f,    4760.2900f,    5208.1948f,    5620.9717f,    5968.3237f,
-    306.2321f,     424.7843f,     618.7867f,    1288.7572f,    2110.7849f,    2346.5396f,    2582.5366f,    2833.5730f,    3074.3774f,    3464.7886f,    3984.6379f,    4262.0337f,    4601.5132f,    4999.6992f,    5498.8926f,    5920.4814f,
-    259.2613f,     353.6931f,     762.5328f,    1906.2162f,    2088.1213f,    2317.9741f,    2546.5935f,    2880.3687f,    3332.0002f,    3636.9216f,    3946.4287f,    4226.0356f,    4502.1084f,    5007.0601f,    5496.4824f,    5924.8877f,
-    244.3871f,     357.0287f,    1114.7865f,    1651.1329f,    1850.2976f,    2200.5942f,    2484.7026f,    2872.6968f,    3092.8455f,    3373.5869f,    3707.5891f,    4180.1289f,    4603.5298f,    5132.2671f,    5554.7617f,    5973.5220f,
-    700.5439f,    1363.5277f,    1745.2494f,    2081.9539f,    2379.8628f,    2623.6003f,    2883.6484f,    3133.9824f,    3457.7092f,    3819.0100f,    4191.0537f,    4547.0400f,    4912.5127f,    5241.3423f,    5594.9395f,    5930.6099f,
-    268.7704f,     370.8200f,     609.4679f,    1558.5339f,    1961.6279f,    2155.8916f,    2419.4485f,    2655.5103f,    3152.6685f,    3426.9221f,    3716.8181f,    4107.1616f,    4965.5698f,    5384.2026f,    5706.7183f,    6015.6196f,
-    305.7638f,     395.9599f,    1103.0944f,    1383.6494f,    1612.9742f,    1915.2496f,    2189.8008f,    2555.3608f,    2720.8220f,    3038.2434f,    3927.1301f,    4263.0518f,    4685.7217f,    4984.1377f,    5272.6162f,    5984.5376f,
-    294.0385f,     426.7762f,     814.5162f,    1056.9037f,    1715.3539f,    2005.3177f,    2316.4392f,    2647.4297f,    2893.8242f,    3196.7476f,    3720.0044f,    4186.9790f,    4840.4512f,    5290.1250f,    5684.2139f,    5967.5859f,
-    359.5141f,     517.6051f,     807.4898f,    1143.5930f,    1328.1393f,    1814.7098f,    2309.8894f,    2618.8655f,    3160.5962f,    3445.0479f,    3883.2664f,    4235.5200f,    4718.7324f,    5367.3608f,    5765.9331f,    6034.9233f,
-    241.5752f,     375.5109f,     818.8776f,    1298.7773f,    1656.9050f,    2169.8962f,    2565.1440f,    3015.9919f,    3437.9463f,    3863.8203f,    4254.4023f,    4637.0952f,    5027.8252f,    5358.3784f,    5685.5000f,    5980.4063f,
-    322.5406f,     454.9644f,     963.3659f,    1513.8885f,    1704.5070f,    2235.6599f,    2523.6467f,    2995.0757f,    3287.8682f,    3552.8811f,    3872.4360f,    4201.2227f,    4571.9087f,    5066.6792f,    5562.1206f,    5935.7900f,
-    412.5748f,     615.8419f,    1126.9519f,    1455.5172f,    1653.3076f,    1965.2689f,    2240.6904f,    2672.5129f,    3127.3301f,    3477.8540f,    3983.6145f,    4458.6558f,    4896.7998f,    5237.9814f,    5609.1597f,    5939.6416f,
-    342.1361f,     470.6100f,     958.3576f,    1195.0166f,    1426.4667f,    1684.2009f,    2194.0950f,    2545.9453f,    2946.1851f,    3415.2820f,    3657.4158f,    4408.6763f,    5097.2251f,    5404.2202f,    5719.9829f,    5977.7959f,
-    297.8767f,     386.6347f,    1095.8346f,    1454.3085f,    1651.6417f,    1927.9633f,    2198.4927f,    2583.1694f,    2757.0144f,    3009.6497f,    3310.9514f,    3956.9753f,    4677.3208f,    5122.2222f,    5539.0688f,    5993.0542f,
-    334.7170f,     450.1582f,     747.3162f,    1560.2024f,    1808.2147f,    2006.5011f,    2415.2419f,    2680.1956f,    3016.5549f,    3651.1340f,    3975.3625f,    4209.6563f,    4531.0396f,    5121.7212f,    5585.2202f,    5962.3667f,
-    256.4101f,     495.5723f,    1341.4860f,    1805.1255f,    2201.8318f,    2514.7769f,    2820.4092f,    3102.3867f,    3414.3872f,    3754.7742f,    4108.2378f,    4465.9258f,    4857.4355f,    5216.2144f,    5592.3076f,    5951.9995f,
-    530.7974f,    1017.4255f,    1463.9575f,    1858.6631f,    2360.1265f,    2770.3811f,    3106.0894f,    3379.1919f,    3647.7175f,    3895.9026f,    4188.8652f,    4522.8984f,    4893.7954f,    5241.4312f,    5623.8994f,    5975.3608f,
-    597.1553f,    1198.0758f,    1722.7361f,    2128.6658f,    2519.1504f,    2825.5122f,    3086.1943f,    3330.0283f,    3608.2961f,    3906.9929f,    4241.8105f,    4603.1694f,    4972.8159f,    5308.1670f,    5651.1968f,    5976.6704f,
-    699.1581f,    1293.3193f,    1637.3395f,    1912.7987f,    2163.3445f,    2425.7944f,    2704.0396f,    3006.5984f,    3358.2126f,    3746.1548f,    4125.0762f,    4489.7485f,    4854.0088f,    5188.5146f,    5558.2056f,    5913.3164f,
-    489.0107f,     921.4806f,    1329.8511f,    1644.8383f,    2013.6794f,    2365.2683f,    2746.1553f,    3085.6912f,    3457.0234f,    3825.2183f,    4203.4224f,    4575.9331f,    4950.6606f,    5298.7559f,    5659.8618f,    5997.0015f,
-    230.3653f,     389.8415f,     938.1970f,    1294.3594f,    1768.8275f,    2189.1001f,    2597.3755f,    2985.8518f,    3323.6023f,    3705.8533f,    4065.5361f,    4446.4224f,    4818.4502f,    5185.9634f,    5583.2168f,    5954.2573f,
-    283.9404f,     400.2146f,     630.6198f,    1491.5646f,    2295.1375f,    2496.3457f,    2726.5803f,    2971.1951f,    3207.2317f,    3634.5439f,    4178.0376f,    4423.5537f,    4836.2109f,    5172.1821f,    5464.0454f,    5777.5801f,
-    242.6232f,     351.1541f,     807.9852f,    1621.9950f,    2043.8676f,    2532.5122f,    2860.5505f,    3200.3403f,    3499.8274f,    3760.3772f,    4068.9617f,    4410.7339f,    4778.8413f,    5153.0142f,    5553.1997f,    5932.5996f,
-    227.3320f,     323.2667f,     752.3189f,    1572.3750f,    1930.6083f,    2355.0117f,    2717.6223f,    2968.3215f,    3233.4026f,    3551.9622f,    3918.5608f,    4346.0190f,    4778.6880f,    5159.6172f,    5568.5566f,    5980.8086f,
-    307.9120f,     439.7297f,     660.0276f,    1243.3854f,    1532.3577f,    1796.3936f,    2437.3232f,    2691.4072f,    3030.3025f,    3524.1379f,    3771.7576f,    4083.2375f,    4601.1567f,    4963.4697f,    5434.8530f,    5942.8315f
-};
 
 const float lsf_cdk_nb_gc_stg1[] =
 {
@@ -19097,56 +18841,6 @@ const UWord32 exp2x_tab_long[32] =
     0x4009B4FA,0x400A0DC0,0x400A6688,0x400ABF4F
 };
 
-/* square root tables */
-const Word32 SqrtTable[32] =   /* Q31 */
-{
-    0x5A82D429, 0x5BEA10FE, 0x5D4BE6E5, 0x5EA89270, 0x60004BE2, 0x615347A1, 0x62A1B68C, 0x63EBC651,
-    0x6531A1B5, 0x667370D4, 0x67B1595F, 0x68EB7EC8, 0x6A220277, 0x6B5503F0, 0x6C84A0F9, 0x6DB0F5BD,
-    0x6EDA1CE9, 0x70002FC7, 0x7123465A, 0x72437773, 0x7360D8C5, 0x747B7EFA, 0x75937DC4, 0x76A8E7EB,
-    0x77BBCF60, 0x78CC4545, 0x79DA5A00, 0x7AE61D3E, 0x7BEF9E07, 0x7CF6EAC2, 0x7DFC113F, 0x7EFF1EC0
-};
-
-const Word16 SqrtDiffTable[32] =   /* Q21 */
-{
-    0x59CF, 0x5875, 0x572B, 0x55EE, 0x54BF, 0x539C, 0x5284, 0x5177,
-    0x5074, 0x4F7A, 0x4E89, 0x4DA1, 0x4CC0, 0x4BE7, 0x4B15, 0x4A4A,
-    0x4985, 0x48C6, 0x480C, 0x4758, 0x46AA, 0x4600, 0x455B, 0x44BA,
-    0x441D, 0x4385, 0x42F1, 0x4260, 0x41D3, 0x414A, 0x40C3, 0x4040
-};
-
-
-const Word32 ISqrtTable[32] =   /* Q31 */
-{
-    0x7FFE7F85, 0x7E0A4E25, 0x7C2C56C7, 0x7A63002C, 0x78ACD922, 0x7708939D, 0x75750088, 0x73F10C2D,
-    0x727BBB1A, 0x71142774, 0x6FB97EA5, 0x6E6AFF54, 0x6D27F79D, 0x6BEFC388, 0x6AC1CBA4, 0x699D83DA,
-    0x68826A53, 0x6770068E, 0x6665E882, 0x6563A7DF, 0x6468E364, 0x63754043, 0x62886999, 0x61A20FEE,
-    0x60C1E8C8, 0x5FE7AE45, 0x5F131EBE, 0x5E43FC76, 0x5D7A0D4F, 0x5CB51A81, 0x5BF4F061, 0x5B395E26
-};
-
-const Word16 ISqrtDiffTable[32] =   /* Q21 */
-{
-    0x7D0C, 0x777E, 0x7256, 0x6D8A, 0x6911, 0x64E5, 0x60FD, 0x5D54,
-    0x59E5, 0x56AA, 0x53A0, 0x50C2, 0x4E0D, 0x4B7E, 0x4912, 0x46C6,
-    0x4499, 0x4288, 0x4090, 0x3EB1, 0x3CE9, 0x3B36, 0x3996, 0x380A,
-    0x368F, 0x3524, 0x33C9, 0x327C, 0x313D, 0x300B, 0x2EE5, 0x2DCA
-};
-
-/* 1/x tables */
-const Word32 InvTable[32] =   /* Q31 */
-{
-    0x7FFBFE40, 0x7C1B608E, 0x78752176, 0x750440BA, 0x71C44C49, 0x6EB14D0A, 0x6BC7B6B4, 0x69045A19,
-    0x6664598A, 0x63E51EE2, 0x61845308, 0x5F3FD698, 0x5D15BB8E, 0x5B043FD0, 0x5909C861, 0x5724DD3C,
-    0x555425B2, 0x53966532, 0x51EA787F, 0x504F5331, 0x4EC3FD84, 0x4D479267, 0x4BD93DBE, 0x4A783ADC,
-    0x4923D31D, 0x47DB5CAE, 0x469E3974, 0x456BD608, 0x4443A8D9, 0x43253159, 0x420FF746, 0x41038A01
-};
-
-const Word16 InvDiffTable[32] =   /* Q20 */
-{
-    0x7C14, 0x74C8, 0x6E1C, 0x67FF, 0x6260, 0x5D33, 0x586C, 0x5400,
-    0x4FE7, 0x4C19, 0x4890, 0x4543, 0x422F, 0x3F4F, 0x3C9D, 0x3A17,
-    0x37B8, 0x357E, 0x3365, 0x316B, 0x2F8D, 0x2DCB, 0x2C20, 0x2A8D,
-    0x290F, 0x27A4, 0x264C, 0x2506, 0x23CF, 0x22A7, 0x218E, 0x2081
-};
 
 /* ACELP pulse coding */
 const int low_len[10]   = { 0, 0, 8, 5, 7,11,13,15,16,16};
@@ -19154,3 +18848,5 @@ const int low_mask[10] = { 0, 0, 255,31,127,2047,8191,32767,65535,65535};
 const int indx_fact[10] = { 0, 0,2,172,345,140,190,223,463,1732};
 const int index_len[3]  = { 0, 5,   9 };
 const int index_mask_ACELP[3] = { 0, 31, 511 };
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/rom_com.h b/src/libs/libevs/lib_com/rom_com.h
index 91505f84..61616c99 100644
--- a/src/libs/libevs/lib_com/rom_com.h
+++ b/src/libs/libevs/lib_com/rom_com.h
@@ -12,6 +12,8 @@
 #include "stl.h"
 #include "basop_util.h"
 
+namespace evs {
+
 typedef struct
 {
     int fin;       /* input frequency                   */
@@ -1226,5 +1228,7 @@ extern const int indx_fact[10];
 extern const int index_len[3];
 extern const int index_mask_ACELP[3];
 
+} // end of namespace
+
 #endif
 
diff --git a/src/libs/libevs/lib_com/stab_est.cpp b/src/libs/libevs/lib_com/stab_est.cpp
index 98f04c03..78c91e59 100644
--- a/src/libs/libevs/lib_com/stab_est.cpp
+++ b/src/libs/libevs/lib_com/stab_est.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -196,3 +199,5 @@ short stab_est(
     return music_flag2;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/stat_com.h b/src/libs/libevs/lib_com/stat_com.h
index e70d2d52..52135357 100644
--- a/src/libs/libevs/lib_com/stat_com.h
+++ b/src/libs/libevs/lib_com/stat_com.h
@@ -13,6 +13,7 @@
 #include "typedef.h"
 #include "cnst.h"
 
+namespace evs {
 
 /*----------------------------------------------------------------------------------*
  * Declaration of structures
@@ -640,4 +641,6 @@ typedef struct
     int                 numPeakIndices, numHoleIndices;
 } CONTEXT_HM_CONFIG;
 
+} // end of namespace
+
 #endif
diff --git a/src/libs/libevs/lib_com/stat_noise_uv_mod.cpp b/src/libs/libevs/lib_com/stat_noise_uv_mod.cpp
index 9a30ff75..8a1e1291 100644
--- a/src/libs/libevs/lib_com/stat_noise_uv_mod.cpp
+++ b/src/libs/libevs/lib_com/stat_noise_uv_mod.cpp
@@ -6,6 +6,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * Local constants
@@ -198,3 +201,5 @@ static float calc_tilt(
 
     return r1/r0;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/swb_bwe_com.cpp b/src/libs/libevs/lib_com/swb_bwe_com.cpp
index 5ccefadb..a730890f 100644
--- a/src/libs/libevs/lib_com/swb_bwe_com.cpp
+++ b/src/libs/libevs/lib_com/swb_bwe_com.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * WB_BWE_gain_pred()
  *
@@ -1516,3 +1519,5 @@ void save_old_syn(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/swb_bwe_com_hr.cpp b/src/libs/libevs/lib_com/swb_bwe_com_hr.cpp
index da359f61..38168af7 100644
--- a/src/libs/libevs/lib_com/swb_bwe_com_hr.cpp
+++ b/src/libs/libevs/lib_com/swb_bwe_com_hr.cpp
@@ -6,6 +6,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * swb_hr_nonzero_subband_noise_fill()
  *
@@ -283,3 +286,5 @@ float td_postprocess(           /* o  : gain                        */
 
     return( gain );
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/swb_bwe_com_lr.cpp b/src/libs/libevs/lib_com/swb_bwe_com_lr.cpp
index c6a3b66f..307dc6e3 100644
--- a/src/libs/libevs/lib_com/swb_bwe_com_lr.cpp
+++ b/src/libs/libevs/lib_com/swb_bwe_com_lr.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * hf_parinitiz()
@@ -2045,3 +2048,5 @@ void updat_prev_frm(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/swb_tbe_com.cpp b/src/libs/libevs/lib_com/swb_tbe_com.cpp
index 0998cfa5..d84fb672 100644
--- a/src/libs/libevs/lib_com/swb_tbe_com.cpp
+++ b/src/libs/libevs/lib_com/swb_tbe_com.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local functions
  *-----------------------------------------------------------------*/
@@ -1721,3 +1724,5 @@ short get_tbe_bits(
 
     return bits;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/syn_12k8.cpp b/src/libs/libevs/lib_com/syn_12k8.cpp
index 2d76af9b..3ced701d 100644
--- a/src/libs/libevs/lib_com/syn_12k8.cpp
+++ b/src/libs/libevs/lib_com/syn_12k8.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*------------------------------------------------------------------
  * syn_12k8()
  *
@@ -33,3 +36,5 @@ void syn_12k8(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/syn_filt.cpp b/src/libs/libevs/lib_com/syn_filt.cpp
index bc6e5ec9..a3e425f5 100644
--- a/src/libs/libevs/lib_com/syn_filt.cpp
+++ b/src/libs/libevs/lib_com/syn_filt.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*------------------------------------------------------------------*
  * syn_filt()
  *
@@ -120,3 +123,5 @@ void synth_mem_updt2(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/tcq_position_arith.cpp b/src/libs/libevs/lib_com/tcq_position_arith.cpp
index 78845d4f..a8eb7478 100644
--- a/src/libs/libevs/lib_com/tcq_position_arith.cpp
+++ b/src/libs/libevs/lib_com/tcq_position_arith.cpp
@@ -12,6 +12,9 @@
 #include "basop_util.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 void bitstream_save_bit(PBITSTREAM pBS, int bit);
 unsigned int bitstream_load_bit(PBITSTREAM pBS);
 void bitstream_rollback(PBITSTREAM pBS, int numBits);
@@ -2014,3 +2017,5 @@ void RestoreTCQ( float * magn, int size, short *bcount, float *mbuffer)
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/tcx_ltp.cpp b/src/libs/libevs/lib_com/tcx_ltp.cpp
index 070e0560..cd43d16a 100644
--- a/src/libs/libevs/lib_com/tcx_ltp.cpp
+++ b/src/libs/libevs/lib_com/tcx_ltp.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "assert.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------
  * Local constants
@@ -749,3 +752,5 @@ void tcx_ltp_post(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/tcx_mdct.cpp b/src/libs/libevs/lib_com/tcx_mdct.cpp
index 0adbfef9..bf51aec4 100644
--- a/src/libs/libevs/lib_com/tcx_mdct.cpp
+++ b/src/libs/libevs/lib_com/tcx_mdct.cpp
@@ -8,6 +8,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * TCX_MDCT()
@@ -134,3 +137,5 @@ void TCX_MDCT_Inverse(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/tcx_mdct_window.cpp b/src/libs/libevs/lib_com/tcx_mdct_window.cpp
index 260af2e4..5a25f17f 100644
--- a/src/libs/libevs/lib_com/tcx_mdct_window.cpp
+++ b/src/libs/libevs/lib_com/tcx_mdct_window.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------
  * mdct_window_sine()
@@ -186,3 +189,5 @@ void mdct_window_aldo(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/tcx_utils.cpp b/src/libs/libevs/lib_com/tcx_utils.cpp
index 9e92bcde..a4c29ccb 100644
--- a/src/libs/libevs/lib_com/tcx_utils.cpp
+++ b/src/libs/libevs/lib_com/tcx_utils.cpp
@@ -10,6 +10,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
 * tcx_get_windows()
 *
@@ -939,3 +942,5 @@ void SetTnsConfig(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/tec_com.cpp b/src/libs/libevs/lib_com/tec_com.cpp
index 11b88e91..21ceb99e 100644
--- a/src/libs/libevs/lib_com/tec_com.cpp
+++ b/src/libs/libevs/lib_com/tec_com.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "stat_dec.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------
  * Local constants
  *-------------------------------------------------------------------*/
@@ -927,3 +930,5 @@ void tecEnc_TBE(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/tns_base.cpp b/src/libs/libevs/lib_com/tns_base.cpp
index 989bac94..594444d4 100644
--- a/src/libs/libevs/lib_com/tns_base.cpp
+++ b/src/libs/libevs/lib_com/tns_base.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 
@@ -733,3 +736,5 @@ int ITF_Detect(float const pSpectrum[],
     return 1;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/tools.cpp b/src/libs/libevs/lib_com/tools.cpp
index 3d1a9702..f4651a81 100644
--- a/src/libs/libevs/lib_com/tools.cpp
+++ b/src/libs/libevs/lib_com/tools.cpp
@@ -11,6 +11,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*------------------------------------------------------------------*
  * own_random()
@@ -1456,3 +1459,5 @@ short is_numeric_float(
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/trans_direct.cpp b/src/libs/libevs/lib_com/trans_direct.cpp
index f3a033c3..e25a9b9f 100644
--- a/src/libs/libevs/lib_com/trans_direct.cpp
+++ b/src/libs/libevs/lib_com/trans_direct.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------
  * direct_transform()
@@ -139,3 +142,5 @@ void direct_transform(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/trans_inv.cpp b/src/libs/libevs/lib_com/trans_inv.cpp
index 86b768f0..1dae2481 100644
--- a/src/libs/libevs/lib_com/trans_inv.cpp
+++ b/src/libs/libevs/lib_com/trans_inv.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * Local constants
  *--------------------------------------------------------------------------*/
@@ -860,3 +863,5 @@ void inverse_transform(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/typedef.h b/src/libs/libevs/lib_com/typedef.h
index a91a94d3..0c6740a9 100644
--- a/src/libs/libevs/lib_com/typedef.h
+++ b/src/libs/libevs/lib_com/typedef.h
@@ -36,6 +36,9 @@
 #ifndef TYPEDEF_H
 #define TYPEDEF_H
 
+namespace evs {
+
+
 /*
  * This is the original code from the file typedef.h
  */
@@ -84,6 +87,8 @@ typedef int Flag;
 
 typedef float Float32;
 
+} // end of namespace
+
 #endif /* ifndef _TYPEDEF_H */
 
 
diff --git a/src/libs/libevs/lib_com/vlpc_2st_com.cpp b/src/libs/libevs/lib_com/vlpc_2st_com.cpp
index 1c9734a5..1b5c604d 100644
--- a/src/libs/libevs/lib_com/vlpc_2st_com.cpp
+++ b/src/libs/libevs/lib_com/vlpc_2st_com.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*------------------------------------------------------------------*
 * lsf_weight_2st()
@@ -55,3 +58,5 @@ void lsf_weight_2st(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/weight.cpp b/src/libs/libevs/lib_com/weight.cpp
index 1833733f..2df9ea51 100644
--- a/src/libs/libevs/lib_com/weight.cpp
+++ b/src/libs/libevs/lib_com/weight.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * sfm2mqb()
  *
@@ -332,3 +335,5 @@ void map_quant_weight(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/weight_a.cpp b/src/libs/libevs/lib_com/weight_a.cpp
index 0ead2cc5..19afb648 100644
--- a/src/libs/libevs/lib_com/weight_a.cpp
+++ b/src/libs/libevs/lib_com/weight_a.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*------------------------------------------------------------------
  * weight_a()
  *
@@ -71,3 +74,5 @@ void weight_a_subfr(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/wi.cpp b/src/libs/libevs/lib_com/wi.cpp
index e04e1a06..dbf5f5a8 100644
--- a/src/libs/libevs/lib_com/wi.cpp
+++ b/src/libs/libevs/lib_com/wi.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
 * Local constants
@@ -2249,3 +2252,5 @@ void DTFS_peaktoaverage(
     }
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/window.cpp b/src/libs/libevs/lib_com/window.cpp
index ac3dec6c..4984a2b8 100644
--- a/src/libs/libevs/lib_com/window.cpp
+++ b/src/libs/libevs/lib_com/window.cpp
@@ -7,6 +7,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------
  * ham_cos_window()
  *
@@ -37,3 +40,5 @@ void ham_cos_window(
     }
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/window_ola.cpp b/src/libs/libevs/lib_com/window_ola.cpp
index 09e49805..eec69878 100644
--- a/src/libs/libevs/lib_com/window_ola.cpp
+++ b/src/libs/libevs/lib_com/window_ola.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------
 * window_ola()
 *
@@ -434,3 +437,5 @@ void sinq(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_com/wtda.cpp b/src/libs/libevs/lib_com/wtda.cpp
index c54e4c97..6f40011e 100644
--- a/src/libs/libevs/lib_com/wtda.cpp
+++ b/src/libs/libevs/lib_com/wtda.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include <assert.h>
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
 *  mvr2r_inv()
@@ -327,3 +330,5 @@ void wtda(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/EvsRXlib.cpp b/src/libs/libevs/lib_dec/EvsRXlib.cpp
index 313916af..00d4710b 100644
--- a/src/libs/libevs/lib_dec/EvsRXlib.cpp
+++ b/src/libs/libevs/lib_dec/EvsRXlib.cpp
@@ -15,6 +15,9 @@
 #include "jbm_pcmdsp_fifo.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 
 struct EVS_RX
 {
@@ -481,3 +484,5 @@ static int isSidFrame( unsigned int size )
     }
     return ret;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/EvsRXlib.h b/src/libs/libevs/lib_dec/EvsRXlib.h
index 6b5c8d40..e731806a 100644
--- a/src/libs/libevs/lib_dec/EvsRXlib.h
+++ b/src/libs/libevs/lib_dec/EvsRXlib.h
@@ -8,6 +8,8 @@
 /* local headers */
 #include "stat_dec.h"
 
+namespace evs {
+
 /*
  * ENUMS
  */
@@ -82,4 +84,5 @@ EVS_RX_IsEmpty(EVS_RX_HANDLE hEvsRX );
 EVS_RX_ERROR
 EVS_RX_Close(EVS_RX_HANDLE* phEvsRX );
 
+} // end of namespace
 #endif
diff --git a/src/libs/libevs/lib_dec/FEC.cpp b/src/libs/libevs/lib_dec/FEC.cpp
index 58d79991..473f08ce 100644
--- a/src/libs/libevs/lib_dec/FEC.cpp
+++ b/src/libs/libevs/lib_dec/FEC.cpp
@@ -10,6 +10,9 @@
 #include "rom_dec.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local functions
  *-------------------------------------------------------------------*/
@@ -531,3 +534,5 @@ static void pulseRes_preCalc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/FEC_HQ_core.cpp b/src/libs/libevs/lib_dec/FEC_HQ_core.cpp
index bc200892..595d4389 100644
--- a/src/libs/libevs/lib_dec/FEC_HQ_core.cpp
+++ b/src/libs/libevs/lib_dec/FEC_HQ_core.cpp
@@ -10,6 +10,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local prototypes
  *---------------------------------------------------------------------*/
@@ -1442,3 +1445,5 @@ void Next_good_after_burst_erasures(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/FEC_HQ_phase_ecu.cpp b/src/libs/libevs/lib_dec/FEC_HQ_phase_ecu.cpp
index 27cd1c08..584e1534 100644
--- a/src/libs/libevs/lib_dec/FEC_HQ_phase_ecu.cpp
+++ b/src/libs/libevs/lib_dec/FEC_HQ_phase_ecu.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "assert.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * Local constants
@@ -1758,3 +1761,5 @@ void hq_ecu(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/FEC_adapt_codebook.cpp b/src/libs/libevs/lib_dec/FEC_adapt_codebook.cpp
index 9ba0e139..9f241b04 100644
--- a/src/libs/libevs/lib_dec/FEC_adapt_codebook.cpp
+++ b/src/libs/libevs/lib_dec/FEC_adapt_codebook.cpp
@@ -9,6 +9,9 @@
 #include "rom_dec.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------------
  * FEC_synchro_exc()
@@ -458,3 +461,5 @@ short FEC_enhACB(
     return do_WI;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/FEC_clas_estim.cpp b/src/libs/libevs/lib_dec/FEC_clas_estim.cpp
index 6625cfc8..ef2c8824 100644
--- a/src/libs/libevs/lib_dec/FEC_clas_estim.cpp
+++ b/src/libs/libevs/lib_dec/FEC_clas_estim.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "stat_dec.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -793,3 +796,5 @@ short FEC_pos_dec(
 
     return T0;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/FEC_lsf_estim.cpp b/src/libs/libevs/lib_dec/FEC_lsf_estim.cpp
index 09823b6e..81ecfeab 100644
--- a/src/libs/libevs/lib_dec/FEC_lsf_estim.cpp
+++ b/src/libs/libevs/lib_dec/FEC_lsf_estim.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * FEC_lsf_estim()
  *
@@ -54,3 +57,5 @@ void FEC_lsf2lsp_interp(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/FEC_pitch_estim.cpp b/src/libs/libevs/lib_dec/FEC_pitch_estim.cpp
index c45264b1..5f7db9c4 100644
--- a/src/libs/libevs/lib_dec/FEC_pitch_estim.cpp
+++ b/src/libs/libevs/lib_dec/FEC_pitch_estim.cpp
@@ -8,6 +8,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*------------------------------------------------------------------------*
  * FEC_pitch_estim()
@@ -54,3 +57,5 @@ void FEC_pitch_estim(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/FEC_scale_syn.cpp b/src/libs/libevs/lib_dec/FEC_scale_syn.cpp
index 1d3acb46..556bb3b0 100644
--- a/src/libs/libevs/lib_dec/FEC_scale_syn.cpp
+++ b/src/libs/libevs/lib_dec/FEC_scale_syn.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 #define SCLSYN_LAMBDA           0.3f
 
 /*-------------------------------------------------------------------*
@@ -406,3 +409,5 @@ void FEC_scale_syn(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/LD_music_post_filter.cpp b/src/libs/libevs/lib_dec/LD_music_post_filter.cpp
index d1c808bd..5beddc4f 100644
--- a/src/libs/libevs/lib_dec/LD_music_post_filter.cpp
+++ b/src/libs/libevs/lib_dec/LD_music_post_filter.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -700,3 +703,5 @@ void Post_music_postP(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/TonalComponentDetection.cpp b/src/libs/libevs/lib_dec/TonalComponentDetection.cpp
index 57341957..cb42ff9e 100644
--- a/src/libs/libevs/lib_dec/TonalComponentDetection.cpp
+++ b/src/libs/libevs/lib_dec/TonalComponentDetection.cpp
@@ -12,6 +12,9 @@
 #include "cnst.h"
 #include "stat_com.h"
 
+namespace evs { 
+
+
 
 
 /***********************************************************************************/
@@ -774,3 +777,5 @@ static void findTonalComponents(unsigned short int * indexOfTonalPeak, /* OUT */
 
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/bass_psfilter.cpp b/src/libs/libevs/lib_dec/bass_psfilter.cpp
index 7ab090d6..75165aed 100644
--- a/src/libs/libevs/lib_dec/bass_psfilter.cpp
+++ b/src/libs/libevs/lib_dec/bass_psfilter.cpp
@@ -10,6 +10,9 @@
 #include "options.h"
 #include <assert.h>
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local constants
  *---------------------------------------------------------------------*/
@@ -468,3 +471,5 @@ void addBassPostFilter(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/cng_dec.cpp b/src/libs/libevs/lib_dec/cng_dec.cpp
index b79ead99..4cbb07ce 100644
--- a/src/libs/libevs/lib_dec/cng_dec.cpp
+++ b/src/libs/libevs/lib_dec/cng_dec.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local function
  *---------------------------------------------------------------------*/
@@ -692,3 +695,5 @@ static void shb_CNG_decod(
     ResetSHBbuffer_Dec( st );
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/core_dec_init.cpp b/src/libs/libevs/lib_dec/core_dec_init.cpp
index 5961380e..5f9daf5b 100644
--- a/src/libs/libevs/lib_dec/core_dec_init.cpp
+++ b/src/libs/libevs/lib_dec/core_dec_init.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------------*
  * open_decoder_LPD()
  *
@@ -668,3 +671,5 @@ void open_decoder_LPD(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/core_dec_reconf.cpp b/src/libs/libevs/lib_dec/core_dec_reconf.cpp
index bbcd9084..9671fce4 100644
--- a/src/libs/libevs/lib_dec/core_dec_reconf.cpp
+++ b/src/libs/libevs/lib_dec/core_dec_reconf.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "rom_dec.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * reconfig_decoder_LPD()
  *
@@ -148,3 +151,5 @@ void reconfig_decoder_LPD(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/core_dec_switch.cpp b/src/libs/libevs/lib_dec/core_dec_switch.cpp
index b0d208b0..7111b521 100644
--- a/src/libs/libevs/lib_dec/core_dec_switch.cpp
+++ b/src/libs/libevs/lib_dec/core_dec_switch.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------*
  * mode_switch_decoder_LPD()
@@ -176,3 +179,5 @@ void mode_switch_decoder_LPD(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/core_switching_dec.cpp b/src/libs/libevs/lib_dec/core_switching_dec.cpp
index 91bc20a1..8e55bcd3 100644
--- a/src/libs/libevs/lib_dec/core_switching_dec.cpp
+++ b/src/libs/libevs/lib_dec/core_switching_dec.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * core_switching_pre_dec()
  *
@@ -822,3 +825,5 @@ void bw_switching_pre_proc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/d_gain2p.cpp b/src/libs/libevs/lib_dec/d_gain2p.cpp
index ec9e016a..64160392 100644
--- a/src/libs/libevs/lib_dec/d_gain2p.cpp
+++ b/src/libs/libevs/lib_dec/d_gain2p.cpp
@@ -11,6 +11,9 @@
 #include "cnst.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
 * Mode2_gain_dec_mless
@@ -257,3 +260,5 @@ void decode_acelp_gains(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec2t32.cpp b/src/libs/libevs/lib_dec/dec2t32.cpp
index 26779324..cc928d6f 100644
--- a/src/libs/libevs/lib_dec/dec2t32.cpp
+++ b/src/libs/libevs/lib_dec/dec2t32.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*----------------------------------------------------------------------------------*
  * dec_acelp_2t32()
@@ -88,3 +91,5 @@ void dec_acelp_1t64(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec4t64.cpp b/src/libs/libevs/lib_dec/dec4t64.cpp
index 61060a8b..81de1076 100644
--- a/src/libs/libevs/lib_dec/dec4t64.cpp
+++ b/src/libs/libevs/lib_dec/dec4t64.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local functions
@@ -735,3 +738,5 @@ void D_ACELP_decode_43bit(unsigned short idxs[], float code[], int *pulsestrack)
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_LPD.cpp b/src/libs/libevs/lib_dec/dec_LPD.cpp
index 542c2ad9..ae63a632 100644
--- a/src/libs/libevs/lib_dec/dec_LPD.cpp
+++ b/src/libs/libevs/lib_dec/dec_LPD.cpp
@@ -13,6 +13,9 @@
 #include "basop_proto_func.h"
 #include "stat_com.h"
 
+namespace evs { 
+
+
 #if defined(_MSC_VER) && (_MSC_VER <= 1200)  /* disable global optimizations to overcome an internal compiler error */
 #pragma optimize("g", off)
 #endif
@@ -780,3 +783,5 @@ void decoder_LPD(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_ace.cpp b/src/libs/libevs/lib_dec/dec_ace.cpp
index 71392495..42f02783 100644
--- a/src/libs/libevs/lib_dec/dec_ace.cpp
+++ b/src/libs/libevs/lib_dec/dec_ace.cpp
@@ -10,6 +10,9 @@
 #include "options.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * decoder_acelp()
@@ -547,3 +550,5 @@ void decoder_acelp(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_acelp.cpp b/src/libs/libevs/lib_dec/dec_acelp.cpp
index 47297632..18ac83d4 100644
--- a/src/libs/libevs/lib_dec/dec_acelp.cpp
+++ b/src/libs/libevs/lib_dec/dec_acelp.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
 * Local functions
@@ -330,3 +333,5 @@ void fcb_pulse_track_joint_decode(unsigned short *idxs, int wordcnt, long unsign
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_acelp_tcx_main.cpp b/src/libs/libevs/lib_dec/dec_acelp_tcx_main.cpp
index d061c2e0..8d7a9374 100644
--- a/src/libs/libevs/lib_dec/dec_acelp_tcx_main.cpp
+++ b/src/libs/libevs/lib_dec/dec_acelp_tcx_main.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "options.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
 * decode_frame_type()
@@ -440,3 +443,5 @@ void dec_acelp_tcx_frame(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_amr_wb.cpp b/src/libs/libevs/lib_dec/dec_amr_wb.cpp
index 8ae36482..60232d3c 100644
--- a/src/libs/libevs/lib_dec/dec_amr_wb.cpp
+++ b/src/libs/libevs/lib_dec/dec_amr_wb.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * decod_amr_wb()
@@ -122,3 +125,5 @@ void decod_amr_wb(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_gen_voic.cpp b/src/libs/libevs/lib_dec/dec_gen_voic.cpp
index 990a1586..879b19e4 100644
--- a/src/libs/libevs/lib_dec/dec_gen_voic.cpp
+++ b/src/libs/libevs/lib_dec/dec_gen_voic.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * decod_gen_voic()
@@ -265,3 +268,5 @@ void decod_gen_voic(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_higher_acelp.cpp b/src/libs/libevs/lib_dec/dec_higher_acelp.cpp
index 2c0d690e..c611d660 100644
--- a/src/libs/libevs/lib_dec/dec_higher_acelp.cpp
+++ b/src/libs/libevs/lib_dec/dec_higher_acelp.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Transform domain contribution decoding
  *-----------------------------------------------------------------*/
@@ -166,3 +169,5 @@ float gain_dequant(             /* o:   decoded gain                  */
     return( gain );
 
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_nelp.cpp b/src/libs/libevs/lib_dec/dec_nelp.cpp
index 5422a3f1..c9c6010f 100644
--- a/src/libs/libevs/lib_dec/dec_nelp.cpp
+++ b/src/libs/libevs/lib_dec/dec_nelp.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
 * decod_nelp()
 *
@@ -55,3 +58,5 @@ void decod_nelp(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_pit_exc.cpp b/src/libs/libevs/lib_dec/dec_pit_exc.cpp
index 4c517eb8..3abf4eb4 100644
--- a/src/libs/libevs/lib_dec/dec_pit_exc.cpp
+++ b/src/libs/libevs/lib_dec/dec_pit_exc.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * dec_pit_exc()
@@ -194,3 +197,5 @@ void dec_pit_exc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_post.cpp b/src/libs/libevs/lib_dec/dec_post.cpp
index ab7daad8..2b393753 100644
--- a/src/libs/libevs/lib_dec/dec_post.cpp
+++ b/src/libs/libevs/lib_dec/dec_post.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local constants
  *---------------------------------------------------------------------*/
@@ -964,3 +967,5 @@ static void modify_pst_param(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_ppp.cpp b/src/libs/libevs/lib_dec/dec_ppp.cpp
index 0d043d1a..6c270b98 100644
--- a/src/libs/libevs/lib_dec/dec_ppp.cpp
+++ b/src/libs/libevs/lib_dec/dec_ppp.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------
  * decod_ppp()
  *
@@ -67,3 +70,5 @@ void decod_ppp(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_prm.cpp b/src/libs/libevs/lib_dec/dec_prm.cpp
index e6269bab..7f3c3c9a 100644
--- a/src/libs/libevs/lib_dec/dec_prm.cpp
+++ b/src/libs/libevs/lib_dec/dec_prm.cpp
@@ -12,6 +12,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * dec_prm_hm()
  *
@@ -943,3 +946,5 @@ void dec_prm(
     }
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_tcx.cpp b/src/libs/libevs/lib_dec/dec_tcx.cpp
index 3d50c874..40c2ec2a 100644
--- a/src/libs/libevs/lib_dec/dec_tcx.cpp
+++ b/src/libs/libevs/lib_dec/dec_tcx.cpp
@@ -11,6 +11,9 @@
 #include "stat_com.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * Local functions
@@ -1322,3 +1325,5 @@ static void IMDCT(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_tran.cpp b/src/libs/libevs/lib_dec/dec_tran.cpp
index f36d127a..ab5872e5 100644
--- a/src/libs/libevs/lib_dec/dec_tran.cpp
+++ b/src/libs/libevs/lib_dec/dec_tran.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * decod_tran()
  *
@@ -164,3 +167,5 @@ void decod_tran(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dec_uv.cpp b/src/libs/libevs/lib_dec/dec_uv.cpp
index 20534432..79b95cb3 100644
--- a/src/libs/libevs/lib_dec/dec_uv.cpp
+++ b/src/libs/libevs/lib_dec/dec_uv.cpp
@@ -7,6 +7,9 @@
 #include <math.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * decod_unvoiced()
  *
@@ -80,3 +83,5 @@ void decod_unvoiced(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/decision_matrix_dec.cpp b/src/libs/libevs/lib_dec/decision_matrix_dec.cpp
index 7e2deaf6..5c0ed0e2 100644
--- a/src/libs/libevs/lib_dec/decision_matrix_dec.cpp
+++ b/src/libs/libevs/lib_dec/decision_matrix_dec.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * decision_matrix_dec()
  *
@@ -523,3 +526,5 @@ void decision_matrix_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dlpc_avq.cpp b/src/libs/libevs/lib_dec/dlpc_avq.cpp
index f6e666b6..3882934d 100644
--- a/src/libs/libevs/lib_dec/dlpc_avq.cpp
+++ b/src/libs/libevs/lib_dec/dlpc_avq.cpp
@@ -7,6 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+namespace evs { 
+
+
 
 /*------------------------------------------------------------------*
 * dlpc_avq()
@@ -244,3 +247,5 @@ int decode_lpc_avq(
 
     return st->next_bit_pos - start_bit_pos;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/dlpc_stoch.cpp b/src/libs/libevs/lib_dec/dlpc_stoch.cpp
index 548050d3..020daced 100644
--- a/src/libs/libevs/lib_dec/dlpc_stoch.cpp
+++ b/src/libs/libevs/lib_dec/dlpc_stoch.cpp
@@ -10,6 +10,9 @@
 #include "rom_com.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*------------------------------------------------------------------*
 * lpc_unquantize()
 *
@@ -103,3 +106,5 @@ void lpc_unquantize(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/er_dec_acelp.cpp b/src/libs/libevs/lib_dec/er_dec_acelp.cpp
index 4fe464e9..2fc4d554 100644
--- a/src/libs/libevs/lib_dec/er_dec_acelp.cpp
+++ b/src/libs/libevs/lib_dec/er_dec_acelp.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "options.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
 * con_acelp()
@@ -690,3 +693,5 @@ void con_acelp(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/er_dec_tcx.cpp b/src/libs/libevs/lib_dec/er_dec_tcx.cpp
index f91b96f2..c7c2796b 100644
--- a/src/libs/libevs/lib_dec/er_dec_tcx.cpp
+++ b/src/libs/libevs/lib_dec/er_dec_tcx.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "rom_dec.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * con_tcx()
@@ -547,3 +550,5 @@ void con_tcx(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/er_scale_syn.cpp b/src/libs/libevs/lib_dec/er_scale_syn.cpp
index 96132f26..d3dd53bd 100644
--- a/src/libs/libevs/lib_dec/er_scale_syn.cpp
+++ b/src/libs/libevs/lib_dec/er_scale_syn.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 
 
 
@@ -101,3 +104,5 @@ float Damping_fact( const short coder_type, int nbLostCmpt, short last_good, flo
     return alpha;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/er_sync_exc.cpp b/src/libs/libevs/lib_dec/er_sync_exc.cpp
index ae77a834..30b58432 100644
--- a/src/libs/libevs/lib_dec/er_sync_exc.cpp
+++ b/src/libs/libevs/lib_dec/er_sync_exc.cpp
@@ -11,6 +11,9 @@
 #include <limits.h>
 #include <assert.h>
 
+namespace evs { 
+
+
 
 #define NB_PULSES_MAX                         15
 
@@ -300,3 +303,5 @@ void PulseResynchronization(float const * src_exc, float * dst_exc, int nFrameLe
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/er_util.cpp b/src/libs/libevs/lib_dec/er_util.cpp
index b7c5fb5a..96fe8e6c 100644
--- a/src/libs/libevs/lib_dec/er_util.cpp
+++ b/src/libs/libevs/lib_dec/er_util.cpp
@@ -8,6 +8,9 @@
 #include "cnst.h"
 #include "stat_com.h"
 
+namespace evs { 
+
+
 
 /* PLC: [Common: Fade-out]
  * PLC: and for PLC fade out */
@@ -285,3 +288,5 @@ int GetPLCModeDecision(Decoder_State *st   /* i/o:    decoder memory state point
     }
     return core;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/evs_dec.cpp b/src/libs/libevs/lib_dec/evs_dec.cpp
index f5cae6e1..2a19e84b 100644
--- a/src/libs/libevs/lib_dec/evs_dec.cpp
+++ b/src/libs/libevs/lib_dec/evs_dec.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * evs_dec()
  *
@@ -1022,3 +1025,5 @@ void evs_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/fd_cng_dec.cpp b/src/libs/libevs/lib_dec/fd_cng_dec.cpp
index 222d9a7b..c42550cb 100644
--- a/src/libs/libevs/lib_dec/fd_cng_dec.cpp
+++ b/src/libs/libevs/lib_dec/fd_cng_dec.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 #define DELTA_MASKING_NOISE 1e-20f
 
 /*-------------------------------------------------------------------
@@ -1131,3 +1134,5 @@ void generate_masking_noise_mdct(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/gain_dec.cpp b/src/libs/libevs/lib_dec/gain_dec.cpp
index 7c6c3cac..46b6621e 100644
--- a/src/libs/libevs/lib_dec/gain_dec.cpp
+++ b/src/libs/libevs/lib_dec/gain_dec.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * Es_pred_dec()
@@ -650,3 +653,5 @@ float gain_dec_gaus(            /* o  : quantized codebook gain         */
 
     return gain;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/gaus_dec.cpp b/src/libs/libevs/lib_dec/gaus_dec.cpp
index 1e8947fa..bab80f87 100644
--- a/src/libs/libevs/lib_dec/gaus_dec.cpp
+++ b/src/libs/libevs/lib_dec/gaus_dec.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local functions
  *---------------------------------------------------------------------*/
@@ -232,3 +235,5 @@ void gaus_L2_dec(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/gs_dec.cpp b/src/libs/libevs/lib_dec/gs_dec.cpp
index beac5220..a832a02f 100644
--- a/src/libs/libevs/lib_dec/gs_dec.cpp
+++ b/src/libs/libevs/lib_dec/gs_dec.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * decod_audio()
  *
@@ -511,3 +514,5 @@ void gsc_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/gs_dec_amr_wb.cpp b/src/libs/libevs/lib_dec/gs_dec_amr_wb.cpp
index d98076e4..18b1ce2b 100644
--- a/src/libs/libevs/lib_dec/gs_dec_amr_wb.cpp
+++ b/src/libs/libevs/lib_dec/gs_dec_amr_wb.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local constants
@@ -391,3 +394,5 @@ void improv_amr_wb_gs(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/hdecnrm.cpp b/src/libs/libevs/lib_dec/hdecnrm.cpp
index a3a15bc0..c566ef21 100644
--- a/src/libs/libevs/lib_dec/hdecnrm.cpp
+++ b/src/libs/libevs/lib_dec/hdecnrm.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "rom_dec.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*/
 /*  Function  decode_huff_context                                           */
 /*  ~~~~~~~~~~~~~~~~~                                                       */
@@ -366,3 +369,5 @@ void hdecnrm_tran(
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/hf_synth.cpp b/src/libs/libevs/lib_dec/hf_synth.cpp
index d44ba06d..d08f4301 100644
--- a/src/libs/libevs/lib_dec/hf_synth.cpp
+++ b/src/libs/libevs/lib_dec/hf_synth.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local functions
  *---------------------------------------------------------------------*/
@@ -1209,3 +1212,5 @@ static void filt_6k_7k(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/hq_classifier_dec.cpp b/src/libs/libevs/lib_dec/hq_classifier_dec.cpp
index be0a2455..f195cf14 100644
--- a/src/libs/libevs/lib_dec/hq_classifier_dec.cpp
+++ b/src/libs/libevs/lib_dec/hq_classifier_dec.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * hq_classifier_dec()
  *
@@ -62,3 +65,5 @@ short hq_classifier_dec(            /* o  : Consumed bits                   */
 
     return bits;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/hq_conf_fec.cpp b/src/libs/libevs/lib_dec/hq_conf_fec.cpp
index 3bb96361..1ec9f821 100644
--- a/src/libs/libevs/lib_dec/hq_conf_fec.cpp
+++ b/src/libs/libevs/lib_dec/hq_conf_fec.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * hq_configure_bfi()
@@ -34,3 +37,5 @@ void hq_configure_bfi(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/hq_core_dec.cpp b/src/libs/libevs/lib_dec/hq_core_dec.cpp
index b6abfd38..f48c93d9 100644
--- a/src/libs/libevs/lib_dec/hq_core_dec.cpp
+++ b/src/libs/libevs/lib_dec/hq_core_dec.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------
  *  hq_core_dec()
  *
@@ -363,3 +366,5 @@ void hq_core_dec(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/hq_env_dec.cpp b/src/libs/libevs/lib_dec/hq_env_dec.cpp
index 16625066..941122fc 100644
--- a/src/libs/libevs/lib_dec/hq_env_dec.cpp
+++ b/src/libs/libevs/lib_dec/hq_env_dec.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*------------------------------------------------------------------------*
  * decode_envelope_indices()
  *
@@ -164,3 +167,5 @@ void dequantize_norms(         /* o  : Number of bits                    */
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/hq_hr_dec.cpp b/src/libs/libevs/lib_dec/hq_hr_dec.cpp
index a90a4eea..1276faa0 100644
--- a/src/libs/libevs/lib_dec/hq_hr_dec.cpp
+++ b/src/libs/libevs/lib_dec/hq_hr_dec.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * hq_pred_hb_bws()
  *
@@ -269,3 +272,5 @@ void hq_hr_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/hq_lr_dec.cpp b/src/libs/libevs/lib_dec/hq_lr_dec.cpp
index 4419c539..18f6a4da 100644
--- a/src/libs/libevs/lib_dec/hq_lr_dec.cpp
+++ b/src/libs/libevs/lib_dec/hq_lr_dec.cpp
@@ -10,6 +10,9 @@
 #include "stl.h"
 #include "basop_util.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * Local functions
  *--------------------------------------------------------------------------*/
@@ -1290,3 +1293,5 @@ static void spt_shorten_domain_set_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/igf_dec.cpp b/src/libs/libevs/lib_dec/igf_dec.cpp
index b64ff247..9b76e873 100644
--- a/src/libs/libevs/lib_dec/igf_dec.cpp
+++ b/src/libs/libevs/lib_dec/igf_dec.cpp
@@ -13,6 +13,9 @@
 #include "cnst.h"
 #include "stat_dec.h"
 
+namespace evs { 
+
+
 /**********************************************************************/ /*
 measures TCX noise
 **************************************************************************/
@@ -943,3 +946,5 @@ void IGFDecRestoreTCX10SubFrameData(const IGF_DEC_INSTANCE_HANDLE    hInstance,
     hInstance->flatteningTrigger = hPrivateData->igf_flatteningTrigger_subframe[subFrameIdx];
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/igf_scf_dec.cpp b/src/libs/libevs/lib_dec/igf_scf_dec.cpp
index 5c792d5e..15f65d60 100644
--- a/src/libs/libevs/lib_dec/igf_scf_dec.cpp
+++ b/src/libs/libevs/lib_dec/igf_scf_dec.cpp
@@ -11,6 +11,9 @@
 #include "options.h"
 #include "stat_dec.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * IGFSCFDecoderOpen()
@@ -324,3 +327,5 @@ void IGFSCFDecoderDecode(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/init_dec.cpp b/src/libs/libevs/lib_dec/init_dec.cpp
index 89c20852..77e8a7b3 100644
--- a/src/libs/libevs/lib_dec/init_dec.cpp
+++ b/src/libs/libevs/lib_dec/init_dec.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include <string.h>
 
+namespace evs { 
+
+
 
 /*----------------------------------------------------------------------*
  * init_decoder()
@@ -653,3 +656,5 @@ void destroy_decoder(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/inov_dec.cpp b/src/libs/libevs/lib_dec/inov_dec.cpp
index 3cea5784..ac881e21 100644
--- a/src/libs/libevs/lib_dec/inov_dec.cpp
+++ b/src/libs/libevs/lib_dec/inov_dec.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*----------------------------------------------------------------------*
  * inov_decode()
@@ -107,3 +110,5 @@ void inov_decode(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/jbm_jb4_circularbuffer.cpp b/src/libs/libevs/lib_dec/jbm_jb4_circularbuffer.cpp
index 9ec52eb2..d0ee23e3 100644
--- a/src/libs/libevs/lib_dec/jbm_jb4_circularbuffer.cpp
+++ b/src/libs/libevs/lib_dec/jbm_jb4_circularbuffer.cpp
@@ -11,6 +11,9 @@
 #include "options.h"
 /* local includes */
 #include "jbm_jb4_circularbuffer.h"
+
+namespace evs { 
+
 /* instrumentation */
 
 
@@ -422,3 +425,5 @@ static void JB4_CIRCULARBUFFER_calcPercentile( JB4_CIRCULARBUFFER_ELEMENT *eleme
 
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/jbm_jb4_circularbuffer.h b/src/libs/libevs/lib_dec/jbm_jb4_circularbuffer.h
index 1e38962a..9f9bad5e 100644
--- a/src/libs/libevs/lib_dec/jbm_jb4_circularbuffer.h
+++ b/src/libs/libevs/lib_dec/jbm_jb4_circularbuffer.h
@@ -7,6 +7,9 @@
 #ifndef JBM_JB4_CIRCULARBUFFER_H
 #define JBM_JB4_CIRCULARBUFFER_H JBM_JB4_CIRCULARBUFFER_H
 
+namespace evs {
+
+
 /** handle for circular buffer (FIFO) with fixed capacity */
 typedef struct JB4_CIRCULARBUFFER *JB4_CIRCULARBUFFER_HANDLE;
 /** type of circular buffer elements */
@@ -48,4 +51,6 @@ void JB4_CIRCULARBUFFER_Max( const JB4_CIRCULARBUFFER_HANDLE h, JB4_CIRCULARBUFF
 void JB4_CIRCULARBUFFER_MinAndPercentile( const JB4_CIRCULARBUFFER_HANDLE h, unsigned int nElementsToIgnore,
         JB4_CIRCULARBUFFER_ELEMENT *pMin, JB4_CIRCULARBUFFER_ELEMENT *pPercentile );
 
+} // end of namespace
+
 #endif /* JBM_JB4_CIRCULARBUFFER_H */
diff --git a/src/libs/libevs/lib_dec/jbm_jb4_inputbuffer.cpp b/src/libs/libevs/lib_dec/jbm_jb4_inputbuffer.cpp
index 7d21843b..35be1e4e 100644
--- a/src/libs/libevs/lib_dec/jbm_jb4_inputbuffer.cpp
+++ b/src/libs/libevs/lib_dec/jbm_jb4_inputbuffer.cpp
@@ -14,6 +14,9 @@
 /* local includes */
 #include "jbm_jb4_inputbuffer.h"
 
+namespace evs { 
+
+
 
 /** input buffer with fixed capacity */
 struct JB4_INPUTBUFFER
@@ -304,3 +307,5 @@ unsigned int JB4_INPUTBUFFER_Size( const JB4_INPUTBUFFER_HANDLE h )
     return ret;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/jbm_jb4_inputbuffer.h b/src/libs/libevs/lib_dec/jbm_jb4_inputbuffer.h
index 585b396f..cd82a34c 100644
--- a/src/libs/libevs/lib_dec/jbm_jb4_inputbuffer.h
+++ b/src/libs/libevs/lib_dec/jbm_jb4_inputbuffer.h
@@ -9,6 +9,7 @@
 
 #include "jbm_types.h"
 
+namespace evs {
 /** Handle for RTP input buffer with fixed capacity. */
 /** Implemented as priority queue using an array based sorted circular buffer. */
 typedef struct JB4_INPUTBUFFER *JB4_INPUTBUFFER_HANDLE;
@@ -45,4 +46,6 @@ int JB4_INPUTBUFFER_IsEmpty( const JB4_INPUTBUFFER_HANDLE h );
 int JB4_INPUTBUFFER_IsFull( const JB4_INPUTBUFFER_HANDLE h );
 unsigned int JB4_INPUTBUFFER_Size( const JB4_INPUTBUFFER_HANDLE h );
 
+} // end of namespace
+
 #endif /* JBM_JB4_INPUTBUFFER_H */
diff --git a/src/libs/libevs/lib_dec/jbm_jb4_jmf.cpp b/src/libs/libevs/lib_dec/jbm_jb4_jmf.cpp
index 0761651a..6b36329d 100644
--- a/src/libs/libevs/lib_dec/jbm_jb4_jmf.cpp
+++ b/src/libs/libevs/lib_dec/jbm_jb4_jmf.cpp
@@ -12,6 +12,9 @@
 /* local includes */
 #include "jbm_jb4_jmf.h"
 #include "jbm_jb4_circularbuffer.h"
+
+namespace evs { 
+
 /* instrumentation */
 
 
@@ -261,3 +264,5 @@ static void JB4_JMF_popFront( JB4_JMF_HANDLE h )
 
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/jbm_jb4_jmf.h b/src/libs/libevs/lib_dec/jbm_jb4_jmf.h
index 3b1e1f43..b281e24f 100644
--- a/src/libs/libevs/lib_dec/jbm_jb4_jmf.h
+++ b/src/libs/libevs/lib_dec/jbm_jb4_jmf.h
@@ -9,6 +9,8 @@
 
 #include "jbm_types.h"
 
+namespace evs {
+
 /** handle for jitter measure fifo - a fifo used for windowed measure of network status */
 typedef struct JB4_JMF *JB4_JMF_HANDLE;
 
@@ -39,4 +41,6 @@ int JB4_JMF_Jitter( const JB4_JMF_HANDLE h, uint32_t *jitter );
 int JB4_JMF_MinOffset( const JB4_JMF_HANDLE h, int32_t *offset );
 /**@} */
 
+} // end of namespace
+
 #endif /* JBM_JB4_JMF_H */
diff --git a/src/libs/libevs/lib_dec/jbm_jb4sb.cpp b/src/libs/libevs/lib_dec/jbm_jb4sb.cpp
index c25fde51..251be9ea 100644
--- a/src/libs/libevs/lib_dec/jbm_jb4sb.cpp
+++ b/src/libs/libevs/lib_dec/jbm_jb4sb.cpp
@@ -18,6 +18,9 @@
 #include "jbm_jb4sb.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 #define JB4_MIN(a,b)  ((a)>(b) ? (b) : (a))
 #define JB4_MAX(a,b)  ((a)>(b) ? (a) : (b))
@@ -1385,3 +1388,5 @@ static int JB4_inputBufferCompareFunction( const JB4_INPUTBUFFER_ELEMENT newElem
     }
     return result;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/jbm_jb4sb.h b/src/libs/libevs/lib_dec/jbm_jb4sb.h
index 61bc6e7b..7ab0b2a8 100644
--- a/src/libs/libevs/lib_dec/jbm_jb4sb.h
+++ b/src/libs/libevs/lib_dec/jbm_jb4sb.h
@@ -9,6 +9,8 @@
 
 #include "jbm_types.h"
 
+namespace evs {
+
 /** handle for jitter buffer */
 typedef struct JB4* JB4_HANDLE;
 
@@ -65,4 +67,6 @@ short JB4_FECoffset(JB4_HANDLE h);
 /** function to get the number of data units contained in the buffer */
 unsigned int JB4_bufferedDataUnits( const JB4_HANDLE h );
 
+} // end of namespace
+
 #endif /* JBM_JB4SB_H */
diff --git a/src/libs/libevs/lib_dec/jbm_pcmdsp_apa.cpp b/src/libs/libevs/lib_dec/jbm_pcmdsp_apa.cpp
index 6452c314..09711b33 100644
--- a/src/libs/libevs/lib_dec/jbm_pcmdsp_apa.cpp
+++ b/src/libs/libevs/lib_dec/jbm_pcmdsp_apa.cpp
@@ -18,6 +18,9 @@
 #include "jbm_types.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 
 /*
 ********************************************************************************
@@ -1300,3 +1303,5 @@ static bool_t extend_frm (apa_state_t * ps,
     return 0;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/jbm_pcmdsp_apa.h b/src/libs/libevs/lib_dec/jbm_pcmdsp_apa.h
index ce9f7ba3..69f3566c 100644
--- a/src/libs/libevs/lib_dec/jbm_pcmdsp_apa.h
+++ b/src/libs/libevs/lib_dec/jbm_pcmdsp_apa.h
@@ -9,6 +9,8 @@
 
 #include "jbm_types.h"
 
+namespace evs {
+
 /*
 ********************************************************************************
 *                         DEFINITION OF CONSTANTS
@@ -102,4 +104,6 @@ uint8_t apa_exec(
     int16_t       a_out[],
     uint16_t     *l_out);
 
+} // end of namespace
+
 #endif /* JBM_PCMDSP_APA_H */
diff --git a/src/libs/libevs/lib_dec/jbm_pcmdsp_fifo.cpp b/src/libs/libevs/lib_dec/jbm_pcmdsp_fifo.cpp
index 3f196ee3..a2cde5e8 100644
--- a/src/libs/libevs/lib_dec/jbm_pcmdsp_fifo.cpp
+++ b/src/libs/libevs/lib_dec/jbm_pcmdsp_fifo.cpp
@@ -12,6 +12,9 @@
 /* local headers */
 #include "jbm_pcmdsp_fifo.h"
 
+namespace evs { 
+
+
 
 /** Ringbuffer (FIFO) with fixed capacity for audio samples. */
 struct PCMDSP_FIFO
@@ -161,3 +164,5 @@ unsigned int pcmdsp_fifo_nReadableSamples( const PCMDSP_FIFO_HANDLE h )
     return h->size;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/jbm_pcmdsp_fifo.h b/src/libs/libevs/lib_dec/jbm_pcmdsp_fifo.h
index 5e90a3d5..a56c8bfe 100644
--- a/src/libs/libevs/lib_dec/jbm_pcmdsp_fifo.h
+++ b/src/libs/libevs/lib_dec/jbm_pcmdsp_fifo.h
@@ -10,6 +10,9 @@
 /* local headers */
 #include "jbm_types.h"
 
+namespace evs {
+
+
 /** handle for FIFO with fixed capacity */
 typedef struct PCMDSP_FIFO *PCMDSP_FIFO_HANDLE;
 
@@ -41,4 +44,6 @@ int pcmdsp_fifo_read( PCMDSP_FIFO_HANDLE h, unsigned int nSamplesPerChannel, uin
 /** Returns the number of samples per channel that can be read (number of currently stored samples). */
 unsigned int pcmdsp_fifo_nReadableSamples( const PCMDSP_FIFO_HANDLE h );
 
+} // end of namespace
+
 #endif /* JBM_PCMDSP_FIFO_H */
diff --git a/src/libs/libevs/lib_dec/jbm_pcmdsp_similarityestimation.cpp b/src/libs/libevs/lib_dec/jbm_pcmdsp_similarityestimation.cpp
index 4ca89efa..f62b2e52 100644
--- a/src/libs/libevs/lib_dec/jbm_pcmdsp_similarityestimation.cpp
+++ b/src/libs/libevs/lib_dec/jbm_pcmdsp_similarityestimation.cpp
@@ -11,6 +11,9 @@
 /* local headers */
 #include "jbm_pcmdsp_similarityestimation.h"
 
+namespace evs { 
+
+
 
 /* Calculates cross correlation coefficient for template segment. */
 Float cross_correlation_self(const int16_t * signal,
@@ -99,3 +102,5 @@ bool_t isSilence(const int16_t * signal, uint32_t len, uint32_t segments)
     return true;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/jbm_pcmdsp_similarityestimation.h b/src/libs/libevs/lib_dec/jbm_pcmdsp_similarityestimation.h
index 8f32014d..8c7daecb 100644
--- a/src/libs/libevs/lib_dec/jbm_pcmdsp_similarityestimation.h
+++ b/src/libs/libevs/lib_dec/jbm_pcmdsp_similarityestimation.h
@@ -10,6 +10,8 @@
 /* local headers */
 #include "jbm_types.h"
 
+namespace evs {
+
 /*
 ********************************************************************************
 *
@@ -117,4 +119,6 @@ Float normalized_cross_correlation_self(const int16_t * signal,
 /* Splits the signal into segments and checks if all of them have very low energy. */
 bool_t isSilence(const int16_t * signal, uint32_t len, uint32_t segments);
 
+}
+
 #endif /* JBM_PCMDSP_SIMILARITYESTIMATION_H */
diff --git a/src/libs/libevs/lib_dec/jbm_pcmdsp_window.cpp b/src/libs/libevs/lib_dec/jbm_pcmdsp_window.cpp
index 4c89574a..2b334a46 100644
--- a/src/libs/libevs/lib_dec/jbm_pcmdsp_window.cpp
+++ b/src/libs/libevs/lib_dec/jbm_pcmdsp_window.cpp
@@ -8,6 +8,9 @@
 #include "jbm_pcmdsp_window.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------------*
 * hannWindow()
 *
@@ -86,3 +89,5 @@ void overlapAdd(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/jbm_pcmdsp_window.h b/src/libs/libevs/lib_dec/jbm_pcmdsp_window.h
index b97e026e..022d2e5c 100644
--- a/src/libs/libevs/lib_dec/jbm_pcmdsp_window.h
+++ b/src/libs/libevs/lib_dec/jbm_pcmdsp_window.h
@@ -10,6 +10,8 @@
 /* local headers */
 #include "jbm_types.h"
 
+namespace evs {
+
 /*! Generates a Hann window (cos-shaped) of length n.
  *  Roughly:
  *
@@ -32,4 +34,5 @@ void hannWindow(uint16_t n, Float * w);
 void overlapAdd(const int16_t *fadeOut, const int16_t *fadeIn, int16_t *out,
                 uint16_t n, uint16_t nChannels, const float *fadeOutWin, const float *fadeInWin);
 
+} // end of namespace
 #endif /* JBM_PCMDSP_WINDOW_H */
diff --git a/src/libs/libevs/lib_dec/jbm_types.h b/src/libs/libevs/lib_dec/jbm_types.h
index 2f44448b..8918fb80 100644
--- a/src/libs/libevs/lib_dec/jbm_types.h
+++ b/src/libs/libevs/lib_dec/jbm_types.h
@@ -7,6 +7,8 @@
 #ifndef JBM_TYPES_H
 #define JBM_TYPES_H JBM_TYPES_H
 
+namespace evs {
+
 /**************************
 * internally used types
 ***************************/
@@ -65,6 +67,8 @@ typedef unsigned char      bool_t;
 
 typedef float              Float;
 
+} // end of namespace
+
 #include "typedef.h"
 
 #endif /* JBM_TYPES_H */
diff --git a/src/libs/libevs/lib_dec/lead_deindexing.cpp b/src/libs/libevs/lib_dec/lead_deindexing.cpp
index 50eb9da7..776bab85 100644
--- a/src/libs/libevs/lib_dec/lead_deindexing.cpp
+++ b/src/libs/libevs/lib_dec/lead_deindexing.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "rom_dec.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local function prototype
  *-------------------------------------------------------------------*/
@@ -230,3 +233,5 @@ void fcb_decode_pos(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/lp_exc_d.cpp b/src/libs/libevs/lib_dec/lp_exc_d.cpp
index 3a01c6ae..ad6d6e1b 100644
--- a/src/libs/libevs/lib_dec/lp_exc_d.cpp
+++ b/src/libs/libevs/lib_dec/lp_exc_d.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * lp_filt_exc_dec()
  *
@@ -75,3 +78,5 @@ void lp_filt_exc_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/lsf_dec.cpp b/src/libs/libevs/lib_dec/lsf_dec.cpp
index 96b243bc..7995617d 100644
--- a/src/libs/libevs/lib_dec/lsf_dec.cpp
+++ b/src/libs/libevs/lib_dec/lsf_dec.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local functions
  *---------------------------------------------------------------------*/
@@ -706,3 +709,5 @@ static void dqlsf_CNG(
     }
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/lsf_msvq_ma_dec.cpp b/src/libs/libevs/lib_dec/lsf_msvq_ma_dec.cpp
index 47923a51..fb937ac3 100644
--- a/src/libs/libevs/lib_dec/lsf_msvq_ma_dec.cpp
+++ b/src/libs/libevs/lib_dec/lsf_msvq_ma_dec.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * lsf_msvq_ma_decprm()
  *
@@ -260,3 +263,5 @@ int dec_lsf_tcxlpc(          /* (O) number of bits read */
     return st->next_bit_pos - start_bit_pos;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/nelp_dec.cpp b/src/libs/libevs/lib_dec/nelp_dec.cpp
index 0038fd50..0ad21315 100644
--- a/src/libs/libevs/lib_dec/nelp_dec.cpp
+++ b/src/libs/libevs/lib_dec/nelp_dec.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * nelp_decoder()
  *
@@ -181,3 +184,5 @@ void nelp_decoder(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/peak_vq_dec.cpp b/src/libs/libevs/lib_dec/peak_vq_dec.cpp
index dde9f3c3..6ce504bd 100644
--- a/src/libs/libevs/lib_dec/peak_vq_dec.cpp
+++ b/src/libs/libevs/lib_dec/peak_vq_dec.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*------------------------------------------------------------------------*
  * Local functions
  *------------------------------------------------------------------------*/
@@ -501,3 +504,5 @@ static short sparse_dec_pos(
 
     return bits;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/pit_dec.cpp b/src/libs/libevs/lib_dec/pit_dec.cpp
index 5a2dcd3f..fec3a6e9 100644
--- a/src/libs/libevs/lib_dec/pit_dec.cpp
+++ b/src/libs/libevs/lib_dec/pit_dec.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "options.h"
 
+namespace evs { 
+
+
 
 /*----------------------------------------------------------*
  * pit_decode()
@@ -783,3 +786,5 @@ void Mode2_delta_pit_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/pitch_extr.cpp b/src/libs/libevs/lib_dec/pitch_extr.cpp
index b165a679..cff97145 100644
--- a/src/libs/libevs/lib_dec/pitch_extr.cpp
+++ b/src/libs/libevs/lib_dec/pitch_extr.cpp
@@ -11,6 +11,9 @@
 #include "options.h"
 #include "basop_util.h"
 
+namespace evs { 
+
+
 
 
 
@@ -296,3 +299,5 @@ void get_subframe_pitch(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/post_dec.cpp b/src/libs/libevs/lib_dec/post_dec.cpp
index d92c760a..547db490 100644
--- a/src/libs/libevs/lib_dec/post_dec.cpp
+++ b/src/libs/libevs/lib_dec/post_dec.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * Function prototypes
@@ -431,3 +434,5 @@ void cldfb_synth_set_bandsToZero(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/ppp_dec.cpp b/src/libs/libevs/lib_dec/ppp_dec.cpp
index 321fbf54..ee6d30b5 100644
--- a/src/libs/libevs/lib_dec/ppp_dec.cpp
+++ b/src/libs/libevs/lib_dec/ppp_dec.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------
  * ppp_quarter_decoder()
  *
@@ -74,3 +77,5 @@ void ppp_quarter_decoder(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/pvq_core_dec.cpp b/src/libs/libevs/lib_dec/pvq_core_dec.cpp
index bb84433c..1a13435b 100644
--- a/src/libs/libevs/lib_dec/pvq_core_dec.cpp
+++ b/src/libs/libevs/lib_dec/pvq_core_dec.cpp
@@ -11,6 +11,9 @@
 #include "prot.h"
 #include "stl.h"
 
+namespace evs { 
+
+
 static short get_pvq_splits( Decoder_State *st, const short band_bits, const short sfmsize, short *bits );
 
 static  void densitySymbolIndexDecode(Decoder_State *st,  short density, short  opp_sz, short  near_sz,short *index_phi);
@@ -426,3 +429,5 @@ static short get_pvq_splits(              /* o  : Number of segments           *
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/pvq_decode.cpp b/src/libs/libevs/lib_dec/pvq_decode.cpp
index d7b59b59..873a2c26 100644
--- a/src/libs/libevs/lib_dec/pvq_decode.cpp
+++ b/src/libs/libevs/lib_dec/pvq_decode.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "math.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Function pvq_decode()                                             *
@@ -72,3 +75,5 @@ void pvq_decode(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/range_dec.cpp b/src/libs/libevs/lib_dec/range_dec.cpp
index 9ab745ed..b643efeb 100644
--- a/src/libs/libevs/lib_dec/range_dec.cpp
+++ b/src/libs/libevs/lib_dec/range_dec.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 static short rc_dec_read( Decoder_State *st );
 
@@ -190,3 +193,5 @@ static short rc_dec_read(Decoder_State *st)
     }
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/re8_dec.cpp b/src/libs/libevs/lib_dec/re8_dec.cpp
index 48c9d13a..4b21a322 100644
--- a/src/libs/libevs/lib_dec/re8_dec.cpp
+++ b/src/libs/libevs/lib_dec/re8_dec.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Function prototypes
  *-------------------------------------------------------------------*/
@@ -70,3 +73,5 @@ void re8_dec(int n, long I, int k[], int y[])
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/rom_dec.cpp b/src/libs/libevs/lib_dec/rom_dec.cpp
index 86f35d0d..c97fdcfa 100644
--- a/src/libs/libevs/lib_dec/rom_dec.cpp
+++ b/src/libs/libevs/lib_dec/rom_dec.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 /*----------------------------------------------------------------------------------*
  * LP filter for filtering periodic part of excitation in artificial onset
  * construction after frame error concealment
@@ -212,3 +215,5 @@ const float w_hamm_sana16k_2[L_PROT_HAMM_LEN2_16k] =
 const float h_high3_32[L_FIR_FER2]   = {-0.0517f, -0.0587f, -0.0820f, -0.1024f, -0.1164f,  0.8786f, -0.1164f, -0.1024f, -0.0820f, -0.0587f, -0.0517f};
 const float h_high3_16[L_FIR_FER2]   = { 0.f,     -0.0205f, -0.0651f, -0.1256f, -0.1792f,  0.8028f, -0.1792f, -0.1256f, -0.0651f, -0.0205f,  0.f    };
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/rom_dec.h b/src/libs/libevs/lib_dec/rom_dec.h
index 0a895a9b..08288a34 100644
--- a/src/libs/libevs/lib_dec/rom_dec.h
+++ b/src/libs/libevs/lib_dec/rom_dec.h
@@ -9,7 +9,213 @@
 #include "options.h"
 #include "cnst.h"
 
-extern const float h_low[];                      /* LP filter for filtering periodic part of excitation in artificial onset construction after FEC */
+namespace evs {
+
+const float h_low[5] = {  -0.0125f,  0.1090f, 0.7813f,  0.1090f, -0.0125f };
+
+/* RE8 related tables */
+const int mult_avq_tab[7] = {1,1,1,342,1,1,171};
+const int shift_avq_tab[7] = {0,0,1, 10,2,0, 10};
+
+const short hntable[55]=
+{
+    0X13,  -0X10,  -0X0F,  -0X11,   0X51,   0X61,  -0X0E,  -0X12,   0X51,   0X61,
+    -0X13,  -0X0D,   0X51,   0X62,  -0X14,   0X81,  -0X0C,   0X81,  -0X15,  -0X17,
+    0X71,   0X81,  -0X18,  -0X16,   0X71,  -0X0B,   0X71,  -0X1A,   0X71,  -0X09,
+    -0X1B,  -0X0A,  -0X19,   0X41,  -0X1C,  -0X08,   0X31,   0X41,  -0X1D,  -0X06,
+    0X31,   0X41,  -0X07,   0X41,  -0X05,  -0X1E,  -0X04,  -0X1F,   0X11,  -0X03,
+    0X11,  -0X02,   0X11,  -0X01,   0X00
+};
+
+const short hetable[57]=
+{
+    0X12,   0X41,  -0X0F,   0X41,  -0X10,  -0X0E,   0X31,  -0X11,   0X31,   0X41,
+    -0X0D,   0X41,  -0X12,   0X42,  -0x0C,   0X61,  -0X13,   0X61,   0X71,  -0X0A,
+    0X71,  -0X0B,  -0X14,  -0X15,   0X51,   0X61,  -0X16,  -0X09,   0X51,   0X61,
+    -0X17,   0X62,  -0X08,   0X81,  -0X07,   0X81,  -0X18,  -0X05,  -0X04,  -0X03,
+    0X51,  -0X06,   0X51,  -0X19,   0X51,  -0X01,  -0X1C,  -0X02,  -0X1B,  -0X1A,
+    0X11,   0X00,   0X11,  -0X1D,   0X11,  -0X1E,  -0X1F
+};
+
+const short hestable[15]=
+{
+    0X11,  0X21, -0X04, 0X21, -0X03, 0X21, -0X02, -0X05, 0X11, 0X21, -0X01, -0X06,
+    0X11, -0X07, -0X00
+};
+
+const float lsf_tab[LPC_SHB_ORDER] =
+{
+    0.070633653f, 0.11962059f, 0.16925794f, 0.20627696f, 0.24345790f,
+    0.31293656f,  0.34594478f,	0.38072862f, 0.410051247f, 0.44525622f
+};
+
+/* frequency group start bins for transient analysis */
+/* 125 375 750 1250 2000 4000 8000 16000 24000 */
+const short gw[LGW_MAX] =    {  1,  3,  6,  10,  16,  32,  64,  128, 192 };
+
+/* 31.25 343.75 718.75 1218.75 1968.75 4000 8000 16000 24000 */
+const short gwlpr[LGW_MAX] = {  1,   3*QUOT_LPR_LTR-1, 6*QUOT_LPR_LTR-1, 10*QUOT_LPR_LTR-1, 16*QUOT_LPR_LTR-1, 32*QUOT_LPR_LTR, 64*QUOT_LPR_LTR, 128*QUOT_LPR_LTR, 192*QUOT_LPR_LTR };
+
+const float w_hamm48k_2[L_TRANA48k/2] =
+{
+    0.080000000000000f, 0.080061898522781f, 0.080247577432747f, 0.080556986759243f, 0.080990043232791f, 0.081546630307495f, 0.082226598192408f, 0.083029763891845f,
+    0.083955911254630f, 0.085004791032270f, 0.086176120946031f, 0.087469585762906f, 0.088884837380455f, 0.090421494920485f, 0.092079144831552f, 0.093857341000262f,
+    0.095755604871328f, 0.097773425576361f, 0.099910260071357f, 0.102165533282844f, 0.104538638262646f, 0.107028936351231f, 0.109635757349585f, 0.112358399699582f,
+    0.115196130672791f, 0.118148186567665f, 0.121213772915079f, 0.124392064692135f, 0.127682206544200f, 0.131083313015096f, 0.134594468785406f, 0.138214728918801f,
+    0.141943119116349f, 0.145778635978722f, 0.149720247276233f, 0.153766892226636f, 0.157917481780606f, 0.162170898914830f, 0.166525998932624f, 0.170981609771997f,
+    0.175536532321084f, 0.180189540740855f, 0.184939382795015f, 0.189784780187013f, 0.194724428904063f, 0.199756999568084f, 0.204881137793469f, 0.210095464551578f,
+    0.215398576541875f, 0.220789046569584f, 0.226265423929784f, 0.231826234797829f, 0.237469982625987f, 0.243195148546199f, 0.249000191778843f, 0.254883550047394f,
+    0.260843639998870f, 0.266878857629950f, 0.272987578718653f, 0.279168159261450f, 0.285418935915708f, 0.291738226447335f, 0.298124330183510f, 0.304575528470374f,
+    0.311090085135560f, 0.317666246955443f, 0.324302244126969f, 0.330996290743956f, 0.337746585277719f, 0.344551311061912f, 0.351408636781431f, 0.358316716965264f,
+    0.365273692483159f, 0.372277691045950f, 0.379326827709445f, 0.386419205381703f, 0.393552915333588f, 0.400726037712459f, 0.407936642058840f, 0.415182787825961f,
+    0.422462524902000f, 0.429773894134909f, 0.437114927859666f, 0.444483650427822f, 0.451878078739195f, 0.459296222775571f, 0.466736086136265f, 0.474195666575400f,
+    0.481672956540759f, 0.489165943714067f, 0.496672611552554f, 0.504190939831653f, 0.511718905188695f, 0.519254481667438f, 0.526795641263308f, 0.534340354469178f,
+    0.541886590821560f, 0.549432319447051f, 0.556975509608890f, 0.564514131253475f, 0.572046155556704f, 0.579569555469978f, 0.587082306265726f, 0.594582386082315f,
+    0.602067776468170f, 0.609536462925001f, 0.616986435449943f, 0.624415689076500f, 0.631822224414129f, 0.639204048186324f, 0.646559173767056f, 0.653885621715418f,
+    0.661181420308344f, 0.668444606071246f, 0.675673224306430f, 0.682865329619155f, 0.690018986441185f, 0.697132269551692f, 0.704203264595389f, 0.711230068597719f,
+    0.718210790476997f, 0.725143551553344f, 0.732026486054283f, 0.738857741616868f, 0.745635479786192f, 0.752357876510168f, 0.759023122630418f, 0.765629424369165f,
+    0.772175003811978f, 0.778658099386259f, 0.785076966335314f, 0.791429877187917f, 0.797715122223211f, 0.803931009930835f, 0.810075867466152f, 0.816148041100446f,
+    0.822145896665987f, 0.828067819995822f, 0.833912217358185f, 0.839677515885409f, 0.845362163997224f, 0.850964631818323f, 0.856483411590088f, 0.861917018076364f,
+    0.867263988963175f, 0.872522885252262f, 0.877692291648358f, 0.882770816940072f, 0.887757094374303f, 0.892649782024062f, 0.897447563149619f, 0.902149146552868f,
+    0.906753266924821f, 0.911258685186131f, 0.915664188820559f, 0.919968592201292f, 0.924170736910022f, 0.928269492048706f, 0.932263754543917f, 0.936152449443706f,
+    0.939934530206900f, 0.943608978984751f, 0.947174806894860f, 0.950631054287315f, 0.953976791002949f, 0.957211116623676f, 0.960333160714807f, 0.963342083059310f,
+    0.966237073883933f, 0.969017354077129f, 0.971682175398738f, 0.974230820681355f, 0.976662604023336f, 0.978976870973391f, 0.981172998706713f, 0.983250396192597f,
+    0.985208504353495f, 0.987046796215483f, 0.988764777050081f, 0.990361984507393f, 0.991837988740540f, 0.993192392521341f, 0.994424831347216f, 0.995534973539285f,
+    0.996522520331626f, 0.997387205951684f, 0.998128797691797f, 0.998747095971820f, 0.999241934392838f, 0.999613179781951f, 0.999860732228111f, 0.999984525109009f
+};
+
+const float w_hamm32k_2[L_TRANA32k/2] =
+{
+    0.080000000000000f, 0.080139632090179f, 0.080558443590627f, 0.081256180242538f, 0.082232418452750f, 0.083486565550910f, 0.085017860149273f, 0.086825372604947f,
+    0.088908005584270f, 0.091264494728999f, 0.093893409423896f, 0.096793153665248f, 0.099961967029797f, 0.103397925743485f, 0.107098943849369f, 0.111062774473996f,
+    0.115287011191475f, 0.119769089484404f, 0.124506288300781f, 0.129495731705944f, 0.134734390628539f, 0.140219084699457f, 0.145946484182623f, 0.151913111996467f,
+    0.158115345824847f, 0.164549420316138f, 0.171211429369169f, 0.178097328504598f, 0.185202937320297f, 0.192523942029263f, 0.200055898078497f, 0.207794232847276f,
+    0.215734248423172f, 0.223871124454139f, 0.232199921074925f, 0.240715581906049f, 0.249412937123505f, 0.258286706597345f, 0.267331503097225f, 0.276541835562968f,
+    0.285912112438167f, 0.295436645064799f, 0.305109651136783f, 0.314925258210395f, 0.324877507269410f, 0.334960356342792f, 0.345167684172755f, 0.355493293930949f,
+    0.365930916980537f, 0.376474216681854f, 0.387116792239357f, 0.397852182587524f, 0.408673870313343f, 0.419575285613002f, 0.430549810280395f, 0.441590781725011f,
+    0.452691497016760f, 0.463845216955300f, 0.475045170161378f, 0.486284557187706f, 0.497556554646881f, 0.508854319353835f, 0.520170992480304f, 0.531499703718800f,
+    0.542833575453544f, 0.554165726935838f, 0.565489278461346f, 0.576797355546729f, 0.588083093103121f, 0.599339639603893f, 0.610560161244195f, 0.621737846089724f,
+    0.632865908212225f, 0.643937591809204f, 0.654946175305346f, 0.665884975433158f, 0.676747351290353f, 0.687526708371517f, 0.698216502571607f, 0.708810244158849f,
+    0.719301501714632f, 0.729683906037996f, 0.739951154012344f, 0.750097012432047f, 0.760115321786592f, 0.770000000000000f, 0.779745046123229f, 0.789344543977327f,
+    0.798792665745119f, 0.808083675509254f, 0.817211932734458f, 0.826171895691878f, 0.834958124823446f, 0.843565286044212f, 0.851988153980648f, 0.860221615142946f,
+    0.868260671029406f, 0.876100441160999f, 0.883736166044290f, 0.891163210060907f, 0.898377064281809f, 0.905373349204632f, 0.912147817412476f, 0.918696356152490f,
+    0.925014989832710f, 0.931099882435622f, 0.936947339846999f, 0.942553812098577f, 0.947915895523229f, 0.953030334821319f, 0.957894025036981f, 0.962504013443125f,
+    0.966857501334024f, 0.970951845724403f, 0.974784560953977f, 0.978353320196492f, 0.981655956872329f, 0.984690465963826f, 0.987455005232518f, 0.989947896337551f,
+    0.992167625854595f, 0.994112846194642f, 0.995782376422118f, 0.997175202971826f, 0.998290480264278f, 0.999127531219040f, 0.999685847665791f, 0.999965090652822f
+};
+
+const float w_hamm16k_2[L_TRANA16k/2] =
+{
+    0.080000000000000f, 0.080562848541440f, 0.082250016781061f, 0.085057375935460f, 0.088978055926352f, 0.094002462192807f, 0.100118299170741f, 0.107310600382232f,
+    0.115561765060989f, 0.124851601224384f, 0.135157375086613f, 0.146453866692083f, 0.158713431632863f, 0.171906068699192f, 0.185999493297458f, 0.200959216456013f,
+    0.216748629225465f, 0.233329092266912f, 0.250660030408878f, 0.268699031941561f, 0.287401952405387f, 0.306723022619904f, 0.326614960688639f, 0.347029087705815f,
+    0.367915446881795f, 0.389222925795719f, 0.410899381476157f, 0.432891768003705f, 0.455146266323232f, 0.477608415948132f, 0.500223248234257f, 0.522935420897402f,
+    0.545689353445147f, 0.568429363191639f, 0.591099801522450f, 0.613645190076067f, 0.636010356508734f, 0.658140569510427f, 0.679981672741539f, 0.701480217362516f,
+    0.722583592832128f, 0.743240155654278f, 0.763399355758289f, 0.783011860203399f, 0.802029673904734f, 0.820406257085326f, 0.838096639166738f, 0.855057528819616f,
+    0.871247419904816f, 0.886626693045890f, 0.901157712584333f, 0.914804918680351f, 0.927534914333744f, 0.939316547111965f, 0.950120985385339f, 0.959921788882895f,
+    0.968694973396140f, 0.976419069472435f, 0.983075174954342f, 0.988647001236375f, 0.993120913125941f, 0.996485962210947f, 0.998733913652397f, 0.999859266336418f
+};
+
+const float w_hamm8k_2[L_TRANA8k/2] =
+{
+    0.080000000000000f, 0.082285843331915f, 0.089120655589670f, 0.100436509338375f, 0.116120942539613f, 0.136018076249695f, 0.159930163814642f, 0.187619556165270f,
+    0.218811063680407f, 0.253194691144983f, 0.290428718621751f, 0.330143097617545f, 0.371943128791458f, 0.415413384654218f, 0.460121838273212f, 0.505624156950245f,
+    0.551468118199513f, 0.597198104137843f, 0.642359629619905f, 0.686503859115775f, 0.729192067440081f, 0.770000000000000f, 0.808522089228003f, 0.844375485294555f,
+    0.877203861041720f, 0.906680953322544f, 0.932513805550792f, 0.954445679235113f, 0.972258605561518f, 0.985775551665376f, 0.994862180063559f, 0.999428183760704f,
+};
+
+const float w_hamm_sana48k_2[L_PROT_HAMM_LEN2_48k] =
+{
+    0.080000000000000f, 0.080027462973758f, 0.080109848615839f, 0.080247147089046f, 0.080439341999361f, 0.080686410397899f, 0.080988322783646f, 0.081345043106986f,
+    0.081756528774001f, 0.082222730651560f, 0.082743593073186f, 0.083319053845701f, 0.083949044256652f, 0.084633489082516f, 0.085372306597683f, 0.086165408584215f,
+    0.087012700342376f, 0.087914080701944f, 0.088869442034286f, 0.089878670265216f, 0.090941644888610f, 0.092058238980796f, 0.093228319215714f, 0.094451745880830f,
+    0.095728372893819f, 0.097058047820012f, 0.098440611890594f, 0.099875900021559f, 0.101363740833430f, 0.102903956671715f, 0.104496363628120f, 0.106140771562514f,
+    0.107836984125627f, 0.109584798782499f, 0.111384006836658f, 0.113234393455047f, 0.115135737693669f, 0.117087812523972f, 0.119090384859956f, 0.121143215586007f,
+    0.123246059585445f, 0.125398665769793f, 0.127600777108759f, 0.129852130660926f, 0.132152457605149f, 0.134501483272651f, 0.136898927179823f, 0.139344503061711f,
+    0.141837918906203f, 0.144378876988888f, 0.146967073908615f, 0.149602200623714f, 0.152283942488898f, 0.155011979292835f, 0.157785985296381f, 0.160605629271474f,
+    0.163470574540687f, 0.166380479017425f, 0.169334995246772f, 0.172333770446984f, 0.175376446551605f, 0.178462660252227f, 0.181592043041866f, 0.184764221258970f,
+    0.187978816132029f, 0.191235443824805f, 0.194533715482165f, 0.197873237276507f, 0.201253610454792f, 0.204674431386151f, 0.208135291610080f, 0.211635777885218f,
+    0.215175472238683f, 0.218753952015982f, 0.222370789931481f, 0.226025554119419f, 0.229717808185479f, 0.233447111258894f, 0.237213018045087f, 0.241015078878844f,
+    0.244852839778006f, 0.248725842497672f, 0.252633624584921f, 0.256575719434027f, 0.260551656342175f, 0.264560960565666f, 0.268603153376600f, 0.272677752120042f,
+    0.276784270271653f, 0.280922217495778f, 0.285091099704000f, 0.289290419114133f, 0.293519674309662f, 0.297778360299609f, 0.302065968578839f, 0.306381987188769f,
+    0.310725900778505f, 0.315097190666374f, 0.319495334901855f, 0.323919808327907f, 0.328370082643670f, 0.332845626467550f, 0.337345905400666f, 0.341870382090660f,
+    0.346418516295861f, 0.350989764949788f, 0.355583582225999f, 0.360199419603261f, 0.364836725931051f, 0.369494947495359f, 0.374173528084809f, 0.378871909057071f,
+    0.383589529405564f, 0.388325825826447f, 0.393080232785873f, 0.397852182587524f, 0.402641105440390f, 0.407446429526807f, 0.412267581070735f, 0.417103984406268f,
+    0.421955062046372f, 0.426820234751838f, 0.431698921600448f, 0.436590540056336f, 0.441494506039550f, 0.446410233995788f, 0.451337136966322f, 0.456274626658076f,
+    0.461222113513879f, 0.466179006782852f, 0.471144714590954f, 0.476118644011648f, 0.481100201136704f, 0.486088791147110f, 0.491083818384099f, 0.496084686420271f,
+    0.501090798130810f, 0.506101555764784f, 0.511116361016516f, 0.516134615097028f, 0.521155718805537f, 0.526179072601003f, 0.531204076673714f, 0.536230131016910f,
+    0.541256635498423f, 0.546282989932337f, 0.551308594150653f, 0.556332848074950f, 0.561355151788038f, 0.566374905605590f, 0.571391510147749f, 0.576404366410692f,
+    0.581412875838160f, 0.586416440392922f, 0.591414462628186f, 0.596406345758937f, 0.601391493733196f, 0.606369311303187f, 0.611339204096419f, 0.616300578686650f,
+    0.621252842664750f, 0.626195404709433f, 0.631127674657866f, 0.636049063576134f, 0.640958983829565f, 0.645856849152894f, 0.650742074720264f, 0.655614077215060f,
+    0.660472274899558f, 0.665316087684385f, 0.670144937197788f, 0.674958246854690f, 0.679755441925542f, 0.684535949604939f, 0.689299199080028f, 0.694044621598654f,
+    0.698771650537277f, 0.703479721468629f, 0.708168272229108f, 0.712836742985904f, 0.717484576303842f, 0.722111217211948f, 0.726716113269708f, 0.731298714633038f,
+    0.735858474119933f, 0.740394847275806f, 0.744907292438496f, 0.749395270802946f, 0.753858246485539f, 0.758295686588082f, 0.762707061261442f, 0.767091843768804f,
+    0.771449510548575f, 0.775779541276891f, 0.780081418929751f, 0.784354629844749f, 0.788598663782413f, 0.792813013987120f, 0.796997177247615f, 0.801150653957089f,
+    0.805272948172839f, 0.809363567675482f, 0.813422024027731f, 0.817447832632716f, 0.821440512791844f, 0.825399587762201f, 0.829324584813474f, 0.833215035284397f,
+    0.837070474638713f, 0.840890442520641f, 0.844674482809841f, 0.848422143675885f, 0.852132977632196f, 0.855806541589490f, 0.859442396908678f, 0.863040109453242f,
+    0.866599249641071f, 0.870119392495760f, 0.873600117697347f, 0.877041009632507f, 0.880441657444176f, 0.883801655080607f, 0.887120601343857f, 0.890398099937691f,
+    0.893633759514900f, 0.896827193724033f, 0.899978021255524f, 0.903085865887227f, 0.906150356529334f, 0.909171127268689f, 0.912147817412476f, 0.915080071531290f,
+    0.917967539501574f, 0.920809876547428f, 0.923606743281775f, 0.926357805746886f, 0.929062735454256f, 0.931721209423824f, 0.934332910222545f, 0.936897526002284f,
+    0.939414750537061f, 0.941884283259609f, 0.944305829297265f, 0.946679099507180f, 0.949003810510844f, 0.951279684727920f, 0.953506450409391f, 0.955683841670007f,
+    0.957811598520034f, 0.959889466896295f, 0.961917198692508f, 0.963894551788914f, 0.965821290081179f, 0.967697183508596f, 0.969522008081546f, 0.971295545908249f,
+    0.973017585220782f, 0.974687920400358f, 0.976306352001886f, 0.977872686777781f, 0.979386737701038f, 0.980848323987568f, 0.982257271117780f, 0.983613410857422f,
+    0.984916581277667f, 0.986166626774449f, 0.987363398087044f, 0.988506752315891f, 0.989596552939653f, 0.990632669831523f, 0.991614979274757f, 0.992543363977448f,
+    0.993417713086533f, 0.994237922201026f, 0.995003893384487f, 0.995715535176712f, 0.996372762604660f, 0.996975497192592f, 0.997523666971448f, 0.998017206487434f,
+    0.998456056809844f, 0.998840165538090f, 0.999169486807964f, 0.999443981297112f, 0.999663616229731f, 0.999828365380479f, 0.999938209077610f, 0.999993134205322f
+};
+
+const float w_hamm_sana32k_2[L_PROT_HAMM_LEN2_32k] =
+{
+    0.080000000000000f, 0.080061898522781f, 0.080247577432747f, 0.080556986759243f, 0.080990043232791f, 0.081546630307495f, 0.082226598192408f, 0.083029763891845f,
+    0.083955911254630f, 0.085004791032270f, 0.086176120946031f, 0.087469585762906f, 0.088884837380455f, 0.090421494920485f, 0.092079144831552f, 0.093857341000262f,
+    0.095755604871328f, 0.097773425576361f, 0.099910260071357f, 0.102165533282844f, 0.104538638262646f, 0.107028936351231f, 0.109635757349585f, 0.112358399699582f,
+    0.115196130672791f, 0.118148186567665f, 0.121213772915079f, 0.124392064692135f, 0.127682206544200f, 0.131083313015096f, 0.134594468785406f, 0.138214728918801f,
+    0.141943119116349f, 0.145778635978722f, 0.149720247276233f, 0.153766892226636f, 0.157917481780606f, 0.162170898914830f, 0.166525998932624f, 0.170981609771997f,
+    0.175536532321084f, 0.180189540740855f, 0.184939382795015f, 0.189784780187013f, 0.194724428904063f, 0.199756999568084f, 0.204881137793469f, 0.210095464551578f,
+    0.215398576541875f, 0.220789046569584f, 0.226265423929784f, 0.231826234797829f, 0.237469982625987f, 0.243195148546199f, 0.249000191778843f, 0.254883550047394f,
+    0.260843639998870f, 0.266878857629950f, 0.272987578718653f, 0.279168159261450f, 0.285418935915708f, 0.291738226447335f, 0.298124330183510f, 0.304575528470374f,
+    0.311090085135560f, 0.317666246955443f, 0.324302244126969f, 0.330996290743956f, 0.337746585277719f, 0.344551311061912f, 0.351408636781431f, 0.358316716965264f,
+    0.365273692483159f, 0.372277691045950f, 0.379326827709445f, 0.386419205381703f, 0.393552915333588f, 0.400726037712459f, 0.407936642058840f, 0.415182787825961f,
+    0.422462524902000f, 0.429773894134909f, 0.437114927859666f, 0.444483650427822f, 0.451878078739195f, 0.459296222775571f, 0.466736086136265f, 0.474195666575400f,
+    0.481672956540759f, 0.489165943714067f, 0.496672611552554f, 0.504190939831653f, 0.511718905188695f, 0.519254481667438f, 0.526795641263308f, 0.534340354469178f,
+    0.541886590821560f, 0.549432319447051f, 0.556975509608890f, 0.564514131253475f, 0.572046155556704f, 0.579569555469978f, 0.587082306265726f, 0.594582386082315f,
+    0.602067776468170f, 0.609536462925001f, 0.616986435449943f, 0.624415689076500f, 0.631822224414129f, 0.639204048186324f, 0.646559173767056f, 0.653885621715418f,
+    0.661181420308344f, 0.668444606071246f, 0.675673224306430f, 0.682865329619155f, 0.690018986441185f, 0.697132269551692f, 0.704203264595389f, 0.711230068597719f,
+    0.718210790476997f, 0.725143551553344f, 0.732026486054283f, 0.738857741616868f, 0.745635479786192f, 0.752357876510168f, 0.759023122630418f, 0.765629424369165f,
+    0.772175003811978f, 0.778658099386259f, 0.785076966335314f, 0.791429877187917f, 0.797715122223211f, 0.803931009930835f, 0.810075867466152f, 0.816148041100446f,
+    0.822145896665987f, 0.828067819995822f, 0.833912217358185f, 0.839677515885409f, 0.845362163997224f, 0.850964631818323f, 0.856483411590088f, 0.861917018076364f,
+    0.867263988963175f, 0.872522885252262f, 0.877692291648358f, 0.882770816940072f, 0.887757094374303f, 0.892649782024062f, 0.897447563149619f, 0.902149146552868f,
+    0.906753266924821f, 0.911258685186131f, 0.915664188820559f, 0.919968592201292f, 0.924170736910022f, 0.928269492048706f, 0.932263754543917f, 0.936152449443706f,
+    0.939934530206900f, 0.943608978984751f, 0.947174806894860f, 0.950631054287315f, 0.953976791002949f, 0.957211116623676f, 0.960333160714807f, 0.963342083059310f,
+    0.966237073883933f, 0.969017354077129f, 0.971682175398738f, 0.974230820681355f, 0.976662604023336f, 0.978976870973391f, 0.981172998706713f, 0.983250396192597f,
+    0.985208504353495f, 0.987046796215483f, 0.988764777050081f, 0.990361984507393f, 0.991837988740540f, 0.993192392521341f, 0.994424831347216f, 0.995534973539285f,
+    0.996522520331626f, 0.997387205951684f, 0.998128797691797f, 0.998747095971820f, 0.999241934392838f, 0.999613179781951f, 0.999860732228111f, 0.999984525109009f
+};
+
+const float w_hamm_sana16k_2[L_PROT_HAMM_LEN2_16k] =
+{
+    0.080000000000000f, 0.080248875229243f, 0.080995231617495f, 0.082238261557724f, 0.083976620009229f, 0.086208425953062f, 0.088931264427414f, 0.092142189140766f,
+    0.095837725659970f, 0.100013875169814f, 0.104666118800010f, 0.109789422514906f, 0.115378242560646f, 0.121426531463883f, 0.127927744575542f, 0.134874847152564f,
+    0.142260321969963f, 0.150076177454966f, 0.158313956334418f, 0.166964744786114f, 0.176019182084144f, 0.185467470727822f, 0.195299387043225f, 0.205504292245887f,
+    0.216071143952672f, 0.226988508130357f, 0.238244571468020f, 0.249827154159818f, 0.261723723084350f, 0.273921405366317f, 0.286407002305832f, 0.299167003660284f,
+    0.312187602263317f, 0.325454708965093f, 0.338953967877692f, 0.352670771909129f, 0.366590278569198f, 0.380697426030022f, 0.394976949423959f, 0.409413397361190f,
+    0.423991148649151f, 0.438694429195694f, 0.453507329077705f, 0.468413819756689f, 0.483397771422710f, 0.498442970447917f, 0.513533136930761f, 0.528651942311926f,
+    0.543783027042910f, 0.558910018288144f, 0.574016547641481f, 0.589086268837895f, 0.604102875441222f, 0.619050118488809f, 0.633911824073957f, 0.648671910847171f,
+    0.663314407417236f, 0.677823469633322f, 0.692183397729409f, 0.706378653312465f, 0.720393876176025f, 0.734213900920944f, 0.747823773365368f, 0.761208766726146f,
+    0.774354397554188f, 0.787246441406510f, 0.799870948238030f, 0.812214257496436f, 0.824263012903808f, 0.836004176908999f, 0.847425044795124f, 0.858513258426909f,
+    0.869256819623006f, 0.879644103138828f, 0.889663869245825f, 0.899305275893620f, 0.908557890441822f, 0.917411700948838f, 0.925857127005450f, 0.933885030101461f,
+    0.941486723514159f, 0.948653981707932f, 0.955379049234843f, 0.961654649126531f, 0.967473990768381f, 0.972830777247415f, 0.977719212165966f, 0.982134005913770f,
+    0.986070381391670f, 0.989524079180756f, 0.992491362151336f, 0.994969019506760f, 0.996954370257714f, 0.998445266123226f, 0.999440093855253f, 0.999937776984316f
+};
+
+
+/* er_dec_tcx.c */
+const float h_high3_32[L_FIR_FER2]   = {-0.0517f, -0.0587f, -0.0820f, -0.1024f, -0.1164f,  0.8786f, -0.1164f, -0.1024f, -0.0820f, -0.0587f, -0.0517f};
+const float h_high3_16[L_FIR_FER2]   = { 0.f,     -0.0205f, -0.0651f, -0.1256f, -0.1792f,  0.8028f, -0.1792f, -0.1256f, -0.0651f, -0.0205f,  0.f    };
+
+
+/*
+extern const float h_low[];                      // LP filter for filtering periodic part of excitation in artificial onset construction after FEC
 
 extern const int mult_avq_tab[];
 extern const int shift_avq_tab[];
@@ -32,7 +238,9 @@ extern const float w_hamm_sana48k_2[L_PROT_HAMM_LEN2_48k];
 
 extern const float h_high3_32[L_FIR_FER2];
 extern const float h_high3_16[L_FIR_FER2];
+*/
 
+} // end of namespace
 
 #endif
 
diff --git a/src/libs/libevs/lib_dec/rst_dec.cpp b/src/libs/libevs/lib_dec/rst_dec.cpp
index 5f23bd0b..0e9d539a 100644
--- a/src/libs/libevs/lib_dec/rst_dec.cpp
+++ b/src/libs/libevs/lib_dec/rst_dec.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*----------------------------------------------------------------------------------*
  * CNG_reset_dec()
  *
@@ -56,3 +59,5 @@ void CNG_reset_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/stat_dec.h b/src/libs/libevs/lib_dec/stat_dec.h
index cce08a45..d69ae0f6 100644
--- a/src/libs/libevs/lib_dec/stat_dec.h
+++ b/src/libs/libevs/lib_dec/stat_dec.h
@@ -9,6 +9,8 @@
 #include "stat_com.h"          /* Common structures                      */
 #include "cnst.h"
 
+namespace evs {
+
 typedef enum _DEC_MODE
 {
     DEC_NO_FRAM_LOSS         = 0x0,
@@ -1010,5 +1012,7 @@ typedef struct Decoder_State
 
 } Decoder_State;
 
+} // end of namespace
+
 #endif
 
diff --git a/src/libs/libevs/lib_dec/stat_noise_uv_dec.cpp b/src/libs/libevs/lib_dec/stat_noise_uv_dec.cpp
index b2727493..cc035270 100644
--- a/src/libs/libevs/lib_dec/stat_noise_uv_dec.cpp
+++ b/src/libs/libevs/lib_dec/stat_noise_uv_dec.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------*
  * stat_noise_uv_dec()
@@ -73,3 +76,5 @@ void stat_noise_uv_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/swb_bwe_dec.cpp b/src/libs/libevs/lib_dec/swb_bwe_dec.cpp
index 6faeb2d1..92db1774 100644
--- a/src/libs/libevs/lib_dec/swb_bwe_dec.cpp
+++ b/src/libs/libevs/lib_dec/swb_bwe_dec.cpp
@@ -11,6 +11,9 @@
 #include "basop_util.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * para_pred_bws()
@@ -662,3 +665,5 @@ void swb_bwe_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/swb_bwe_dec_hr.cpp b/src/libs/libevs/lib_dec/swb_bwe_dec_hr.cpp
index 92eb8df5..a0c16171 100644
--- a/src/libs/libevs/lib_dec/swb_bwe_dec_hr.cpp
+++ b/src/libs/libevs/lib_dec/swb_bwe_dec_hr.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * swb_bwe_dec_hr()
  *
@@ -754,3 +757,5 @@ void swb_bwe_dec_hr(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/swb_bwe_dec_lr.cpp b/src/libs/libevs/lib_dec/swb_bwe_dec_lr.cpp
index 83948752..38808a2d 100644
--- a/src/libs/libevs/lib_dec/swb_bwe_dec_lr.cpp
+++ b/src/libs/libevs/lib_dec/swb_bwe_dec_lr.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "stat_com.h"
 
+namespace evs { 
+
+
 
 
 /*-------------------------------------------------------------------*
@@ -277,3 +280,5 @@ void swb_bwe_dec_lr(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/swb_tbe_dec.cpp b/src/libs/libevs/lib_dec/swb_tbe_dec.cpp
index f90b010d..ae495b95 100644
--- a/src/libs/libevs/lib_dec/swb_tbe_dec.cpp
+++ b/src/libs/libevs/lib_dec/swb_tbe_dec.cpp
@@ -10,6 +10,9 @@
 #include "rom_com.h"
 #include "rom_dec.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local functions
  *-----------------------------------------------------------------*/
@@ -1961,3 +1964,5 @@ void TBEreset_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/syn_outp.cpp b/src/libs/libevs/lib_dec/syn_outp.cpp
index c544bcc9..50b9f2a4 100644
--- a/src/libs/libevs/lib_dec/syn_outp.cpp
+++ b/src/libs/libevs/lib_dec/syn_outp.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local functions
  *---------------------------------------------------------------------*/
@@ -103,3 +106,5 @@ void AGC_dec(
 
     return ;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/tcq_core_dec.cpp b/src/libs/libevs/lib_dec/tcq_core_dec.cpp
index 0abe8542..5c64f712 100644
--- a/src/libs/libevs/lib_dec/tcq_core_dec.cpp
+++ b/src/libs/libevs/lib_dec/tcq_core_dec.cpp
@@ -11,6 +11,9 @@
 #include "basop_util.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * tcq_core_LR_enc()
  *
@@ -434,3 +437,5 @@ void tcq_core_LR_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/tcx_utils_dec.cpp b/src/libs/libevs/lib_dec/tcx_utils_dec.cpp
index 08e632a4..4b515871 100644
--- a/src/libs/libevs/lib_dec/tcx_utils_dec.cpp
+++ b/src/libs/libevs/lib_dec/tcx_utils_dec.cpp
@@ -11,6 +11,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 
 void tcx_decoder_memory_update(
@@ -248,3 +251,5 @@ int tcx_res_invQ_spec(
 
     return bits;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/tns_base_dec.cpp b/src/libs/libevs/lib_dec/tns_base_dec.cpp
index 01d4a75b..45c55d62 100644
--- a/src/libs/libevs/lib_dec/tns_base_dec.cpp
+++ b/src/libs/libevs/lib_dec/tns_base_dec.cpp
@@ -9,6 +9,9 @@
 #include <math.h>
 #include <assert.h>
 
+namespace evs { 
+
+
 
 
 /** Linear prediction analysis/synthesis filter definition.
@@ -69,3 +72,5 @@ int DecodeTnsData(STnsConfig const * pTnsConfig, int const * stream, int * pnSiz
     return (pTnsData->nFilters > 0) ? TRUE : FALSE;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/tonalMDCTconcealment.cpp b/src/libs/libevs/lib_dec/tonalMDCTconcealment.cpp
index b2c773e9..596611df 100644
--- a/src/libs/libevs/lib_dec/tonalMDCTconcealment.cpp
+++ b/src/libs/libevs/lib_dec/tonalMDCTconcealment.cpp
@@ -10,6 +10,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 
@@ -703,3 +706,5 @@ static void CalcPowerSpec(float const * mdctSpec, float const * mdstSpec,
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/transition_dec.cpp b/src/libs/libevs/lib_dec/transition_dec.cpp
index 871d91a1..5f1a98c8 100644
--- a/src/libs/libevs/lib_dec/transition_dec.cpp
+++ b/src/libs/libevs/lib_dec/transition_dec.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*----------------------------------------------------------------------*
  * Local functions
  *----------------------------------------------------------------------*/
@@ -741,3 +744,5 @@ short tc_classif(
 
     return( tc_subfr );
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/updt_dec.cpp b/src/libs/libevs/lib_dec/updt_dec.cpp
index 45d9a27f..d40e4081 100644
--- a/src/libs/libevs/lib_dec/updt_dec.cpp
+++ b/src/libs/libevs/lib_dec/updt_dec.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * updt_dec()
  *
@@ -581,3 +584,5 @@ void update_decoder_LPD_cng(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/vlpc_1st_dec.cpp b/src/libs/libevs/lib_dec/vlpc_1st_dec.cpp
index 32a6d890..4e1a318b 100644
--- a/src/libs/libevs/lib_dec/vlpc_1st_dec.cpp
+++ b/src/libs/libevs/lib_dec/vlpc_1st_dec.cpp
@@ -6,7 +6,268 @@
 #include <assert.h>
 #include "prot.h"
 
-extern float const dico_lsf_abs_8b[];
+namespace evs { 
+
+
+const float dico_lsf_abs_8b[256*M] =
+{
+    377.3749f,     688.0079f,    1147.3799f,    1461.0438f,    1786.7794f,    2143.6711f,    2522.1946f,    2889.7402f,    3263.6023f,    3628.4624f,    4005.4351f,    4379.4170f,    4783.9556f,    5157.1753f,    5555.1797f,    5926.6816f,
+    601.5123f,    1066.8242f,    1384.3585f,    1652.9448f,    1978.3910f,    2311.2676f,    2674.0537f,    3010.3896f,    3360.0623f,    3725.9336f,    4093.3335f,    4470.6431f,    4859.1006f,    5210.4717f,    5598.3716f,    5954.4204f,
+    552.5036f,     859.7047f,    1355.2023f,    1624.9041f,    1887.5609f,    2173.1638f,    2540.7429f,    2926.8169f,    3323.2173f,    3680.7197f,    4008.3447f,    4330.8442f,    4692.8228f,    5033.9697f,    5443.3467f,    5875.4497f,
+    459.4534f,     793.3189f,    1293.7278f,    1617.3970f,    1920.0642f,    2192.2153f,    2487.5627f,    2772.1514f,    3111.3823f,    3461.2671f,    3867.0176f,    4279.8550f,    4741.0664f,    5141.0181f,    5552.8237f,    5933.6934f,
+    327.9834f,     430.4954f,     723.9031f,    1528.6172f,    1763.1125f,    2013.7936f,    2334.2153f,    2569.0334f,    3017.9436f,    3308.0610f,    3591.7820f,    3865.5430f,    4693.5786f,    5286.7646f,    5647.7036f,    5987.2305f,
+    455.0753f,     606.0817f,     963.7564f,    1374.9937f,    1536.4897f,    1914.7618f,    2376.9631f,    2580.8184f,    2989.1501f,    3258.8386f,    3485.1460f,    3741.1270f,    4297.4912f,    5207.3779f,    5672.3818f,    5980.5322f,
+    434.9507f,     558.8508f,     890.7061f,    1355.7625f,    1552.6155f,    1895.7960f,    2222.5579f,    2502.6079f,    2841.8738f,    3137.5264f,    3367.7336f,    3860.7769f,    4795.2554f,    5090.9370f,    5421.8218f,    5874.4287f,
+    281.0164f,     404.5417f,     729.2898f,     997.1851f,    1699.8862f,    1961.3673f,    2255.7202f,    2540.9187f,    2804.4553f,    3057.1843f,    3750.2288f,    4340.9893f,    4716.8647f,    5002.7471f,    5477.2998f,    5965.7402f,
+    372.2410f,     505.3570f,     762.3755f,     997.3586f,    1174.4255f,    1986.1741f,    2368.1367f,    2624.1733f,    3194.6084f,    3403.2793f,    3877.7622f,    4425.7676f,    4824.7837f,    5158.1606f,    5532.7466f,    5893.5483f,
+    367.3766f,     501.1806f,     824.5358f,    1090.6857f,    1271.9792f,    1527.7137f,    2381.4382f,    2694.4634f,    2964.5359f,    3639.4832f,    3946.4038f,    4254.3916f,    4645.8076f,    5033.5396f,    5373.8735f,    5878.4385f,
+    229.4505f,     352.5671f,     701.0831f,    1226.4518f,    1678.3601f,    1895.7949f,    2140.0664f,    2526.5515f,    3080.3391f,    3297.8284f,    3845.3987f,    4427.9785f,    4704.4551f,    4997.4155f,    5434.0698f,    5918.4785f,
+    336.3082f,     516.7915f,     881.9847f,    1272.5824f,    1505.1870f,    1880.7520f,    2274.9458f,    2611.0083f,    3126.5256f,    3655.5332f,    4183.3877f,    4668.2993f,    5004.0029f,    5305.3491f,    5650.4985f,    5943.7383f,
+    296.0867f,     469.6519f,     956.5997f,    1224.1262f,    1443.0049f,    1727.6880f,    2216.1677f,    2689.3677f,    3060.4456f,    3520.9438f,    3916.6050f,    4343.7954f,    4763.8906f,    5156.0132f,    5553.8115f,    5936.9634f,
+    407.1503f,     577.5120f,     839.7361f,    1455.3907f,    1665.2137f,    1935.0054f,    2398.0537f,    2652.2605f,    3111.1831f,    3505.5962f,    3766.7554f,    4204.8730f,    4699.1631f,    4970.8652f,    5295.5962f,    5695.6919f,
+    281.0083f,     361.8386f,     950.9102f,    1464.1158f,    1634.7019f,    1965.4950f,    2211.1406f,    2662.1055f,    2846.0122f,    3585.8884f,    4048.7148f,    4358.9150f,    4683.8755f,    5046.0908f,    5400.0859f,    5956.1040f,
+    279.1811f,     393.9142f,     876.8306f,    1502.2417f,    1673.0590f,    2288.7161f,    2545.3674f,    3028.9507f,    3517.5840f,    3824.4246f,    4144.8486f,    4481.8140f,    4821.2769f,    5162.3975f,    5542.8560f,    5928.5854f,
+    379.7892f,     500.9199f,     725.0223f,     998.7143f,    1179.6127f,    1771.9886f,    2775.4812f,    3136.8457f,    3378.6143f,    3674.0188f,    3946.3604f,    4184.4824f,    4521.5454f,    4934.8940f,    5315.5029f,    5759.7544f,
+    317.4339f,     442.2628f,     778.7388f,    1167.8633f,    1356.1576f,    1578.5603f,    1840.1584f,    2870.7527f,    3236.1504f,    3502.7249f,    3876.3696f,    4100.5244f,    4650.2632f,    5235.1890f,    5665.2285f,    5999.0649f,
+    350.2696f,     492.2163f,     763.0640f,    1264.7550f,    1515.0244f,    1755.7783f,    2489.3274f,    2898.6252f,    3143.1018f,    3643.0640f,    4035.0657f,    4255.0889f,    4641.7231f,    5138.5107f,    5557.1318f,    5920.2402f,
+    301.3833f,     464.9852f,     762.3419f,    1012.2126f,    1803.5172f,    2192.4214f,    2651.6287f,    3013.6697f,    3251.3591f,    3539.4675f,    3946.3433f,    4469.3560f,    4890.7446f,    5200.4878f,    5509.6753f,    5910.2397f,
+    253.1752f,     356.8990f,     630.3325f,    1163.1683f,    1528.6230f,    2023.4438f,    2488.6001f,    2745.5627f,    2933.7024f,    3237.4414f,    3976.9258f,    4415.2534f,    4789.9131f,    5194.3423f,    5714.6445f,    6032.4160f,
+    265.1815f,     364.7549f,     590.0148f,     805.2595f,    1564.7582f,    2150.6536f,    2365.6501f,    2598.7876f,    2861.5334f,    3514.1265f,    4005.6328f,    4609.3091f,    4955.4478f,    5238.4116f,    5519.5884f,    5890.7925f,
+    209.3544f,     313.1497f,     503.2642f,     949.4504f,    1729.7280f,    1912.6814f,    2117.5051f,    2498.6272f,    3284.6587f,    3810.8555f,    4105.0195f,    4349.5151f,    4770.3682f,    5210.2910f,    5585.1533f,    5970.3638f,
+    302.3150f,     415.6502f,     684.1018f,     922.3598f,    1489.4418f,    2235.6252f,    2449.9773f,    2800.6938f,    3061.3721f,    3526.1001f,    3905.8174f,    4170.7891f,    4446.4209f,    4907.9937f,    5470.7158f,    5914.7261f,
+    264.9068f,     366.4342f,     582.8182f,     790.8568f,    1619.4548f,    2034.0782f,    2337.6724f,    2632.1714f,    2933.2356f,    3430.1858f,    3815.0198f,    4276.3931f,    4748.3149f,    5164.0098f,    5553.3320f,    5974.9092f,
+    249.6359f,     361.9234f,     581.9844f,     841.1097f,    1657.5543f,    2184.4114f,    2525.9739f,    2820.0503f,    3120.7190f,    3623.7678f,    4050.5435f,    4434.5742f,    4802.6782f,    5171.8438f,    5575.0068f,    5963.7402f,
+    290.1085f,     404.2538f,     664.1223f,     878.2748f,    1237.1085f,    2237.4707f,    2497.5647f,    2957.7786f,    3289.3928f,    3626.5276f,    4190.9243f,    4594.6450f,    4981.7456f,    5283.5513f,    5617.1538f,    5938.3760f,
+    182.7846f,     270.3831f,     490.2131f,    1070.2524f,    1674.5724f,    2092.4905f,    2524.1472f,    2929.3523f,    3334.8005f,    3712.0061f,    4101.2896f,    4475.7324f,    4866.1919f,    5231.7559f,    5606.4077f,    5960.9644f,
+    286.7701f,     386.1487f,     577.4210f,     764.3087f,    1151.2404f,    2014.4502f,    2399.8547f,    2879.0371f,    3160.2502f,    3450.6274f,    3869.8240f,    4368.3618f,    4816.7861f,    5187.6450f,    5564.7231f,    5962.0386f,
+    179.9538f,     266.0682f,     647.9122f,    1380.2810f,    1776.1240f,    2208.4592f,    2590.6843f,    2993.6758f,    3368.2034f,    3753.2156f,    4125.2124f,    4508.6050f,    4878.9932f,    5249.3291f,    5612.5049f,    5965.2134f,
+    309.2416f,     434.7111f,     724.6614f,     936.5360f,    1264.9886f,    2272.1338f,    2548.4519f,    2904.0798f,    3313.4990f,    3579.7854f,    3914.5811f,    4297.5938f,    4756.9072f,    5163.2017f,    5592.2822f,    5943.7222f,
+    256.9009f,     393.7155f,     769.3966f,    1200.9640f,    1774.4797f,    2307.9629f,    2794.6799f,    3165.9431f,    3507.7952f,    3840.5791f,    4142.8877f,    4453.5078f,    4790.6973f,    5142.6123f,    5530.5977f,    5923.2188f,
+    394.1425f,     602.0079f,     934.5173f,    1352.9718f,    1813.9639f,    2172.5435f,    2603.7295f,    2963.9590f,    3335.2344f,    3732.0515f,    4120.0151f,    4487.9668f,    4877.6294f,    5238.9336f,    5596.1479f,    5939.6489f,
+    373.0307f,     665.4328f,    1227.4684f,    1524.6017f,    1947.3784f,    2361.6384f,    2778.1921f,    3134.5396f,    3462.3992f,    3752.4592f,    4069.0352f,    4404.2720f,    4782.2241f,    5145.0581f,    5541.9980f,    5932.9136f,
+    449.9942f,     814.1862f,    1344.2784f,    1682.7061f,    2086.3599f,    2486.9709f,    2916.1177f,    3265.9099f,    3616.3977f,    3919.6345f,    4218.5342f,    4519.2207f,    4857.5220f,    5193.5269f,    5573.7339f,    5934.5400f,
+    531.4455f,     965.7403f,    1458.5353f,    1773.3784f,    2236.0146f,    2650.9109f,    3099.2871f,    3467.1567f,    3809.7056f,    4094.6472f,    4378.5811f,    4660.2471f,    4962.5078f,    5270.9863f,    5629.4160f,    5973.6450f,
+    565.5986f,    1091.1300f,    1561.4944f,    1983.5482f,    2492.8821f,    2897.5085f,    3233.5361f,    3539.8831f,    3838.6494f,    4093.4460f,    4372.1924f,    4678.2251f,    4999.2646f,    5325.0371f,    5672.8887f,    5998.9990f,
+    581.0623f,     976.0275f,    1447.0302f,    1779.9243f,    2148.2158f,    2543.8347f,    2979.5061f,    3373.6099f,    3796.8259f,    4164.8242f,    4510.5493f,    4853.5527f,    5175.6318f,    5465.3647f,    5763.2334f,    6050.6582f,
+    429.4613f,     802.5781f,    1229.0529f,    1512.6678f,    1835.8625f,    2216.9915f,    2625.3999f,    2995.9927f,    3379.5146f,    3764.7837f,    4156.1382f,    4532.4570f,    4906.4678f,    5262.8960f,    5626.6519f,    5970.6504f,
+    224.5468f,     328.6938f,     615.8844f,    1207.4470f,    1520.9565f,    1865.9806f,    2182.4731f,    2431.4897f,    3239.3486f,    3490.9065f,    3775.7139f,    4291.4312f,    4740.0815f,    5192.0786f,    5532.9302f,    5928.7236f,
+    312.1133f,     424.3103f,     716.4448f,     921.9969f,    1244.5491f,    2017.9143f,    2248.4170f,    2840.0688f,    3138.9390f,    3399.7288f,    3723.3479f,    3999.6824f,    4582.2339f,    5148.5166f,    5631.8989f,    6000.7192f,
+    373.5378f,     506.7356f,     789.6149f,     942.6201f,    1695.8035f,    2021.6426f,    2323.3867f,    2649.5979f,    2853.1729f,    3169.5815f,    3524.9375f,    3848.6399f,    4261.7319f,    4978.9668f,    5505.4004f,    5924.7939f,
+    503.2296f,     724.8124f,     940.3833f,    1220.5646f,    1439.8641f,    1726.9827f,    2215.5464f,    2476.0925f,    2846.8127f,    3232.0950f,    3638.5989f,    3986.3333f,    4371.3052f,    5022.0664f,    5657.4897f,    6040.3452f,
+    398.3355f,     530.8898f,     835.5377f,    1058.3699f,    1327.2036f,    1814.9178f,    2114.2439f,    2515.8892f,    2754.9077f,    3094.8794f,    3598.7061f,    3981.2385f,    4605.9160f,    5110.8364f,    5550.1899f,    5953.9600f,
+    327.7583f,     454.8903f,     825.9029f,    1025.4349f,    1321.1567f,    1551.4836f,    1978.2037f,    2838.9021f,    3111.9041f,    3417.3940f,    3841.0564f,    4696.0547f,    5126.1641f,    5409.5347f,    5711.7163f,    5968.3394f,
+    327.1260f,     431.3983f,     721.9533f,     871.1266f,    1507.7616f,    1847.8716f,    2144.9641f,    2491.1108f,    2702.0847f,    3483.1516f,    3917.5173f,    4254.1260f,    4704.4863f,    4981.6284f,    5450.1035f,    5937.7861f,
+    443.5867f,     610.7686f,     818.9614f,     999.3525f,    1181.9182f,    1884.4948f,    2243.3950f,    2522.8867f,    2993.8594f,    3196.6631f,    3835.5020f,    4233.2568f,    4506.8604f,    4985.0249f,    5544.1382f,    5980.0083f,
+    395.7788f,     582.9504f,     822.1151f,    1013.0453f,    1224.6812f,    1988.4263f,    2452.4744f,    2686.4263f,    2952.8831f,    3135.0867f,    3562.5471f,    4006.6929f,    4401.7471f,    5038.5654f,    5567.4189f,    5986.0850f,
+    264.3071f,     372.0398f,     616.4940f,     842.1705f,    1350.0250f,    1822.1957f,    2165.8896f,    2662.2937f,    3055.4390f,    3502.6787f,    3923.4236f,    4352.6587f,    4772.5068f,    5158.1309f,    5573.9385f,    5972.6895f,
+    218.7390f,     325.2024f,     635.0441f,    1103.4701f,    1636.4287f,    2070.2615f,    2274.2910f,    2453.2002f,    3069.4382f,    3615.7065f,    3980.0811f,    4484.8662f,    4848.6416f,    5093.7163f,    5522.6973f,    5907.4048f,
+    260.0797f,     461.2137f,    1049.2261f,    1334.1865f,    1628.6233f,    2014.9823f,    2413.4802f,    2844.4973f,    3232.3040f,    3661.0122f,    4069.8274f,    4466.5210f,    4857.6553f,    5234.4463f,    5608.4517f,    5954.7920f,
+    301.7969f,     406.3861f,     706.7324f,    1387.1207f,    1581.4719f,    2004.7585f,    2291.9421f,    2548.9978f,    3076.8755f,    3343.1306f,    3623.1770f,    4279.7432f,    4777.6563f,    5084.3960f,    5473.4536f,    5872.0615f,
+    344.0269f,     472.3550f,     776.6819f,    1455.1270f,    1611.6870f,    2012.4386f,    2417.4033f,    2621.8564f,    3318.9663f,    3709.0132f,    3944.1958f,    4299.0293f,    4776.4038f,    5184.1089f,    5545.5454f,    5913.9531f,
+    332.1463f,     433.0623f,     992.1605f,    1254.8217f,    1498.4819f,    1824.6357f,    2118.3374f,    2444.6484f,    2684.8369f,    2930.4683f,    3557.4851f,    4292.9014f,    4786.7251f,    5138.2168f,    5616.2739f,    5996.8369f,
+    281.7202f,     372.7708f,    1074.7051f,    1443.0428f,    1687.6460f,    1980.7075f,    2275.4241f,    2632.2017f,    2848.1765f,    3118.7881f,    3628.5857f,    4522.9585f,    4876.2163f,    5177.2739f,    5600.6675f,    5960.9634f,
+    412.0151f,     535.6881f,     768.8618f,    1462.2601f,    1789.1055f,    1947.8196f,    2224.6890f,    2447.9089f,    2834.6140f,    3472.6721f,    3729.8525f,    4008.2893f,    4525.7271f,    4822.9194f,    5204.6611f,    5895.0942f,
+    263.8760f,     379.7789f,     825.0498f,    1113.1218f,    1465.8749f,    1846.7463f,    2146.0496f,    2487.2766f,    2845.8447f,    3388.4800f,    3883.8447f,    4440.7603f,    4867.0815f,    5214.7280f,    5535.8149f,    5906.9932f,
+    409.8116f,     583.7237f,     859.1983f,    1172.0491f,    1377.6473f,    1984.8322f,    2361.7292f,    2688.9368f,    3238.6563f,    3542.6716f,    3944.3005f,    4441.0840f,    4881.1211f,    5224.6045f,    5604.3711f,    5909.3657f,
+    318.0743f,     438.8244f,     852.9153f,    1061.4503f,    1290.7609f,    1552.5408f,    2053.1118f,    2373.2883f,    2926.1560f,    3452.9551f,    4098.6626f,    4585.2773f,    4967.0898f,    5271.2720f,    5644.6709f,    5961.9585f,
+    370.3631f,     496.5860f,     932.6390f,    1213.4189f,    1452.6641f,    1803.1532f,    2092.2354f,    2607.5247f,    2883.8086f,    3112.1086f,    3687.5657f,    4525.1274f,    4846.9404f,    5130.0537f,    5416.4141f,    5804.5122f,
+    247.8941f,     343.9862f,     751.6780f,    1526.2566f,    1712.5012f,    2038.0667f,    2324.0371f,    2727.9749f,    3005.8975f,    3378.9817f,    3858.2002f,    4339.2017f,    4716.4580f,    5125.0918f,    5564.3589f,    5969.7163f,
+    297.6552f,     401.7544f,     891.9346f,    1380.2275f,    1540.3125f,    1782.6058f,    2009.2045f,    2614.2092f,    2899.5396f,    3379.9722f,    3804.1169f,    4284.8540f,    4696.3335f,    5118.4551f,    5525.9839f,    5934.2686f,
+    226.1444f,     333.4511f,     682.9995f,    1307.4166f,    1554.1943f,    1849.3679f,    2116.3438f,    2756.3567f,    3204.3018f,    3540.4106f,    4002.1895f,    4402.7734f,    4796.4395f,    5192.6812f,    5600.6841f,    5960.1855f,
+    196.3791f,     299.9716f,     572.3173f,    1201.8826f,    1804.7235f,    2012.0171f,    2264.7415f,    2790.3406f,    3272.6926f,    3668.4863f,    4063.0435f,    4442.4419f,    4810.5957f,    5156.0923f,    5512.8501f,    5900.7441f,
+    280.1911f,     391.5190f,     705.9903f,    1435.5063f,    1588.2345f,    2116.5032f,    2357.1875f,    2670.7461f,    3299.0071f,    3507.9336f,    4044.3057f,    4591.9023f,    4981.4575f,    5281.1270f,    5654.7158f,    5949.9263f,
+    262.5740f,     370.5089f,     654.7243f,    1278.9299f,    1847.3096f,    2087.3394f,    2553.8892f,    2887.8269f,    3254.0747f,    3810.6626f,    4258.4390f,    4528.8022f,    4872.9741f,    5206.0483f,    5565.2876f,    5918.5596f,
+    193.6133f,     356.3127f,    1076.8109f,    1485.8608f,    1887.7994f,    2273.1333f,    2676.7832f,    3052.3513f,    3419.1294f,    3792.5024f,    4161.7036f,    4532.6431f,    4898.5176f,    5262.0498f,    5622.8901f,    5976.4863f,
+    302.7377f,     409.7598f,     899.1851f,    1176.6501f,    1531.3615f,    1933.6494f,    2229.9561f,    2819.8936f,    3031.6248f,    3807.0129f,    4118.7495f,    4412.7339f,    4704.6758f,    5012.0190f,    5351.4160f,    5892.3232f,
+    421.1889f,     587.3521f,     835.9208f,    1248.0127f,    1475.8882f,    1779.3772f,    2330.6294f,    2606.6780f,    3026.0417f,    3513.8035f,    3754.6023f,    4081.0518f,    4536.3438f,    4815.9336f,    5117.6392f,    5802.9902f,
+    378.0719f,     722.0884f,    1327.5808f,    1665.8940f,    1954.7782f,    2238.9473f,    2608.8538f,    2958.7910f,    3341.5112f,    3721.2021f,    4095.8457f,    4457.6865f,    4843.8672f,    5212.5142f,    5589.5122f,    5945.3730f,
+    468.4631f,     962.3222f,    1541.0238f,    1919.1746f,    2347.4365f,    2650.7366f,    2927.5945f,    3166.4202f,    3451.0664f,    3757.8477f,    4109.2383f,    4467.9443f,    4858.6045f,    5211.8428f,    5593.3311f,    5951.0137f,
+    422.2508f,     845.8956f,    1495.2552f,    1811.3933f,    2128.1157f,    2371.2532f,    2656.0715f,    2942.9011f,    3294.5308f,    3652.0935f,    4031.2534f,    4399.2222f,    4801.9497f,    5163.3721f,    5559.4517f,    5934.4063f,
+    423.1028f,     661.7286f,     991.1974f,    1204.3813f,    1472.8564f,    2003.0298f,    2443.5833f,    2789.2795f,    3354.1692f,    3722.7822f,    4032.7351f,    4320.9727f,    4621.8140f,    4963.7310f,    5429.8203f,    5900.1465f,
+    361.2513f,     485.9720f,     828.4865f,    1340.9952f,    1497.8477f,    2072.8511f,    2437.9839f,    2674.9912f,    3259.3357f,    3539.0474f,    3789.1389f,    4087.5015f,    4404.8867f,    4771.0947f,    5500.2227f,    6015.7041f,
+    301.8146f,     392.9569f,     685.1938f,    1783.6246f,    2034.8542f,    2257.1614f,    2519.8713f,    2782.6279f,    3152.1135f,    3400.8662f,    3614.3801f,    3906.7375f,    4233.1968f,    4712.3682f,    5596.0396f,    5998.5742f,
+    242.0591f,     371.0809f,     729.0743f,    1190.6813f,    1851.5691f,    2132.6724f,    2334.7773f,    2522.3608f,    3091.8643f,    3621.4614f,    3854.5227f,    4174.7017f,    4490.7510f,    4780.1230f,    5157.6147f,    5865.4756f,
+    431.2477f,     562.1808f,     888.5207f,    1034.2062f,    1443.2480f,    2109.8850f,    2337.1443f,    2829.1870f,    3070.1301f,    3252.6370f,    3510.3967f,    4366.2236f,    4843.2139f,    5133.0537f,    5549.8911f,    5850.3252f,
+    420.2594f,     668.9339f,     911.1281f,    1218.0372f,    1806.5541f,    2050.8423f,    2394.5708f,    2761.3542f,    3021.1716f,    3414.0020f,    3970.9626f,    4342.2900f,    4691.6074f,    5062.5386f,    5452.6655f,    5792.8384f,
+    257.3011f,     370.8905f,     604.8825f,    1096.4209f,    1711.8464f,    1934.4335f,    2319.4717f,    2769.0144f,    3019.0200f,    3354.3726f,    4119.8809f,    4354.8589f,    4557.7979f,    4893.5776f,    5450.3042f,    5910.4136f,
+    241.4264f,     347.9253f,     622.2432f,    1248.8121f,    1559.7318f,    1848.8098f,    2315.5635f,    2571.5894f,    2879.5754f,    3624.1069f,    3968.0334f,    4238.9727f,    4713.4746f,    5156.6792f,    5568.5596f,    5975.8716f,
+    478.7131f,     629.4184f,     918.1857f,    1342.7815f,    1535.1541f,    1803.0487f,    2483.7764f,    2724.4321f,    2998.1257f,    3634.9932f,    3915.9443f,    4119.2837f,    4327.0283f,    4980.3516f,    5532.6880f,    5964.3052f,
+    265.7818f,     373.8575f,     723.3755f,    1186.0619f,    1509.2827f,    2064.2075f,    2298.1992f,    2566.4395f,    2785.7659f,    3423.1396f,    3883.9011f,    4136.8940f,    4463.0386f,    5010.6592f,    5539.0337f,    5931.4414f,
+    221.4221f,     347.7610f,     707.4465f,    1187.0800f,    1575.9095f,    1824.3983f,    1979.3307f,    2299.3174f,    2967.6799f,    3472.3381f,    3955.8469f,    4292.6079f,    4794.8745f,    5127.5181f,    5652.6729f,    5953.0132f,
+    397.2769f,     510.2605f,     746.8268f,    1588.0735f,    1991.5200f,    2150.6843f,    2439.0486f,    2712.2754f,    2972.5825f,    3501.2673f,    3917.5459f,    4143.6069f,    4443.4414f,    4829.1929f,    5490.0376f,    6028.3794f,
+    280.5184f,     370.6464f,     640.7120f,    1721.3899f,    1948.9806f,    2149.9592f,    2400.4678f,    2674.0542f,    3146.3154f,    3419.8850f,    3813.9553f,    4417.4497f,    4818.3652f,    5139.6323f,    5465.0669f,    5879.7183f,
+    325.2418f,     431.2627f,    1008.7708f,    1271.9235f,    1527.4150f,    2066.6370f,    2242.3311f,    2883.4065f,    3180.6614f,    3352.5015f,    3756.9688f,    4386.6904f,    4857.6621f,    5189.2212f,    5514.7573f,    5856.8086f,
+    451.8427f,     582.4401f,     925.8821f,    1363.4249f,    1503.2460f,    1961.5940f,    2265.6001f,    2574.4414f,    3123.0769f,    3345.1587f,    3634.3022f,    4266.0137f,    4880.8052f,    5223.5776f,    5567.8901f,    5880.3770f,
+    411.0873f,     553.3847f,     809.2106f,    1023.4841f,    1189.0618f,    1786.0770f,    2121.8489f,    2454.6458f,    2947.4700f,    3220.3210f,    3828.0911f,    4218.0229f,    4831.2383f,    5322.1445f,    5727.3906f,    6033.3887f,
+    310.5608f,     442.2204f,     742.7755f,    1097.5740f,    1340.9608f,    1854.4385f,    2261.6399f,    2634.8315f,    3297.8879f,    3638.6956f,    3925.8770f,    4232.9146f,    4559.9287f,    4893.5830f,    5403.0981f,    5917.7056f,
+    377.5583f,     488.4103f,     945.2491f,    1234.1572f,    1416.0774f,    1666.5979f,    1932.9910f,    2746.2000f,    2997.4753f,    3216.6152f,    3559.3999f,    3843.8130f,    4359.6626f,    5014.2920f,    5560.6162f,    5992.7212f,
+    285.2173f,     389.6116f,     825.5790f,    1238.8229f,    1459.6588f,    1860.8855f,    2178.6296f,    2519.1597f,    2828.0032f,    3278.8101f,    3560.8286f,    4142.0552f,    4691.0698f,    5117.7778f,    5558.7944f,    5954.6680f,
+    465.7002f,     631.7491f,     914.5521f,    1340.0057f,    1562.5760f,    1844.1741f,    2186.1208f,    2483.7080f,    2901.9417f,    3190.3162f,    3474.7651f,    3873.4065f,    4240.1973f,    4761.1255f,    5428.2832f,    5958.5273f,
+    340.5456f,     449.2341f,     793.7005f,    1387.7467f,    1555.8701f,    1938.7877f,    2201.6155f,    2579.5762f,    2914.9724f,    3149.8584f,    3699.3984f,    3985.6790f,    4331.7534f,    4999.4805f,    5514.6924f,    5969.4897f,
+    395.8350f,     564.1188f,     774.8214f,    1276.3201f,    1721.8716f,    1864.0143f,    2267.5696f,    2790.2031f,    3003.9434f,    3377.6140f,    3917.7395f,    4167.3867f,    4465.2529f,    4936.1138f,    5464.0479f,    5905.0444f,
+    324.1844f,     443.0006f,     728.8958f,    1398.6589f,    1584.1820f,    1923.8724f,    2348.0903f,    2561.5554f,    3154.5991f,    3449.1746f,    3771.7927f,    4182.1899f,    4937.0791f,    5361.6509f,    5727.7656f,    6002.7505f,
+    267.1790f,     373.7663f,     703.5949f,    1173.7009f,    1390.2002f,    1905.7941f,    2177.4961f,    2703.2627f,    3022.9121f,    3308.9612f,    3798.5823f,    4187.1533f,    4703.2163f,    5136.0918f,    5571.1655f,    5966.6577f,
+    272.9294f,     399.3804f,     797.7335f,    1180.1516f,    1426.4850f,    2097.2839f,    2355.4727f,    2793.8774f,    3137.1907f,    3458.7727f,    3893.6628f,    4245.8047f,    4652.3794f,    5106.5293f,    5568.1885f,    5948.3169f,
+    324.5529f,     431.7663f,     759.6147f,    1494.8739f,    1668.8168f,    2110.5635f,    2427.4104f,    2672.9270f,    3170.5266f,    3448.2080f,    3717.1240f,    4034.2280f,    4375.3647f,    5041.1372f,    5666.9517f,    6014.7217f,
+    306.4759f,     404.5361f,     795.7795f,    1675.9967f,    1835.0950f,    2160.6624f,    2430.8855f,    2734.2646f,    3270.1426f,    3586.1355f,    3821.9670f,    4102.0078f,    4372.9404f,    4918.9146f,    5412.0376f,    5868.5225f,
+    421.3803f,     607.7995f,     813.0241f,    1286.8525f,    1827.2451f,    2026.8683f,    2333.9453f,    2730.9817f,    2988.4067f,    3303.8513f,    3759.1897f,    4057.5264f,    4441.5493f,    4890.0078f,    5212.0469f,    5672.2188f,
+    423.8560f,     599.5201f,     829.0651f,    1082.6381f,    1245.9272f,    1623.7075f,    2453.0420f,    2855.6631f,    3171.3855f,    3475.5881f,    3715.4219f,    3972.1326f,    4419.1597f,    4894.0283f,    5363.8691f,    5919.2681f,
+    441.2789f,     634.8879f,     921.6287f,    1189.0240f,    1368.7466f,    2012.1312f,    2383.7656f,    2638.5222f,    2975.0288f,    3163.6150f,    3433.9958f,    3838.9917f,    4186.6426f,    4856.8477f,    5559.1196f,    5977.2290f,
+    349.2039f,     466.2342f,     724.2582f,     904.4043f,    1190.4492f,    1981.7565f,    2226.5554f,    2592.5098f,    2865.5525f,    3195.8196f,    3735.6345f,    4267.1660f,    4810.9893f,    5207.5093f,    5605.1445f,    5952.0361f,
+    497.7713f,     719.9073f,     925.0815f,    1146.3021f,    1326.7095f,    1574.5039f,    2306.7678f,    2714.8022f,    2967.5190f,    3400.1121f,    3732.0544f,    3981.7878f,    4553.4819f,    5090.0869f,    5426.2085f,    5833.5220f,
+    471.7526f,     648.3213f,     902.1542f,    1245.7086f,    1423.3403f,    1701.1757f,    2125.8530f,    2407.0481f,    2969.5583f,    3294.1296f,    3712.8398f,    4140.7930f,    4808.4668f,    5322.3896f,    5662.1255f,    5950.6211f,
+    345.3843f,     485.9887f,     841.2579f,    1035.9401f,    1244.8905f,    1488.1833f,    2340.4253f,    2607.0859f,    2845.4153f,    3223.1768f,    3557.0696f,    4119.7944f,    4666.8896f,    5145.8589f,    5565.7534f,    5976.6875f,
+    332.4270f,     427.5984f,     829.9191f,    1138.0469f,    1339.4468f,    1589.0535f,    1926.0630f,    2432.9331f,    2699.7964f,    3311.4355f,    3716.1003f,    4270.4990f,    4760.3647f,    5208.3950f,    5619.2080f,    5971.2715f,
+    249.0114f,     381.2982f,     925.7067f,    1520.3356f,    1842.8396f,    2368.2908f,    2783.4033f,    3272.5757f,    3673.7402f,    4046.3950f,    4370.4966f,    4688.0269f,    5002.6772f,    5316.3594f,    5650.2192f,    5977.6587f,
+    263.3275f,     451.6255f,    1252.2307f,    1503.0652f,    1786.7695f,    2082.7554f,    2451.1829f,    2804.7590f,    3116.7583f,    3493.8892f,    3884.6575f,    4349.6724f,    4770.0156f,    5143.1636f,    5542.5913f,    5931.5522f,
+    252.9447f,     341.5762f,     632.7664f,    1766.8096f,    2084.1511f,    2272.7332f,    2531.1006f,    2765.2080f,    3134.5417f,    3380.6223f,    3640.8015f,    3932.7854f,    4532.1172f,    5245.2070f,    5597.0776f,    5973.6831f,
+    234.9979f,     324.6731f,    1239.8643f,    1663.1921f,    1858.7769f,    2171.1614f,    2403.8818f,    2680.6433f,    2836.4985f,    3192.6577f,    3864.8811f,    4385.8066f,    4845.9766f,    5150.2412f,    5631.1519f,    6011.7773f,
+    284.5302f,     410.1263f,     985.4119f,    1298.3987f,    1789.4304f,    1996.9287f,    2450.8525f,    2831.6011f,    2994.2073f,    3214.1306f,    3525.0498f,    3819.9141f,    4672.7544f,    5424.3545f,    5691.0732f,    5980.3096f,
+    244.2704f,     415.5891f,    1038.3009f,    1317.5186f,    1686.4528f,    2081.3147f,    2476.9873f,    2959.5393f,    3214.9561f,    3569.1431f,    3934.4736f,    4308.7114f,    4728.3687f,    5105.7964f,    5488.1938f,    5908.9443f,
+    335.8417f,     468.3464f,    1003.6253f,    1275.0145f,    1534.2854f,    1985.3167f,    2348.3411f,    2743.3169f,    2956.0967f,    3408.5063f,    3866.8574f,    4287.0034f,    4556.7222f,    4922.7832f,    5259.7480f,    5800.2876f,
+    388.2726f,     518.0591f,     832.5999f,    1325.0247f,    1528.8624f,    1808.1732f,    2151.0820f,    2486.1331f,    2815.4980f,    3158.5391f,    3635.3606f,    3960.5383f,    4671.7686f,    5371.8140f,    5777.8940f,    6056.4722f,
+    506.5153f,     673.0771f,     900.0349f,    1154.2124f,    1378.2689f,    1786.9409f,    2081.9631f,    2398.6965f,    2859.7441f,    3075.4841f,    3546.6563f,    4322.6694f,    4732.0049f,    4992.5542f,    5267.5859f,    5807.1812f,
+    487.2466f,     653.6116f,     968.5656f,    1389.2708f,    1601.5822f,    1910.9694f,    2282.4038f,    2608.7063f,    3032.6233f,    3361.9692f,    3629.8552f,    3908.8335f,    4318.4009f,    4646.5781f,    5043.5962f,    5792.7393f,
+    432.8733f,     591.7551f,     899.2619f,    1490.1176f,    1789.8751f,    2060.3750f,    2434.8779f,    2840.3374f,    3122.1292f,    3472.8079f,    3830.8870f,    4097.2622f,    4353.5464f,    4650.2075f,    4981.5752f,    5482.9565f,
+    378.4767f,     508.5656f,     802.8280f,     947.2892f,    1532.0898f,    2038.8177f,    2349.1965f,    2650.2039f,    2863.8018f,    3591.6697f,    3918.9211f,    4256.6255f,    4604.8467f,    4899.0996f,    5237.6084f,    5791.5029f,
+    407.0908f,     546.0364f,     866.1215f,    1098.6927f,    1347.2009f,    1657.1525f,    1965.5845f,    2717.7190f,    3033.4961f,    3509.9031f,    3873.4150f,    4131.4438f,    4389.5693f,    4774.2295f,    5450.1768f,    5977.5151f,
+    429.3459f,     568.8134f,     903.5659f,    1099.2942f,    1379.4979f,    2207.5940f,    2479.9919f,    2780.9072f,    3206.3960f,    3425.4084f,    3682.5911f,    3950.1941f,    4324.0840f,    4689.4922f,    5068.2534f,    5787.2852f,
+    371.9443f,     524.7249f,     890.0464f,    1670.7485f,    1958.5308f,    2182.7007f,    2558.5007f,    2835.4937f,    3192.0740f,    3634.4817f,    3950.0942f,    4259.6953f,    4628.0049f,    4999.1616f,    5364.9893f,    5801.6855f,
+    323.1922f,     451.0327f,     787.1655f,    1011.6555f,    1323.8138f,    2177.6636f,    2401.1392f,    2826.8796f,    3432.8999f,    3653.1851f,    3883.9897f,    4082.7559f,    4361.6753f,    4635.1475f,    5084.7544f,    5823.3062f,
+    377.0061f,     524.2181f,     743.6288f,    1378.9187f,    1857.6434f,    2056.4695f,    2453.7949f,    2902.1995f,    3127.2651f,    3463.3523f,    3980.1316f,    4241.2578f,    4528.5859f,    4881.4521f,    5239.3145f,    5580.5986f,
+    308.7965f,     403.7058f,     705.9506f,    1823.8571f,    2126.9387f,    2369.2810f,    2647.2048f,    2855.8276f,    3209.7708f,    3498.2310f,    3747.6047f,    3972.8647f,    4254.3325f,    4574.4292f,    5087.3965f,    5890.4219f,
+    274.7571f,     383.7251f,     573.6029f,    1142.8372f,    2151.7173f,    2558.8972f,    2751.9468f,    2987.4412f,    3234.3350f,    3526.0127f,    3922.9927f,    4189.0249f,    4483.3774f,    4877.1860f,    5396.7798f,    5921.8125f,
+    248.5916f,     423.6264f,    1260.9626f,    1696.0492f,    1972.9108f,    2298.5972f,    2592.9307f,    2947.2292f,    3266.2227f,    3614.3572f,    3980.3892f,    4359.4067f,    4770.2842f,    5158.9058f,    5554.6597f,    5936.9043f,
+    320.5471f,     429.6766f,     657.1440f,    1390.1080f,    2194.6426f,    2507.6086f,    2712.3662f,    2980.3408f,    3216.1682f,    3544.8467f,    3956.9790f,    4227.5308f,    4463.7563f,    4745.7124f,    5088.6650f,    5525.8516f,
+    245.5478f,     520.3131f,    1177.0693f,    1454.0125f,    1770.2620f,    2160.8779f,    2551.2700f,    2950.2324f,    3326.8621f,    3710.4624f,    4104.3936f,    4481.9971f,    4865.9736f,    5230.6396f,    5608.5649f,    5965.6162f,
+    514.5864f,     956.9897f,    1287.9597f,    1520.3473f,    1802.0631f,    2116.4980f,    2509.8552f,    2865.9822f,    3238.7510f,    3611.3108f,    4016.4353f,    4431.8457f,    4860.3442f,    5231.4814f,    5614.6016f,    5963.9976f,
+    537.0523f,     932.2803f,    1380.2690f,    1709.4702f,    2079.9902f,    2446.4014f,    2859.4204f,    3229.6975f,    3623.4031f,    4012.5327f,    4373.7568f,    4724.3359f,    5078.2686f,    5397.6040f,    5721.9639f,    6028.1167f,
+    452.5153f,     798.2777f,    1099.3080f,    1317.0807f,    1652.6885f,    2059.7708f,    2471.0164f,    2808.5396f,    3146.5076f,    3494.0779f,    3870.6912f,    4310.8281f,    4777.5024f,    5181.2617f,    5574.4912f,    5934.3813f,
+    340.3716f,     430.5102f,     872.3513f,    1636.3792f,    1772.8615f,    2074.0161f,    2295.1008f,    2693.0037f,    3177.7710f,    3391.7559f,    3670.8718f,    4224.3926f,    4896.3877f,    5199.9883f,    5580.4512f,    5911.7671f,
+    317.8269f,     414.8185f,     881.1970f,    1658.4944f,    1852.0098f,    2136.0415f,    2380.8228f,    2668.9141f,    3046.8027f,    3299.0051f,    3523.0593f,    3758.9412f,    4116.9063f,    5061.2124f,    5624.1777f,    5989.4761f,
+    374.0671f,     488.0840f,     734.0546f,    1415.9261f,    1648.7783f,    1852.8462f,    2099.1895f,    2347.5562f,    2954.8359f,    3269.6714f,    3536.7920f,    4116.1743f,    4481.4355f,    4913.8838f,    5467.2817f,    5909.8779f,
+    340.4291f,     448.5775f,    1041.4979f,    1426.0011f,    1637.8165f,    1968.6743f,    2210.7976f,    2647.5144f,    2913.8650f,    3131.7698f,    3429.8755f,    3722.6763f,    4104.6479f,    4969.0093f,    5574.2231f,    5978.2070f,
+    254.2538f,     412.7710f,     947.8206f,    1209.3683f,    1690.4813f,    2040.7881f,    2401.4314f,    2728.0066f,    3016.2290f,    3530.3865f,    3964.6563f,    4393.6934f,    4804.2168f,    5187.9302f,    5586.4399f,    5954.8950f,
+    241.0244f,     347.0750f,     835.2348f,    1601.9089f,    1786.4336f,    2134.3950f,    2396.0139f,    2848.9712f,    3239.9138f,    3623.8250f,    4029.5088f,    4400.3936f,    4797.3564f,    5195.7310f,    5596.6689f,    5965.9878f,
+    309.3683f,     453.6776f,     812.9343f,    1125.9915f,    1423.5935f,    2149.2227f,    2514.9277f,    3031.3599f,    3463.7219f,    3790.7839f,    4064.0039f,    4297.9839f,    4653.4551f,    5189.7061f,    5721.2954f,    6033.0752f,
+    469.4284f,     730.1902f,     973.0643f,    1170.5016f,    1572.2559f,    2084.2769f,    2567.8604f,    2963.4592f,    3286.9617f,    3580.3228f,    3882.8706f,    4335.5483f,    4859.7197f,    5258.2827f,    5627.9785f,    5957.8623f,
+    454.6165f,     795.2360f,    1078.7705f,    1294.9473f,    1761.6650f,    2235.2788f,    2695.8455f,    3095.7695f,    3473.4897f,    3833.0889f,    4185.7290f,    4528.9863f,    4893.0039f,    5240.7627f,    5608.8594f,    5951.0718f,
+    563.4587f,     875.8987f,    1139.0026f,    1378.2317f,    1855.7401f,    2279.7683f,    2651.3079f,    2968.4397f,    3279.4453f,    3607.2500f,    3975.5796f,    4358.3574f,    4768.7969f,    5135.3706f,    5525.3501f,    5904.2617f,
+    461.7852f,     855.0644f,    1367.4387f,    1702.5593f,    2141.0093f,    2500.9055f,    2853.8596f,    3123.9744f,    3406.0178f,    3694.0481f,    4028.9985f,    4373.1113f,    4768.2891f,    5137.6895f,    5541.3721f,    5921.4507f,
+    438.6031f,     753.0179f,    1269.3203f,    1630.4396f,    2027.2959f,    2350.9695f,    2672.1396f,    2957.1809f,    3250.1545f,    3546.5315f,    3894.0161f,    4249.9346f,    4666.2266f,    5061.2524f,    5490.7749f,    5904.6362f,
+    543.3182f,     828.4835f,    1239.1818f,    1471.1134f,    1737.8622f,    2037.2484f,    2434.5112f,    2801.3242f,    3162.3250f,    3508.1255f,    3849.0903f,    4165.7588f,    4588.3809f,    5020.0952f,    5475.2813f,    5904.6377f,
+    519.5982f,     837.6639f,    1171.2003f,    1363.0320f,    1617.4617f,    1976.1787f,    2472.0303f,    2901.3264f,    3340.7300f,    3736.0830f,    4103.3843f,    4444.8657f,    4800.9482f,    5145.6011f,    5544.2002f,    5933.0981f,
+    433.3774f,     582.7663f,     899.6142f,    1150.7437f,    1321.1309f,    1947.8643f,    2557.8604f,    2733.1497f,    3240.4907f,    3634.7915f,    3855.9856f,    4058.0281f,    4364.2568f,    5096.5225f,    5659.0952f,    6013.8145f,
+    424.9731f,     604.3164f,     868.1793f,    1207.7882f,    1414.2374f,    1713.2893f,    2520.2900f,    2960.8887f,    3210.8542f,    3584.5403f,    3914.5796f,    4149.8550f,    4505.7705f,    4886.9575f,    5214.5361f,    5597.8389f,
+    347.0334f,     494.2440f,     753.7191f,    1451.0435f,    1700.7461f,    1925.4844f,    2605.7988f,    2870.4744f,    3173.7312f,    3758.7219f,    4112.1929f,    4400.3882f,    4866.1016f,    5165.8799f,    5433.0371f,    5781.1509f,
+    318.4942f,     464.3939f,     783.5214f,    1491.0234f,    1708.4984f,    2280.2876f,    2533.3354f,    2885.1736f,    3443.7451f,    3669.8506f,    4000.6792f,    4269.6626f,    4571.2739f,    4827.2158f,    5277.3813f,    5850.4736f,
+    386.8698f,     519.0056f,     725.0029f,     981.5649f,    1156.1665f,    1500.4691f,    2421.7993f,    2962.4722f,    3175.0166f,    3548.4756f,    3860.7961f,    4146.4150f,    4658.9897f,    5088.3999f,    5531.8945f,    5951.4624f,
+    315.9294f,     738.5538f,    1171.9581f,    1553.7167f,    1949.9159f,    2319.6641f,    2707.5493f,    3069.2996f,    3444.6157f,    3811.2139f,    4177.5469f,    4545.6943f,    4905.0444f,    5271.3926f,    5622.6831f,    5974.4141f,
+    216.5136f,     598.1122f,    1059.3214f,    1466.4785f,    1880.1747f,    2263.6533f,    2658.3081f,    3030.4099f,    3413.6802f,    3780.1853f,    4157.1455f,    4519.1919f,    4893.5439f,    5244.3530f,    5603.1064f,    5926.8379f,
+    375.4021f,     487.0890f,     844.4013f,    1574.3596f,    1794.5249f,    2106.2878f,    2418.5217f,    2657.8938f,    3116.6096f,    3457.8625f,    3691.0596f,    3930.1062f,    4259.5928f,    4592.4370f,    5020.5078f,    5840.3989f,
+    474.3148f,     724.2144f,     974.0716f,    1283.4182f,    1521.2632f,    1746.4248f,    2333.0957f,    2874.2966f,    3111.9636f,    3440.0410f,    3752.9678f,    3975.7139f,    4294.7056f,    4821.9893f,    5201.5562f,    5658.8301f,
+    400.0291f,     564.9626f,     808.2393f,    1083.2745f,    1300.4403f,    2080.7405f,    2588.6882f,    2858.4629f,    3206.4502f,    3429.8623f,    3746.9080f,    4341.4868f,    4713.2803f,    4986.4258f,    5336.7339f,    5710.1123f,
+    354.4416f,     480.1495f,     834.1089f,    1037.7775f,    1350.0652f,    1791.1736f,    2193.0159f,    2504.6775f,    2776.0623f,    3153.0994f,    4108.1357f,    4597.4082f,    4861.9688f,    5092.8613f,    5473.2295f,    5932.0332f,
+    237.3935f,     346.9133f,     675.5335f,    1481.0535f,    1716.8414f,    1884.7153f,    2099.3057f,    2725.5403f,    3022.8506f,    3276.2922f,    3639.1001f,    4185.3926f,    4941.6597f,    5292.0093f,    5682.0391f,    5981.0215f,
+    367.4981f,     469.7130f,     820.7811f,    1219.7736f,    1368.4479f,    1624.6671f,    1804.2581f,    2607.8589f,    2891.3174f,    3212.2432f,    3760.7290f,    4015.6111f,    4618.0068f,    5129.3213f,    5652.1582f,    6042.1113f,
+    312.6796f,     415.8322f,     674.1500f,     853.7709f,    1808.7385f,    2232.5310f,    2497.8157f,    2834.2991f,    3039.7012f,    3301.4050f,    3659.2969f,    4455.9453f,    4841.4912f,    5111.6167f,    5502.2534f,    5924.6357f,
+    341.9309f,     471.7513f,     758.1926f,     979.7221f,    1287.4463f,    1737.0303f,    2160.7915f,    2664.5562f,    2961.8315f,    3461.7439f,    3732.6611f,    4109.0928f,    4568.9111f,    5037.4331f,    5511.3169f,    5966.1304f,
+    351.3721f,     462.1897f,     765.1075f,     946.3102f,    1322.8093f,    2292.2400f,    2503.6494f,    2819.7234f,    3079.2803f,    3297.6252f,    3571.4668f,    3872.0823f,    4337.6426f,    5079.1504f,    5562.8110f,    5942.7153f,
+    435.4323f,     614.4746f,     892.8980f,    1215.9469f,    1395.9762f,    1814.3936f,    2155.9590f,    2465.0427f,    3201.6211f,    3490.9224f,    3853.2620f,    4410.1855f,    4786.0625f,    5095.0181f,    5394.4805f,    5715.3364f,
+    294.6053f,     417.1553f,    1046.2922f,    1443.0247f,    1636.7180f,    1956.4248f,    2189.9697f,    2869.8071f,    3129.9385f,    3462.5681f,    3895.2805f,    4213.4541f,    4541.8950f,    5009.1958f,    5472.7642f,    5983.0063f,
+    322.1185f,     446.8733f,     689.4188f,    1338.2788f,    1643.1023f,    1903.8652f,    2494.2722f,    2804.6968f,    3103.8682f,    3640.1233f,    3965.9861f,    4172.5596f,    4404.7388f,    4670.7544f,    5240.3682f,    5893.4600f,
+    209.7024f,     336.5508f,     729.0126f,    1217.3285f,    1699.0111f,    1891.2837f,    2146.8486f,    2830.0850f,    3108.6204f,    3446.0396f,    3754.1230f,    3945.1038f,    4474.5806f,    5191.6987f,    5613.3076f,    5970.2695f,
+    346.6580f,     470.5094f,     663.3455f,    1266.9061f,    2020.5759f,    2270.5173f,    2527.3550f,    2826.9104f,    3078.3403f,    3401.2625f,    3804.3770f,    4100.3091f,    4407.7876f,    4732.2319f,    5150.2749f,    5808.2559f,
+    283.7796f,     391.4603f,    1165.6863f,    1456.1125f,    1692.9001f,    2008.4825f,    2322.7837f,    2784.0608f,    2998.5811f,    3268.5164f,    3548.9373f,    4167.1289f,    4643.9878f,    5099.2881f,    5473.0781f,    5929.8242f,
+    301.0849f,     383.1578f,     692.0848f,    1648.9374f,    1873.0947f,    2109.6113f,    2345.0110f,    2613.1121f,    2922.0193f,    3170.0020f,    3405.0774f,    3881.9875f,    4778.3154f,    5092.5205f,    5445.7100f,    5920.7896f,
+    509.1023f,     750.8580f,     963.8820f,    1295.3452f,    1634.8796f,    1818.7975f,    2151.1250f,    2590.3354f,    2867.5596f,    3238.7666f,    3747.2834f,    4053.8911f,    4457.8164f,    4928.0151f,    5295.3521f,    5789.0571f,
+    421.8951f,     547.9814f,     967.4185f,    1153.8607f,    1461.4230f,    1813.0994f,    2155.2703f,    2570.9712f,    2777.6597f,    3048.9863f,    3432.0986f,    3729.3877f,    4395.7461f,    5028.7402f,    5486.4946f,    5951.5024f,
+    340.6758f,     445.7014f,     931.8882f,    1253.4775f,    1521.9260f,    1969.5759f,    2267.5332f,    2735.0112f,    2948.7678f,    3236.5166f,    3529.5505f,    3882.3674f,    4699.5781f,    5089.6641f,    5377.7842f,    5880.7778f,
+    284.1882f,     408.6918f,     786.3123f,    1670.3220f,    2042.9493f,    2265.2275f,    2691.2012f,    3035.8762f,    3334.1719f,    3863.1194f,    4276.8916f,    4571.0420f,    4996.4404f,    5336.5205f,    5647.9556f,    5944.5996f,
+    300.0066f,     616.4817f,    1238.7324f,    1614.8296f,    1997.6188f,    2367.4343f,    2784.5605f,    3168.8354f,    3569.8250f,    3965.6011f,    4336.3804f,    4689.5874f,    5044.2012f,    5365.7456f,    5697.5654f,    6010.6572f,
+    242.9420f,     476.8371f,    1250.6661f,    1671.6031f,    2159.6443f,    2637.7417f,    3049.8589f,    3371.6045f,    3674.8706f,    3951.1006f,    4230.6416f,    4543.2827f,    4887.4478f,    5220.5581f,    5595.2686f,    5962.1313f,
+    242.6795f,     331.1335f,     635.2861f,    1801.5236f,    2084.1472f,    2264.4692f,    2506.2891f,    2799.4441f,    3236.7134f,    3489.6038f,    3859.3291f,    4424.8008f,    4964.6348f,    5298.6533f,    5640.2031f,    5988.0552f,
+    254.0538f,     336.2447f,    1216.6261f,    1717.7201f,    1886.0708f,    2176.6338f,    2405.8547f,    2762.3037f,    2934.8816f,    3167.0657f,    3385.5457f,    3804.4346f,    4848.8198f,    5286.0352f,    5630.5391f,    6086.4492f,
+    295.2298f,     426.2079f,     630.7856f,    1155.5609f,    1827.6831f,    2120.5283f,    2462.4373f,    2759.6152f,    2990.9526f,    3253.4216f,    3910.9834f,    4204.2754f,    4462.7944f,    4909.7529f,    5579.9653f,    5985.8579f,
+    298.9633f,     410.3875f,     810.1115f,    1346.1040f,    1499.2391f,    2210.3948f,    2467.9424f,    2792.7122f,    3284.0874f,    3493.0740f,    3784.1899f,    4319.6396f,    4860.6548f,    5213.8540f,    5609.8672f,    5949.6890f,
+    437.9900f,     575.3093f,     866.0077f,    1104.2080f,    1307.4966f,    1959.9323f,    2293.9365f,    2604.6704f,    2966.6514f,    3228.0056f,    3548.8499f,    4096.4424f,    4769.5420f,    5086.5449f,    5416.5317f,    5853.6909f,
+    412.4955f,     569.1867f,     864.0179f,    1117.6798f,    1348.6332f,    1976.5171f,    2334.3960f,    2640.3381f,    3006.5347f,    3327.5784f,    3695.8564f,    4042.1753f,    4362.7837f,    4687.4751f,    5389.8662f,    5966.5825f,
+    406.8686f,     542.0319f,     867.3541f,    1436.3810f,    1678.6399f,    2000.1501f,    2358.1204f,    2651.3806f,    3042.1216f,    3339.2766f,    3617.9963f,    3933.3860f,    4249.0278f,    4591.8530f,    5502.0400f,    6020.7910f,
+    375.4336f,     519.7731f,     764.5574f,    1215.1381f,    1482.9417f,    1696.8020f,    1957.0332f,    2169.1169f,    2973.4634f,    3687.7449f,    3966.8525f,    4258.8042f,    4680.6567f,    4947.0225f,    5230.9824f,    5843.2466f,
+    443.2378f,     574.0562f,     813.3345f,    1282.7894f,    1538.0752f,    1727.8997f,    2007.8584f,    2194.5601f,    2755.8220f,    3460.9243f,    3654.1399f,    4030.5530f,    4572.4727f,    4904.7847f,    5400.6147f,    5934.2656f,
+    423.6246f,     540.1947f,     862.8629f,    1386.7659f,    1577.2052f,    1811.0304f,    2046.7363f,    2309.0366f,    3129.1145f,    3533.0020f,    3738.4211f,    4021.1111f,    4357.3677f,    4634.8740f,    5307.2920f,    5944.9155f,
+    287.7661f,     401.5490f,     725.6079f,     950.8911f,    1186.5465f,    1490.1750f,    2114.7920f,    2562.4019f,    3028.3977f,    3519.6277f,    3940.5737f,    4339.3086f,    4765.8188f,    5172.3428f,    5582.8022f,    5971.0273f,
+    382.6039f,     537.7234f,     836.8093f,    1371.3546f,    1578.9803f,    1869.8213f,    2292.5596f,    2540.8601f,    3032.9834f,    3402.5059f,    3737.0569f,    4053.9937f,    4446.6240f,    5251.8457f,    5710.7935f,    6022.2925f,
+    313.2195f,     415.0511f,     690.6860f,    1561.4832f,    1815.6521f,    2059.9187f,    2345.5095f,    2614.8701f,    3006.9604f,    3291.9744f,    3590.4119f,    3996.1516f,    4365.4995f,    4853.4956f,    5465.1572f,    5954.5718f,
+    361.7959f,     448.4001f,     921.3198f,    1343.1167f,    1488.6287f,    1736.7700f,    1950.8906f,    2536.0193f,    2768.7393f,    3062.4473f,    3484.6570f,    3888.5618f,    4618.4038f,    5092.6641f,    5523.3657f,    5966.6772f,
+    249.5541f,     366.6601f,     684.6592f,    1203.0931f,    1642.2089f,    1961.8837f,    2227.3289f,    2421.1348f,    2660.5676f,    3229.5410f,    3822.5837f,    4232.7266f,    4782.5181f,    5127.2612f,    5570.2676f,    5978.9858f,
+    287.4206f,     421.3210f,     704.0352f,    1279.8597f,    1562.7307f,    2115.4241f,    2492.4517f,    2780.9470f,    3317.3616f,    3606.1492f,    4026.6375f,    4337.9014f,    4699.6895f,    4997.2573f,    5431.1787f,    5903.8628f,
+    487.9554f,     740.9349f,    1021.9616f,    1327.3262f,    1620.8544f,    1890.7717f,    2269.1218f,    2584.4868f,    2911.2896f,    3424.9221f,    3855.1670f,    4205.9272f,    4707.2466f,    5147.1846f,    5601.1152f,    5953.4673f,
+    400.8269f,     513.4500f,     786.8242f,    1269.3298f,    1441.4178f,    1696.9789f,    1911.0537f,    2223.0684f,    2847.1619f,    3113.3845f,    3670.6318f,    4146.2900f,    4555.9204f,    5083.8579f,    5574.8120f,    5987.6030f,
+    379.0329f,     487.7222f,     914.8179f,    1130.9854f,    1430.1394f,    1830.0769f,    2088.8796f,    2613.6855f,    2803.1633f,    3457.1777f,    4032.6118f,    4306.7344f,    4662.6899f,    4959.6348f,    5245.5234f,    5787.3940f,
+    340.6941f,     451.0338f,     656.2767f,     911.5805f,    1124.9330f,    1733.8730f,    2518.7861f,    2768.6851f,    3211.3733f,    3717.7583f,    3929.6772f,    4176.2993f,    4522.4517f,    5011.5547f,    5575.8784f,    6006.7222f,
+    341.5027f,     441.6417f,     807.2695f,    1060.2080f,    1251.2837f,    1478.9895f,    1750.0796f,    2594.8977f,    2924.5027f,    3401.4751f,    3852.0557f,    4292.4683f,    4718.2930f,    5159.4775f,    5562.4067f,    5972.5571f,
+    313.8985f,     421.5380f,     667.2407f,     873.6023f,    1110.1119f,    2060.7332f,    2381.0916f,    2746.2288f,    3080.5649f,    3399.9905f,    3897.5884f,    4434.9990f,    5048.1343f,    5390.8149f,    5744.3931f,    6007.9326f,
+    252.1832f,     354.2392f,     673.5427f,    1339.1161f,    1554.8853f,    2014.9351f,    2300.4138f,    2829.6182f,    3213.1714f,    3409.5105f,    3604.3242f,    3927.8020f,    4622.3218f,    5103.4565f,    5559.5024f,    5971.5986f,
+    385.2648f,     513.7607f,     760.7678f,     983.5819f,    1175.7727f,    2134.7810f,    2592.9614f,    2822.0161f,    3232.2524f,    3445.3516f,    3750.7583f,    4094.6714f,    4401.5830f,    4753.4204f,    5549.2319f,    6034.7148f,
+    220.6833f,     314.5706f,     622.2172f,    1350.8225f,    1785.5879f,    2077.5837f,    2504.2158f,    3057.6992f,    3436.0974f,    3695.2976f,    3953.4272f,    4267.8701f,    4660.6865f,    5073.6831f,    5501.9478f,    5929.9780f,
+    207.8814f,     310.4071f,     646.2098f,    1270.5835f,    1542.7271f,    2079.3804f,    2440.0339f,    2843.4690f,    3272.4854f,    3657.9851f,    4061.2014f,    4444.9780f,    4841.6060f,    5224.5947f,    5620.9141f,    5972.7261f,
+    326.1488f,     456.7737f,     740.3350f,     961.4597f,    1262.7579f,    2190.7178f,    2483.5300f,    2872.4180f,    3328.4910f,    3811.0334f,    4153.1602f,    4441.8271f,    4801.1802f,    5065.2988f,    5381.6309f,    5693.2886f,
+    206.2046f,     328.0855f,     618.9507f,     980.9994f,    1695.9775f,    1982.3051f,    2275.5444f,    2806.0271f,    3269.5178f,    3491.2456f,    3722.1775f,    4145.9121f,    4843.1167f,    5266.8677f,    5656.8794f,    5992.1201f,
+    308.1086f,     407.7706f,     806.7985f,    1045.7629f,    1401.8912f,    2108.3472f,    2331.7849f,    2952.5391f,    3174.1865f,    3374.0686f,    3645.4260f,    4292.7183f,    4939.2969f,    5250.4829f,    5607.2358f,    5932.8657f,
+    267.5990f,     378.7492f,     642.2629f,     871.7917f,    1691.7523f,    2087.5117f,    2423.1462f,    2686.1487f,    3021.7893f,    3724.0247f,    4035.5454f,    4369.5903f,    4680.1167f,    4991.4175f,    5323.6875f,    5811.7471f,
+    312.3856f,     437.4281f,     714.5340f,     899.5771f,    1632.7545f,    1938.5369f,    2295.5544f,    2625.6189f,    2900.5576f,    3295.4934f,    3557.1260f,    3960.1123f,    4731.6079f,    5141.8447f,    5502.7793f,    5954.0049f,
+    332.2842f,     449.0976f,     875.9957f,    1206.1912f,    1422.6793f,    2097.5745f,    2354.2483f,    2715.8494f,    3093.4697f,    3344.5132f,    3623.4814f,    3889.3655f,    4256.2002f,    4994.5742f,    5593.8428f,    5985.9575f,
+    286.9586f,     434.7701f,     781.3996f,    1248.3495f,    1835.5530f,    2137.1155f,    2573.7449f,    2869.9299f,    3126.0564f,    3459.1448f,    3769.4475f,    4138.3076f,    4688.0298f,    5084.9028f,    5436.8086f,    5894.2520f,
+    327.0000f,     429.0804f,     663.7327f,     849.7463f,    1174.9340f,    2383.3875f,    2695.9597f,    2941.2026f,    3214.4724f,    3433.6287f,    3778.9312f,    4134.8096f,    4504.8022f,    5066.7559f,    5599.2290f,    5985.7334f,
+    244.4052f,     499.2254f,    1294.8232f,    1689.3677f,    2123.5024f,    2572.4958f,    3042.9067f,    3446.8752f,    3836.3740f,    4175.6729f,    4485.3213f,    4792.3755f,    5094.9077f,    5386.1816f,    5699.6411f,    6008.2114f,
+    561.9757f,    1020.3204f,    1494.1995f,    1841.8171f,    2297.0906f,    2772.6184f,    3204.8804f,    3565.8628f,    3935.4106f,    4253.4141f,    4559.7021f,    4849.9653f,    5140.2852f,    5428.6934f,    5731.2251f,    6023.5078f,
+    581.6182f,    1053.5670f,    1478.5878f,    1784.4789f,    2125.1157f,    2454.5889f,    2809.0256f,    3141.7256f,    3490.7529f,    3848.5923f,    4201.7271f,    4568.7720f,    4945.9619f,    5288.6289f,    5647.7642f,    5981.9341f,
+    258.9683f,     364.0963f,     722.5463f,    1763.2114f,    1969.3870f,    2265.5239f,    2532.1821f,    2883.3557f,    3388.1838f,    3725.3120f,    4080.9338f,    4390.3818f,    4716.3599f,    5068.4941f,    5452.2778f,    5847.1401f,
+    271.5428f,     401.4228f,     695.5894f,     857.3072f,    1776.5358f,    2008.5603f,    2554.4143f,    2844.4021f,    3018.6877f,    3226.1279f,    3482.3398f,    3810.6858f,    4549.3071f,    5266.2764f,    5614.6157f,    5945.6904f,
+    330.3132f,     444.6271f,     669.0279f,     874.5479f,    1102.9247f,    2052.1780f,    2436.2378f,    2711.1165f,    3037.7537f,    3298.2036f,    3898.6858f,    4241.5415f,    4606.7637f,    5086.6919f,    5569.7397f,    5988.6797f,
+    232.3014f,     344.5512f,     578.5155f,    1213.9569f,    1880.9729f,    2105.6685f,    2335.4148f,    2550.3965f,    3147.6501f,    3491.9253f,    3791.5613f,    4159.6694f,    4642.2441f,    5103.3340f,    5605.4106f,    5989.7969f,
+    346.3687f,     444.8047f,     714.3775f,     889.1195f,    1211.8463f,    2168.7598f,    2430.2490f,    2760.6326f,    3012.4961f,    3268.8750f,    3565.1558f,    4172.5791f,    4781.5391f,    5127.6704f,    5512.6323f,    5911.3779f,
+    398.0477f,     553.8537f,     845.8521f,    1119.3066f,    1309.7244f,    1928.3351f,    2351.2095f,    2649.8230f,    3050.6750f,    3297.0566f,    3592.7275f,    3916.1785f,    4723.3325f,    5318.1221f,    5703.9697f,    5996.7651f,
+    371.4409f,     471.0789f,     896.4924f,    1197.7544f,    1400.8007f,    1611.1555f,    1867.3550f,    2818.4475f,    3002.5906f,    3250.1440f,    3546.5891f,    4265.0371f,    4890.3369f,    5274.4722f,    5659.3560f,    5946.9644f,
+    330.9331f,     448.7211f,     808.3973f,     978.2021f,    1652.6361f,    1969.0725f,    2357.0146f,    2680.4792f,    2859.9165f,    3078.9578f,    3423.6895f,    4233.3169f,    4856.7813f,    5086.5723f,    5393.9961f,    5938.6035f,
+    323.9659f,     433.8731f,    1045.5168f,    1369.1907f,    1561.9178f,    1984.2457f,    2224.0959f,    2747.3657f,    2995.0359f,    3242.9248f,    3501.0344f,    4022.2388f,    4847.4985f,    5210.9922f,    5658.1357f,    6005.0718f,
+    354.6574f,     501.6520f,     852.5305f,    1020.8707f,    1540.5925f,    1998.5675f,    2253.1487f,    2845.3960f,    3056.5273f,    3305.0466f,    3954.2900f,    4591.7471f,    4915.2856f,    5221.9082f,    5544.7285f,    5879.9150f,
+    363.1311f,     474.7310f,     907.5490f,    1106.8586f,    1367.2662f,    1646.6934f,    2031.3650f,    2326.4382f,    2568.6519f,    3030.1091f,    3905.6482f,    4265.9111f,    4716.1831f,    5017.0454f,    5469.8149f,    5958.6182f,
+    379.9262f,     524.4459f,     845.4813f,    1275.4414f,    1458.2488f,    1772.5863f,    2067.7981f,    2526.8850f,    3066.4063f,    3307.8713f,    3807.2900f,    4199.1509f,    4452.4653f,    4854.7471f,    5464.8833f,    5947.7842f,
+    371.8218f,     483.9148f,     778.2747f,    1208.0812f,    1366.3983f,    1623.4895f,    1798.8777f,    2224.6445f,    3103.7175f,    3386.0408f,    3782.8284f,    4307.4727f,    4698.8994f,    5118.1255f,    5505.1919f,    5921.1724f,
+    217.9059f,     323.3224f,     639.7305f,    1026.5331f,    1312.9242f,    1885.6948f,    2361.8403f,    2805.5396f,    3213.2600f,    3631.5017f,    4033.4087f,    4426.3423f,    4821.3203f,    5208.3833f,    5590.5205f,    5956.1538f,
+    211.9971f,     311.2018f,     504.6345f,     858.3289f,    1574.7019f,    1934.9866f,    2381.4163f,    2786.2043f,    3238.9326f,    3611.0518f,    4005.2578f,    4401.0615f,    4802.1479f,    5192.5493f,    5587.1479f,    5965.5977f,
+    219.3884f,     319.3835f,     604.0102f,    1114.8630f,    1481.3870f,    2036.0469f,    2303.4883f,    2616.1384f,    3253.6335f,    3556.5107f,    3946.6567f,    4520.3555f,    5091.0479f,    5416.3037f,    5748.5737f,    5946.5757f,
+    350.3716f,     515.4462f,     756.5206f,    1061.4270f,    1251.9570f,    1723.2751f,    2687.6689f,    3036.2019f,    3273.9678f,    3744.2939f,    4098.6284f,    4391.4160f,    4917.6777f,    5244.2852f,    5551.4976f,    5880.1572f,
+    311.6069f,     458.7317f,     795.9418f,     969.5021f,    1511.2507f,    1952.5673f,    2273.6116f,    2795.8657f,    3049.7053f,    3578.0598f,    3911.1873f,    4327.2598f,    4735.3105f,    5122.3423f,    5479.7817f,    5858.1504f,
+    267.8399f,     390.6757f,     886.2357f,    1179.5110f,    1466.6409f,    2088.7725f,    2328.1262f,    2993.5786f,    3283.5256f,    3593.2822f,    4095.7588f,    4500.4009f,    4887.5132f,    5219.0859f,    5553.4224f,    5915.6831f,
+    279.2209f,     413.3200f,     648.4438f,    1282.1798f,    1793.2556f,    1952.1060f,    2484.9436f,    2857.3630f,    3077.2114f,    3548.2585f,    4045.4526f,    4309.5947f,    4760.2900f,    5208.1948f,    5620.9717f,    5968.3237f,
+    306.2321f,     424.7843f,     618.7867f,    1288.7572f,    2110.7849f,    2346.5396f,    2582.5366f,    2833.5730f,    3074.3774f,    3464.7886f,    3984.6379f,    4262.0337f,    4601.5132f,    4999.6992f,    5498.8926f,    5920.4814f,
+    259.2613f,     353.6931f,     762.5328f,    1906.2162f,    2088.1213f,    2317.9741f,    2546.5935f,    2880.3687f,    3332.0002f,    3636.9216f,    3946.4287f,    4226.0356f,    4502.1084f,    5007.0601f,    5496.4824f,    5924.8877f,
+    244.3871f,     357.0287f,    1114.7865f,    1651.1329f,    1850.2976f,    2200.5942f,    2484.7026f,    2872.6968f,    3092.8455f,    3373.5869f,    3707.5891f,    4180.1289f,    4603.5298f,    5132.2671f,    5554.7617f,    5973.5220f,
+    700.5439f,    1363.5277f,    1745.2494f,    2081.9539f,    2379.8628f,    2623.6003f,    2883.6484f,    3133.9824f,    3457.7092f,    3819.0100f,    4191.0537f,    4547.0400f,    4912.5127f,    5241.3423f,    5594.9395f,    5930.6099f,
+    268.7704f,     370.8200f,     609.4679f,    1558.5339f,    1961.6279f,    2155.8916f,    2419.4485f,    2655.5103f,    3152.6685f,    3426.9221f,    3716.8181f,    4107.1616f,    4965.5698f,    5384.2026f,    5706.7183f,    6015.6196f,
+    305.7638f,     395.9599f,    1103.0944f,    1383.6494f,    1612.9742f,    1915.2496f,    2189.8008f,    2555.3608f,    2720.8220f,    3038.2434f,    3927.1301f,    4263.0518f,    4685.7217f,    4984.1377f,    5272.6162f,    5984.5376f,
+    294.0385f,     426.7762f,     814.5162f,    1056.9037f,    1715.3539f,    2005.3177f,    2316.4392f,    2647.4297f,    2893.8242f,    3196.7476f,    3720.0044f,    4186.9790f,    4840.4512f,    5290.1250f,    5684.2139f,    5967.5859f,
+    359.5141f,     517.6051f,     807.4898f,    1143.5930f,    1328.1393f,    1814.7098f,    2309.8894f,    2618.8655f,    3160.5962f,    3445.0479f,    3883.2664f,    4235.5200f,    4718.7324f,    5367.3608f,    5765.9331f,    6034.9233f,
+    241.5752f,     375.5109f,     818.8776f,    1298.7773f,    1656.9050f,    2169.8962f,    2565.1440f,    3015.9919f,    3437.9463f,    3863.8203f,    4254.4023f,    4637.0952f,    5027.8252f,    5358.3784f,    5685.5000f,    5980.4063f,
+    322.5406f,     454.9644f,     963.3659f,    1513.8885f,    1704.5070f,    2235.6599f,    2523.6467f,    2995.0757f,    3287.8682f,    3552.8811f,    3872.4360f,    4201.2227f,    4571.9087f,    5066.6792f,    5562.1206f,    5935.7900f,
+    412.5748f,     615.8419f,    1126.9519f,    1455.5172f,    1653.3076f,    1965.2689f,    2240.6904f,    2672.5129f,    3127.3301f,    3477.8540f,    3983.6145f,    4458.6558f,    4896.7998f,    5237.9814f,    5609.1597f,    5939.6416f,
+    342.1361f,     470.6100f,     958.3576f,    1195.0166f,    1426.4667f,    1684.2009f,    2194.0950f,    2545.9453f,    2946.1851f,    3415.2820f,    3657.4158f,    4408.6763f,    5097.2251f,    5404.2202f,    5719.9829f,    5977.7959f,
+    297.8767f,     386.6347f,    1095.8346f,    1454.3085f,    1651.6417f,    1927.9633f,    2198.4927f,    2583.1694f,    2757.0144f,    3009.6497f,    3310.9514f,    3956.9753f,    4677.3208f,    5122.2222f,    5539.0688f,    5993.0542f,
+    334.7170f,     450.1582f,     747.3162f,    1560.2024f,    1808.2147f,    2006.5011f,    2415.2419f,    2680.1956f,    3016.5549f,    3651.1340f,    3975.3625f,    4209.6563f,    4531.0396f,    5121.7212f,    5585.2202f,    5962.3667f,
+    256.4101f,     495.5723f,    1341.4860f,    1805.1255f,    2201.8318f,    2514.7769f,    2820.4092f,    3102.3867f,    3414.3872f,    3754.7742f,    4108.2378f,    4465.9258f,    4857.4355f,    5216.2144f,    5592.3076f,    5951.9995f,
+    530.7974f,    1017.4255f,    1463.9575f,    1858.6631f,    2360.1265f,    2770.3811f,    3106.0894f,    3379.1919f,    3647.7175f,    3895.9026f,    4188.8652f,    4522.8984f,    4893.7954f,    5241.4312f,    5623.8994f,    5975.3608f,
+    597.1553f,    1198.0758f,    1722.7361f,    2128.6658f,    2519.1504f,    2825.5122f,    3086.1943f,    3330.0283f,    3608.2961f,    3906.9929f,    4241.8105f,    4603.1694f,    4972.8159f,    5308.1670f,    5651.1968f,    5976.6704f,
+    699.1581f,    1293.3193f,    1637.3395f,    1912.7987f,    2163.3445f,    2425.7944f,    2704.0396f,    3006.5984f,    3358.2126f,    3746.1548f,    4125.0762f,    4489.7485f,    4854.0088f,    5188.5146f,    5558.2056f,    5913.3164f,
+    489.0107f,     921.4806f,    1329.8511f,    1644.8383f,    2013.6794f,    2365.2683f,    2746.1553f,    3085.6912f,    3457.0234f,    3825.2183f,    4203.4224f,    4575.9331f,    4950.6606f,    5298.7559f,    5659.8618f,    5997.0015f,
+    230.3653f,     389.8415f,     938.1970f,    1294.3594f,    1768.8275f,    2189.1001f,    2597.3755f,    2985.8518f,    3323.6023f,    3705.8533f,    4065.5361f,    4446.4224f,    4818.4502f,    5185.9634f,    5583.2168f,    5954.2573f,
+    283.9404f,     400.2146f,     630.6198f,    1491.5646f,    2295.1375f,    2496.3457f,    2726.5803f,    2971.1951f,    3207.2317f,    3634.5439f,    4178.0376f,    4423.5537f,    4836.2109f,    5172.1821f,    5464.0454f,    5777.5801f,
+    242.6232f,     351.1541f,     807.9852f,    1621.9950f,    2043.8676f,    2532.5122f,    2860.5505f,    3200.3403f,    3499.8274f,    3760.3772f,    4068.9617f,    4410.7339f,    4778.8413f,    5153.0142f,    5553.1997f,    5932.5996f,
+    227.3320f,     323.2667f,     752.3189f,    1572.3750f,    1930.6083f,    2355.0117f,    2717.6223f,    2968.3215f,    3233.4026f,    3551.9622f,    3918.5608f,    4346.0190f,    4778.6880f,    5159.6172f,    5568.5566f,    5980.8086f,
+    307.9120f,     439.7297f,     660.0276f,    1243.3854f,    1532.3577f,    1796.3936f,    2437.3232f,    2691.4072f,    3030.3025f,    3524.1379f,    3771.7576f,    4083.2375f,    4601.1567f,    4963.4697f,    5434.8530f,    5942.8315f
+};
 
 /*------------------------------------------------------------------*
 * vlpc_1st_dec()
@@ -35,3 +296,5 @@ void vlpc_1st_dec(
     return;
 
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/vlpc_2st_dec.cpp b/src/libs/libevs/lib_dec/vlpc_2st_dec.cpp
index 51fc3508..88f7c1d8 100644
--- a/src/libs/libevs/lib_dec/vlpc_2st_dec.cpp
+++ b/src/libs/libevs/lib_dec/vlpc_2st_dec.cpp
@@ -7,6 +7,9 @@
 #include <math.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 /*------------------------------------------------------------------*
 * vlpc_2st_dec()
 *
@@ -40,3 +43,5 @@ void vlpc_2st_dec(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/voiced_dec.cpp b/src/libs/libevs/lib_dec/voiced_dec.cpp
index 08e71791..72becc1b 100644
--- a/src/libs/libevs/lib_dec/voiced_dec.cpp
+++ b/src/libs/libevs/lib_dec/voiced_dec.cpp
@@ -8,6 +8,9 @@
 #include "cnst.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * ppp_voiced_decoder()
  *
@@ -185,3 +188,5 @@ void ppp_voiced_decoder(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/voip_client.cpp b/src/libs/libevs/lib_dec/voip_client.cpp
index 2ac31128..8a101b2a 100644
--- a/src/libs/libevs/lib_dec/voip_client.cpp
+++ b/src/libs/libevs/lib_dec/voip_client.cpp
@@ -14,6 +14,9 @@
 #include "EvsRXlib.h"
 #include "g192.h"
 
+namespace evs { 
+
+
 
 /*------------------------------------------------------------------------------------------*
  * Global variables
@@ -271,3 +274,5 @@ int decodeVoip(
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_dec/waveadjust_fec_dec.cpp b/src/libs/libevs/lib_dec/waveadjust_fec_dec.cpp
index 292c82a4..14cd6f79 100644
--- a/src/libs/libevs/lib_dec/waveadjust_fec_dec.cpp
+++ b/src/libs/libevs/lib_dec/waveadjust_fec_dec.cpp
@@ -10,6 +10,9 @@
 #include <limits.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 static void LpFilter2(float *x, float *y, int N, float *mem);
@@ -781,3 +784,5 @@ void concealment_signal_tuning(int bfi, int curr_mode, float *outx_new, void *_p
     }
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/FEC_enc.cpp b/src/libs/libevs/lib_enc/FEC_enc.cpp
index 56223cd6..09c821ee 100644
--- a/src/libs/libevs/lib_enc/FEC_enc.cpp
+++ b/src/libs/libevs/lib_enc/FEC_enc.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * FEC_encode()
  *
@@ -237,3 +240,5 @@ void FEC_lsf_estim_enc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/SNR_calc.cpp b/src/libs/libevs/lib_enc/SNR_calc.cpp
index b5a19e8a..6e0e6fe5 100644
--- a/src/libs/libevs/lib_enc/SNR_calc.cpp
+++ b/src/libs/libevs/lib_enc/SNR_calc.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 
 
@@ -182,3 +185,5 @@ void calc_lf_snr(float *lf_snr_smooth,       /*(o) smoothed lf_snr*/
     *lf_snr = l_snr;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/analy_lp.cpp b/src/libs/libevs/lib_enc/analy_lp.cpp
index 84ee7ce7..37f92e58 100644
--- a/src/libs/libevs/lib_enc/analy_lp.cpp
+++ b/src/libs/libevs/lib_enc/analy_lp.cpp
@@ -143,4 +143,4 @@ void analy_lp_AMR_WB(
     return;
 }
 
-// end of namespace
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/bass_psfilter_enc.cpp b/src/libs/libevs/lib_enc/bass_psfilter_enc.cpp
index e9bc2daf..688a20bb 100644
--- a/src/libs/libevs/lib_enc/bass_psfilter_enc.cpp
+++ b/src/libs/libevs/lib_enc/bass_psfilter_enc.cpp
@@ -11,6 +11,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 
 /*---------------------------------------------------------------------*
@@ -210,3 +213,5 @@ float bass_pf_enc(
     return(snr);
 
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/bw_detect.cpp b/src/libs/libevs/lib_enc/bw_detect.cpp
index 04639b0b..86c125e5 100644
--- a/src/libs/libevs/lib_enc/bw_detect.cpp
+++ b/src/libs/libevs/lib_enc/bw_detect.cpp
@@ -10,6 +10,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -503,3 +506,5 @@ void bw_detect(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/cng_enc.cpp b/src/libs/libevs/lib_enc/cng_enc.cpp
index 21c51ce8..bde0629b 100644
--- a/src/libs/libevs/lib_enc/cng_enc.cpp
+++ b/src/libs/libevs/lib_enc/cng_enc.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local constants
  *---------------------------------------------------------------------*/
@@ -999,3 +1002,5 @@ static short shb_DTX(
 
     return (update);
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/cod2t32.cpp b/src/libs/libevs/lib_enc/cod2t32.cpp
index d6137a32..3397afdf 100644
--- a/src/libs/libevs/lib_enc/cod2t32.cpp
+++ b/src/libs/libevs/lib_enc/cod2t32.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * Local constants
@@ -302,3 +305,5 @@ void acelp_1t64(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/cod4t64.cpp b/src/libs/libevs/lib_enc/cod4t64.cpp
index 8e435642..a7c40ace 100644
--- a/src/libs/libevs/lib_enc/cod4t64.cpp
+++ b/src/libs/libevs/lib_enc/cod4t64.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * Local functions
@@ -955,3 +958,5 @@ short E_ACELP_code43bit(const float code[], long unsigned *ps, int *p, unsigned
     return saved_bits;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/cod_ace.cpp b/src/libs/libevs/lib_enc/cod_ace.cpp
index a1e7f13b..5a5e9738 100644
--- a/src/libs/libevs/lib_enc/cod_ace.cpp
+++ b/src/libs/libevs/lib_enc/cod_ace.cpp
@@ -10,6 +10,9 @@
 #include "options.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * coder_acelp()
  *
@@ -427,3 +430,5 @@ void coder_acelp(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/cod_tcx.cpp b/src/libs/libevs/lib_enc/cod_tcx.cpp
index d257bddd..ec715749 100644
--- a/src/libs/libevs/lib_enc/cod_tcx.cpp
+++ b/src/libs/libevs/lib_enc/cod_tcx.cpp
@@ -9,6 +9,9 @@
 #include <assert.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
 * HBAutocorrelation()
@@ -1334,3 +1337,5 @@ void coder_tcx_post(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/cod_uv.cpp b/src/libs/libevs/lib_enc/cod_uv.cpp
index a7de3cc9..6cf43c9b 100644
--- a/src/libs/libevs/lib_enc/cod_uv.cpp
+++ b/src/libs/libevs/lib_enc/cod_uv.cpp
@@ -8,6 +8,9 @@
 #include <assert.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * gauss_L2:
@@ -61,3 +64,5 @@ void gauss_L2(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/comvad_decision.cpp b/src/libs/libevs/lib_enc/comvad_decision.cpp
index 489cf579..e4fe336f 100644
--- a/src/libs/libevs/lib_enc/comvad_decision.cpp
+++ b/src/libs/libevs/lib_enc/comvad_decision.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 
 static int comvad_hangover(
@@ -817,3 +820,5 @@ static int comvad_hangover(float lt_snr_org,              /*(i)original long tim
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/cor_shif.cpp b/src/libs/libevs/lib_enc/cor_shif.cpp
index b607d518..e21009da 100644
--- a/src/libs/libevs/lib_enc/cor_shif.cpp
+++ b/src/libs/libevs/lib_enc/cor_shif.cpp
@@ -5,6 +5,9 @@
 #include <math.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Correlation_shift
  *
@@ -34,3 +37,5 @@ float correlation_shift(       /* o  : noise dependent voicing correction     */
     }
     return corr_shift;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/core_enc_2div.cpp b/src/libs/libevs/lib_enc/core_enc_2div.cpp
index 8212d218..269dba69 100644
--- a/src/libs/libevs/lib_enc/core_enc_2div.cpp
+++ b/src/libs/libevs/lib_enc/core_enc_2div.cpp
@@ -11,6 +11,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * core_encode_twodiv()
@@ -226,3 +229,5 @@ void core_encode_twodiv(
     return;
 
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/core_enc_init.cpp b/src/libs/libevs/lib_enc/core_enc_init.cpp
index cd013c11..814065d0 100644
--- a/src/libs/libevs/lib_enc/core_enc_init.cpp
+++ b/src/libs/libevs/lib_enc/core_enc_init.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------------*
  * Local functions
@@ -718,3 +721,5 @@ static void init_modes(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/core_enc_ol.cpp b/src/libs/libevs/lib_enc/core_enc_ol.cpp
index 11b36b4c..42b2863b 100644
--- a/src/libs/libevs/lib_enc/core_enc_ol.cpp
+++ b/src/libs/libevs/lib_enc/core_enc_ol.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local functions
  *-------------------------------------------------------------------*/
@@ -1190,3 +1193,5 @@ static void BITS_ALLOC_TCX_config_rf(
     }
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/core_enc_reconf.cpp b/src/libs/libevs/lib_enc/core_enc_reconf.cpp
index f708ec0a..41f35e65 100644
--- a/src/libs/libevs/lib_enc/core_enc_reconf.cpp
+++ b/src/libs/libevs/lib_enc/core_enc_reconf.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * Funtion  core_coder_reconfig                                    *
@@ -172,3 +175,5 @@ void core_coder_reconfig(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/core_enc_switch.cpp b/src/libs/libevs/lib_enc/core_enc_switch.cpp
index 65754c39..d961f18b 100644
--- a/src/libs/libevs/lib_enc/core_enc_switch.cpp
+++ b/src/libs/libevs/lib_enc/core_enc_switch.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * core_coder_mode_switch()
  *
@@ -163,3 +166,5 @@ void core_coder_mode_switch(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/core_enc_updt.cpp b/src/libs/libevs/lib_enc/core_enc_updt.cpp
index 7a1d7d22..76691e34 100644
--- a/src/libs/libevs/lib_enc/core_enc_updt.cpp
+++ b/src/libs/libevs/lib_enc/core_enc_updt.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
 * core_encode_update()
@@ -183,3 +186,5 @@ void core_encode_update_cng(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/core_switching_enc.cpp b/src/libs/libevs/lib_enc/core_switching_enc.cpp
index b5716a9b..23cb7f06 100644
--- a/src/libs/libevs/lib_enc/core_switching_enc.cpp
+++ b/src/libs/libevs/lib_enc/core_switching_enc.cpp
@@ -10,6 +10,9 @@
 #include "math.h"
 #include "assert.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * core_switching_pre_enc()
  *
@@ -416,3 +419,5 @@ void core_switching_hq_prepare_enc(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/corr_xh.cpp b/src/libs/libevs/lib_enc/corr_xh.cpp
index 43803406..519ae272 100644
--- a/src/libs/libevs/lib_enc/corr_xh.cpp
+++ b/src/libs/libevs/lib_enc/corr_xh.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * corr_xh()
  *
@@ -39,3 +42,5 @@ void corr_xh(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/decision_matrix_enc.cpp b/src/libs/libevs/lib_enc/decision_matrix_enc.cpp
index ebddae1a..0b698002 100644
--- a/src/libs/libevs/lib_enc/decision_matrix_enc.cpp
+++ b/src/libs/libevs/lib_enc/decision_matrix_enc.cpp
@@ -10,6 +10,9 @@
 #include "stat_dec.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * decision_matrix_enc()
@@ -634,3 +637,5 @@ void signalling_enc_rf(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/detect_transient.cpp b/src/libs/libevs/lib_enc/detect_transient.cpp
index e15d89a6..7d827d1e 100644
--- a/src/libs/libevs/lib_enc/detect_transient.cpp
+++ b/src/libs/libevs/lib_enc/detect_transient.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------
  * hp_filter()
@@ -226,3 +229,5 @@ short detect_transient(                /* o  : transient flag           */
 
     return IsTransient;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/diffcod.cpp b/src/libs/libevs/lib_enc/diffcod.cpp
index c3caf4d0..930711e5 100644
--- a/src/libs/libevs/lib_enc/diffcod.cpp
+++ b/src/libs/libevs/lib_enc/diffcod.cpp
@@ -6,6 +6,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*/
 /*  Function  diffcod                                                       */
@@ -123,3 +126,5 @@ void diffcod_lrmdct(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/dtx.cpp b/src/libs/libevs/lib_enc/dtx.cpp
index 43026b52..d74b6df5 100644
--- a/src/libs/libevs/lib_enc/dtx.cpp
+++ b/src/libs/libevs/lib_enc/dtx.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -655,3 +658,5 @@ void dtx_hangover_control(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_acelp.cpp b/src/libs/libevs/lib_enc/enc_acelp.cpp
index bdbf03e1..a8f44de6 100644
--- a/src/libs/libevs/lib_enc/enc_acelp.cpp
+++ b/src/libs/libevs/lib_enc/enc_acelp.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 
 /*---------------------------------------------------------------------*
@@ -1451,3 +1454,5 @@ void fcb_pulse_track_joint( unsigned short *idxs, int wordcnt, long unsigned *in
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_acelp_tcx_main.cpp b/src/libs/libevs/lib_enc/enc_acelp_tcx_main.cpp
index 9cd59071..1293ee2e 100644
--- a/src/libs/libevs/lib_enc/enc_acelp_tcx_main.cpp
+++ b/src/libs/libevs/lib_enc/enc_acelp_tcx_main.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * enc_acelp_tcx_main()
@@ -101,3 +104,5 @@ void enc_acelp_tcx_main(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_acelpx.cpp b/src/libs/libevs/lib_enc/enc_acelpx.cpp
index e99a55a8..34614cc1 100644
--- a/src/libs/libevs/lib_enc/enc_acelpx.cpp
+++ b/src/libs/libevs/lib_enc/enc_acelpx.cpp
@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 
 /* Iterations: nb_pos_ix*16 */
@@ -471,3 +474,5 @@ void E_ACELP_4tsearchx(
     return;
 
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_amr_wb.cpp b/src/libs/libevs/lib_enc/enc_amr_wb.cpp
index 0fd1c735..e68ce9a3 100644
--- a/src/libs/libevs/lib_enc/enc_amr_wb.cpp
+++ b/src/libs/libevs/lib_enc/enc_amr_wb.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * encod_amr_wb()
@@ -196,3 +199,5 @@ void encod_amr_wb(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_gain.cpp b/src/libs/libevs/lib_enc/enc_gain.cpp
index c5456ea9..bbbe52f3 100644
--- a/src/libs/libevs/lib_enc/enc_gain.cpp
+++ b/src/libs/libevs/lib_enc/enc_gain.cpp
@@ -12,6 +12,9 @@
 #include "rom_enc.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 
 
@@ -233,3 +236,5 @@ Word32 E_GAIN_closed_loop_search(Float32 exc[],
 
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_gen_voic.cpp b/src/libs/libevs/lib_enc/enc_gen_voic.cpp
index 186e9b1f..8c137393 100644
--- a/src/libs/libevs/lib_enc/enc_gen_voic.cpp
+++ b/src/libs/libevs/lib_enc/enc_gen_voic.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * encod_gen_voic()
@@ -306,3 +309,5 @@ void encod_gen_voic(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_gen_voic_rf.cpp b/src/libs/libevs/lib_enc/enc_gen_voic_rf.cpp
index 19c04e6a..1320ba55 100644
--- a/src/libs/libevs/lib_enc/enc_gen_voic_rf.cpp
+++ b/src/libs/libevs/lib_enc/enc_gen_voic_rf.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * reset_rf_indices()
@@ -381,3 +384,5 @@ void coder_acelp_rf(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_higher_acelp.cpp b/src/libs/libevs/lib_enc/enc_higher_acelp.cpp
index 341fe2ff..bff41861 100644
--- a/src/libs/libevs/lib_enc/enc_higher_acelp.cpp
+++ b/src/libs/libevs/lib_enc/enc_higher_acelp.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * Local functions
@@ -329,3 +332,5 @@ short gain_quant(           /* o:   quantization index            */
 
     return(index);
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_nelp.cpp b/src/libs/libevs/lib_enc/enc_nelp.cpp
index b8e1ade8..7959b4e6 100644
--- a/src/libs/libevs/lib_enc/enc_nelp.cpp
+++ b/src/libs/libevs/lib_enc/enc_nelp.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * encod_nelp()
  *
@@ -111,3 +114,5 @@ void encod_nelp(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_pit_exc.cpp b/src/libs/libevs/lib_enc/enc_pit_exc.cpp
index 8919c53c..42d114e3 100644
--- a/src/libs/libevs/lib_enc/enc_pit_exc.cpp
+++ b/src/libs/libevs/lib_enc/enc_pit_exc.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * enc_pit_exc()
  *
@@ -275,3 +278,5 @@ void enc_pit_exc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_ppp.cpp b/src/libs/libevs/lib_enc/enc_ppp.cpp
index 884b7cdb..f04f9fe3 100644
--- a/src/libs/libevs/lib_enc/enc_ppp.cpp
+++ b/src/libs/libevs/lib_enc/enc_ppp.cpp
@@ -8,6 +8,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------
  * encod_ppp()
  *
@@ -163,3 +166,5 @@ void encod_ppp(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_prm.cpp b/src/libs/libevs/lib_enc/enc_prm.cpp
index 0d389377..0d8155ca 100644
--- a/src/libs/libevs/lib_enc/enc_prm.cpp
+++ b/src/libs/libevs/lib_enc/enc_prm.cpp
@@ -12,6 +12,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * enc_prm_hm()
@@ -769,3 +772,5 @@ void enc_prm(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_tran.cpp b/src/libs/libevs/lib_enc/enc_tran.cpp
index f6d52424..28e7e306 100644
--- a/src/libs/libevs/lib_enc/enc_tran.cpp
+++ b/src/libs/libevs/lib_enc/enc_tran.cpp
@@ -6,6 +6,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * encod_tran()
  *
@@ -312,3 +315,5 @@ short encod_tran(
 
     return tc_subfr;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/enc_uv.cpp b/src/libs/libevs/lib_enc/enc_uv.cpp
index 17c83209..0c7dc933 100644
--- a/src/libs/libevs/lib_enc/enc_uv.cpp
+++ b/src/libs/libevs/lib_enc/enc_uv.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * encod_unvoiced()
  *
@@ -106,3 +109,5 @@ void encod_unvoiced(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/encoder.cpp b/src/libs/libevs/lib_enc/encoder.cpp
index 3c994d01..1bf8dfbc 100644
--- a/src/libs/libevs/lib_enc/encoder.cpp
+++ b/src/libs/libevs/lib_enc/encoder.cpp
@@ -15,6 +15,9 @@
 #include "rom_com.h"
 #include "g192.h"
 
+namespace evs { 
+
+
 /*------------------------------------------------------------------------------------------*
  * Global variables
  *------------------------------------------------------------------------------------------*/
@@ -219,3 +222,5 @@ int main( int argc, char** argv )
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/energy.cpp b/src/libs/libevs/lib_enc/energy.cpp
index b05a9f71..6c277a49 100644
--- a/src/libs/libevs/lib_enc/energy.cpp
+++ b/src/libs/libevs/lib_enc/energy.cpp
@@ -9,6 +9,9 @@
 #include "cnst.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 
 void background_update(T_CldfbVadState *st,
@@ -207,3 +210,5 @@ void est_energy(float sb_power[],                  /*(o) energy of sub-band divi
     *p_frame_energy2 = frame_energy2;
     *p_frame_energy = frame_energy2 + (sb_power_scale[bw]*sb_power[0] / (32768.f * 32768.f));
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/eval_pit_contr.cpp b/src/libs/libevs/lib_enc/eval_pit_contr.cpp
index 4a0c7e4f..a247f4c5 100644
--- a/src/libs/libevs/lib_enc/eval_pit_contr.cpp
+++ b/src/libs/libevs/lib_enc/eval_pit_contr.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local constantes
@@ -315,3 +318,5 @@ short Pit_exc_contribution_len(   /* o  : bin where pitch contribution is signif
 
     return last_pit_bin;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/evs_enc.cpp b/src/libs/libevs/lib_enc/evs_enc.cpp
index 2c955283..b5790c29 100644
--- a/src/libs/libevs/lib_enc/evs_enc.cpp
+++ b/src/libs/libevs/lib_enc/evs_enc.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
 * Local functions
 *-------------------------------------------------------------------*/
@@ -699,3 +702,5 @@ static void configure_core_coder(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/ext_sig_ana.cpp b/src/libs/libevs/lib_enc/ext_sig_ana.cpp
index fc90a1c1..9aab7e6d 100644
--- a/src/libs/libevs/lib_enc/ext_sig_ana.cpp
+++ b/src/libs/libevs/lib_enc/ext_sig_ana.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
 * core_signal_analysis_high_bitrate()
@@ -254,3 +257,5 @@ void core_signal_analysis_high_bitrate(
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/fd_cng_enc.cpp b/src/libs/libevs/lib_enc/fd_cng_enc.cpp
index c8d28bea..7e29ef98 100644
--- a/src/libs/libevs/lib_enc/fd_cng_enc.cpp
+++ b/src/libs/libevs/lib_enc/fd_cng_enc.cpp
@@ -10,6 +10,9 @@
 #include "stat_enc.h"
 #include "options.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
 * createFdCngEnc()
 *
@@ -746,3 +749,5 @@ void generate_comfort_noise_enc( Encoder_State *stcod )
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/find_tar.cpp b/src/libs/libevs/lib_enc/find_tar.cpp
index a666a673..0f45b190 100644
--- a/src/libs/libevs/lib_enc/find_tar.cpp
+++ b/src/libs/libevs/lib_enc/find_tar.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * find_targets()
  *
@@ -84,3 +87,5 @@ void find_targets(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/find_tilt.cpp b/src/libs/libevs/lib_enc/find_tilt.cpp
index 087b2c05..32279d30 100644
--- a/src/libs/libevs/lib_enc/find_tilt.cpp
+++ b/src/libs/libevs/lib_enc/find_tilt.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local constants
  *---------------------------------------------------------------------*/
@@ -181,3 +184,5 @@ void find_tilt(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/find_uv.cpp b/src/libs/libevs/lib_enc/find_uv.cpp
index 0fa00d36..8c1c3da1 100644
--- a/src/libs/libevs/lib_enc/find_uv.cpp
+++ b/src/libs/libevs/lib_enc/find_uv.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -411,3 +414,5 @@ short find_uv(                              /* o  : coding type
 
     return coder_type;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/find_wsp.cpp b/src/libs/libevs/lib_enc/find_wsp.cpp
index 4e491305..37d0fcfa 100644
--- a/src/libs/libevs/lib_enc/find_wsp.cpp
+++ b/src/libs/libevs/lib_enc/find_wsp.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * find_wsp()
  *
@@ -59,3 +62,5 @@ void find_wsp(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/frame_spec_dif_cor_rate.cpp b/src/libs/libevs/lib_enc/frame_spec_dif_cor_rate.cpp
index 2256549d..d289a365 100644
--- a/src/libs/libevs/lib_enc/frame_spec_dif_cor_rate.cpp
+++ b/src/libs/libevs/lib_enc/frame_spec_dif_cor_rate.cpp
@@ -5,6 +5,9 @@
 #include <math.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * frame_spec_dif_cor_rate()
  *
@@ -60,3 +63,5 @@ void frame_spec_dif_cor_rate(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/gain_enc.cpp b/src/libs/libevs/lib_enc/gain_enc.cpp
index 36bbaa77..d733b966 100644
--- a/src/libs/libevs/lib_enc/gain_enc.cpp
+++ b/src/libs/libevs/lib_enc/gain_enc.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -984,3 +987,5 @@ void gain_enc_lbr(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/gaus_enc.cpp b/src/libs/libevs/lib_enc/gaus_enc.cpp
index 528f113c..f5ac41df 100644
--- a/src/libs/libevs/lib_enc/gaus_enc.cpp
+++ b/src/libs/libevs/lib_enc/gaus_enc.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -427,3 +430,5 @@ static short cod_2pos(  /* o  : codebook quantization index   */
 
     return index;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/gp_clip.cpp b/src/libs/libevs/lib_enc/gp_clip.cpp
index 126f909c..df7e22aa 100644
--- a/src/libs/libevs/lib_enc/gp_clip.cpp
+++ b/src/libs/libevs/lib_enc/gp_clip.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
 * Local constants
 *-------------------------------------------------------------------*/
@@ -211,3 +214,5 @@ void gp_clip_test_gain_pit(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/gs_enc.cpp b/src/libs/libevs/lib_enc/gs_enc.cpp
index 6a2fbb82..f611e7a4 100644
--- a/src/libs/libevs/lib_enc/gs_enc.cpp
+++ b/src/libs/libevs/lib_enc/gs_enc.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local functions
  *-------------------------------------------------------------------*/
@@ -467,3 +470,5 @@ static float edyn(         /* o  : ratio of max to mean    */
 
     return dyn;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/guided_plc_enc.cpp b/src/libs/libevs/lib_enc/guided_plc_enc.cpp
index aa5aeb4c..ea2e2e60 100644
--- a/src/libs/libevs/lib_enc/guided_plc_enc.cpp
+++ b/src/libs/libevs/lib_enc/guided_plc_enc.cpp
@@ -5,6 +5,9 @@
 #include "stat_enc.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
 * coderLookAheadInnovation()
@@ -365,3 +368,5 @@ void getConcealedlsf(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/hf_cod_amrwb.cpp b/src/libs/libevs/lib_enc/hf_cod_amrwb.cpp
index f8918643..a548616a 100644
--- a/src/libs/libevs/lib_enc/hf_cod_amrwb.cpp
+++ b/src/libs/libevs/lib_enc/hf_cod_amrwb.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local functions
  *---------------------------------------------------------------------*/
@@ -305,3 +308,5 @@ static void filt_6k_8k(
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/hq_classifier_enc.cpp b/src/libs/libevs/lib_enc/hq_classifier_enc.cpp
index cbfc7db9..a058e873 100644
--- a/src/libs/libevs/lib_enc/hq_classifier_enc.cpp
+++ b/src/libs/libevs/lib_enc/hq_classifier_enc.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local constants
  *-----------------------------------------------------------------*/
@@ -500,3 +503,5 @@ static void hvq_classifier(
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/hq_core_enc.cpp b/src/libs/libevs/lib_enc/hq_core_enc.cpp
index d03927a3..2e4d1d07 100644
--- a/src/libs/libevs/lib_enc/hq_core_enc.cpp
+++ b/src/libs/libevs/lib_enc/hq_core_enc.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------
  * hq_core_enc()
  *
@@ -156,3 +159,5 @@ void hq_core_enc(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/hq_env_enc.cpp b/src/libs/libevs/lib_enc/hq_env_enc.cpp
index c576c880..8fdd5f5b 100644
--- a/src/libs/libevs/lib_enc/hq_env_enc.cpp
+++ b/src/libs/libevs/lib_enc/hq_env_enc.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------------------*
  * encode_envelope_indices()
  *
@@ -526,3 +529,5 @@ void diff_envelope_coding(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/hq_hr_enc.cpp b/src/libs/libevs/lib_enc/hq_hr_enc.cpp
index 5083822f..6f7903fa 100644
--- a/src/libs/libevs/lib_enc/hq_hr_enc.cpp
+++ b/src/libs/libevs/lib_enc/hq_hr_enc.cpp
@@ -9,6 +9,9 @@
 #include "rom_enc.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * hq_hr_enc()
  *
@@ -194,3 +197,5 @@ void hq_hr_enc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/hq_lr_enc.cpp b/src/libs/libevs/lib_enc/hq_lr_enc.cpp
index d81ff373..31422ecd 100644
--- a/src/libs/libevs/lib_enc/hq_lr_enc.cpp
+++ b/src/libs/libevs/lib_enc/hq_lr_enc.cpp
@@ -10,6 +10,9 @@
 #include "stl.h"
 #include "basop_util.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * Local functions
  *--------------------------------------------------------------------------*/
@@ -1674,3 +1677,5 @@ static void mdct_spectrum_fine_gain_enc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/hvq_enc.cpp b/src/libs/libevs/lib_enc/hvq_enc.cpp
index 290ada16..46bd508e 100644
--- a/src/libs/libevs/lib_enc/hvq_enc.cpp
+++ b/src/libs/libevs/lib_enc/hvq_enc.cpp
@@ -9,6 +9,9 @@
 #include "rom_enc.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * hvq_enc()
  *
@@ -115,3 +118,5 @@ short hvq_enc(                      /* o  : Consumed bits                   */
 
     return bits_used;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/igf_enc.cpp b/src/libs/libevs/lib_enc/igf_enc.cpp
index f8414083..270ecf73 100644
--- a/src/libs/libevs/lib_enc/igf_enc.cpp
+++ b/src/libs/libevs/lib_enc/igf_enc.cpp
@@ -13,6 +13,9 @@
 #include "cnst.h"
 #include "stat_enc.h"
 
+namespace evs { 
+
+
 /**********************************************************************/ /*
 write single bit to stream
 **************************************************************************/
@@ -864,3 +867,5 @@ void IGFEncApplyMono(const IGF_ENC_INSTANCE_HANDLE                   hInstance,
         igfGridIdx);                            /* i: IGF grid index                            */
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/igf_scf_enc.cpp b/src/libs/libevs/lib_enc/igf_scf_enc.cpp
index 68ab3273..4b937188 100644
--- a/src/libs/libevs/lib_enc/igf_scf_enc.cpp
+++ b/src/libs/libevs/lib_enc/igf_scf_enc.cpp
@@ -9,6 +9,9 @@
 #include "stat_com.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * IGFSCFEncoderOpen()
  *
@@ -360,3 +363,5 @@ void IGFSCFEncoderRestoreContextState(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/init_enc.cpp b/src/libs/libevs/lib_enc/init_enc.cpp
index 9ea27cda..3a6d08cf 100644
--- a/src/libs/libevs/lib_enc/init_enc.cpp
+++ b/src/libs/libevs/lib_enc/init_enc.cpp
@@ -8,6 +8,9 @@
 #include "rom_enc.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------------*
  * init_encoder()
@@ -729,3 +732,5 @@ void destroy_encoder(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/inov_enc.cpp b/src/libs/libevs/lib_enc/inov_enc.cpp
index 2231500d..688bea1e 100644
--- a/src/libs/libevs/lib_enc/inov_enc.cpp
+++ b/src/libs/libevs/lib_enc/inov_enc.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * inov_encode()
@@ -264,3 +267,5 @@ void inov_encode(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/io_enc.cpp b/src/libs/libevs/lib_enc/io_enc.cpp
index 1dd77fd2..01ec2753 100644
--- a/src/libs/libevs/lib_enc/io_enc.cpp
+++ b/src/libs/libevs/lib_enc/io_enc.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "mime.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local functions
@@ -1006,3 +1009,5 @@ static void usage_enc( void )
 
     exit(-1);
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/isf_enc_amr_wb.cpp b/src/libs/libevs/lib_enc/isf_enc_amr_wb.cpp
index ecd5e918..efbddc8c 100644
--- a/src/libs/libevs/lib_enc/isf_enc_amr_wb.cpp
+++ b/src/libs/libevs/lib_enc/isf_enc_amr_wb.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * Local constants
@@ -485,3 +488,5 @@ static short sub_VQ(        /* o  : selected codebook vector index      */
     }
     return index;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/lead_indexing.cpp b/src/libs/libevs/lib_enc/lead_indexing.cpp
index f41903d3..fdacb7a1 100644
--- a/src/libs/libevs/lib_enc/lead_indexing.cpp
+++ b/src/libs/libevs/lib_enc/lead_indexing.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local function prototypes
@@ -174,3 +177,5 @@ static int fcb_encode_pos(      /* o  : Code index              */
 
     return code_index;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/long_enr.cpp b/src/libs/libevs/lib_enc/long_enr.cpp
index 7c34abbc..bfd4c229 100644
--- a/src/libs/libevs/lib_enc/long_enr.cpp
+++ b/src/libs/libevs/lib_enc/long_enr.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * long_enr()
@@ -65,3 +68,5 @@ void long_enr(
      *-----------------------------------------------------------------*/
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/lp_exc_e.cpp b/src/libs/libevs/lib_enc/lp_exc_e.cpp
index 44aa0504..1d450cb1 100644
--- a/src/libs/libevs/lib_enc/lp_exc_e.cpp
+++ b/src/libs/libevs/lib_enc/lp_exc_e.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -283,3 +286,5 @@ float corr_xy1(            /* o  : pitch gain  (0..GAIN_PIT_MAX)         */
 
     return gain;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/lsf_enc.cpp b/src/libs/libevs/lib_enc/lsf_enc.cpp
index 6094f6d4..ec9d86ea 100644
--- a/src/libs/libevs/lib_enc/lsf_enc.cpp
+++ b/src/libs/libevs/lib_enc/lsf_enc.cpp
@@ -11,6 +11,9 @@
 #include "prot.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local constants
  *-----------------------------------------------------------------*/
@@ -1947,3 +1950,5 @@ static void lsf_mid_enc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/lsf_msvq_ma_enc.cpp b/src/libs/libevs/lib_enc/lsf_msvq_ma_enc.cpp
index f2a7189b..b9e3e026 100644
--- a/src/libs/libevs/lib_enc/lsf_msvq_ma_enc.cpp
+++ b/src/libs/libevs/lib_enc/lsf_msvq_ma_enc.cpp
@@ -12,6 +12,9 @@
 #include "rom_enc.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 
 #define kMaxC    8
 
@@ -517,3 +520,5 @@ int lsf_bctcvq_encprm(
 
     return nbits_lpc;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/ltd_stable.cpp b/src/libs/libevs/lib_enc/ltd_stable.cpp
index f7129ac0..7b676746 100644
--- a/src/libs/libevs/lib_enc/ltd_stable.cpp
+++ b/src/libs/libevs/lib_enc/ltd_stable.cpp
@@ -5,6 +5,9 @@
 #include <math.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * ltd_stable()
@@ -97,3 +100,5 @@ void ltd_stable(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/mdct_classifier.cpp b/src/libs/libevs/lib_enc/mdct_classifier.cpp
index 26652ed9..d55fb86a 100644
--- a/src/libs/libevs/lib_enc/mdct_classifier.cpp
+++ b/src/libs/libevs/lib_enc/mdct_classifier.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * mdct_classifier()
  *
@@ -244,3 +247,5 @@ short mdct_classifier(      /* o  : HQ_CORE/TCX_20_CORE decision            */
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/mdct_selector.cpp b/src/libs/libevs/lib_enc/mdct_selector.cpp
index df5ce8b1..a140cc5d 100644
--- a/src/libs/libevs/lib_enc/mdct_selector.cpp
+++ b/src/libs/libevs/lib_enc/mdct_selector.cpp
@@ -11,6 +11,9 @@
 #include "prot.h"
 #include <assert.h>
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local constants
  *-----------------------------------------------------------------*/
@@ -257,3 +260,5 @@ void MDCT_selector_reset(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/mslvq_enc.cpp b/src/libs/libevs/lib_enc/mslvq_enc.cpp
index 9916532f..ef2eb864 100644
--- a/src/libs/libevs/lib_enc/mslvq_enc.cpp
+++ b/src/libs/libevs/lib_enc/mslvq_enc.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local functions
  *-----------------------------------------------------------------*/
@@ -741,3 +744,5 @@ int c2idx(
         return skip + c2idx( n-p0-1, p+1, k-1 );
     }
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/multi_harm.cpp b/src/libs/libevs/lib_enc/multi_harm.cpp
index 40e4ed6f..189f3e25 100644
--- a/src/libs/libevs/lib_enc/multi_harm.cpp
+++ b/src/libs/libevs/lib_enc/multi_harm.cpp
@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * Local constants
@@ -285,3 +288,5 @@ short multi_harm(                  /* o  : frame multi-harmonicity (1-harmonic,
 
     return harm;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/nelp_enc.cpp b/src/libs/libevs/lib_enc/nelp_enc.cpp
index 8c926a2b..b223ab7b 100644
--- a/src/libs/libevs/lib_enc/nelp_enc.cpp
+++ b/src/libs/libevs/lib_enc/nelp_enc.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * quantize_uvg()
  *
@@ -406,3 +409,5 @@ void nelp_encoder(
     }
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/nois_est.cpp b/src/libs/libevs/lib_enc/nois_est.cpp
index 3a345da4..cbbae097 100644
--- a/src/libs/libevs/lib_enc/nois_est.cpp
+++ b/src/libs/libevs/lib_enc/nois_est.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local constants
  *-----------------------------------------------------------------*/
@@ -881,3 +884,5 @@ void noise_est(
     st->lt_aEn_zero = 0.2f * (st->aEn==0) + (1-0.2f)*st->lt_aEn_zero;
     return ;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/noise_adjust.cpp b/src/libs/libevs/lib_enc/noise_adjust.cpp
index 20f5c2e2..6dd8edb4 100644
--- a/src/libs/libevs/lib_enc/noise_adjust.cpp
+++ b/src/libs/libevs/lib_enc/noise_adjust.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * noise_adjust()
  *
@@ -79,3 +82,5 @@ short noise_adjust(                 /* o  : index of noise attenuation */
 
     return nf_idx;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/normalizecoefs.cpp b/src/libs/libevs/lib_enc/normalizecoefs.cpp
index c24699c3..c7cae020 100644
--- a/src/libs/libevs/lib_enc/normalizecoefs.cpp
+++ b/src/libs/libevs/lib_enc/normalizecoefs.cpp
@@ -6,6 +6,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------
  * normalizecoefs()
  *
@@ -35,3 +38,5 @@ void normalizecoefs(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/peak_vq_enc.cpp b/src/libs/libevs/lib_enc/peak_vq_enc.cpp
index 2c66b60b..8482407d 100644
--- a/src/libs/libevs/lib_enc/peak_vq_enc.cpp
+++ b/src/libs/libevs/lib_enc/peak_vq_enc.cpp
@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------
  * Local functions
  *--------------------------------------------------------------------------*/
@@ -591,3 +594,5 @@ static short hvq_code_pos(
     return bits;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/pit_enc.cpp b/src/libs/libevs/lib_enc/pit_enc.cpp
index 1e096e2d..58a0b458 100644
--- a/src/libs/libevs/lib_enc/pit_enc.cpp
+++ b/src/libs/libevs/lib_enc/pit_enc.cpp
@@ -11,6 +11,9 @@
 #include "rom_enc.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*------------------------------------------------------------------*
  * pit_encode()
@@ -1317,3 +1320,5 @@ void Mode2_delta_pit_enc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/pitch_ol.cpp b/src/libs/libevs/lib_enc/pitch_ol.cpp
index fc446b65..d0f3f32d 100644
--- a/src/libs/libevs/lib_enc/pitch_ol.cpp
+++ b/src/libs/libevs/lib_enc/pitch_ol.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local constants
  *---------------------------------------------------------------------*/
@@ -958,3 +961,5 @@ static void lp_decim2(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/pitch_ol2.cpp b/src/libs/libevs/lib_enc/pitch_ol2.cpp
index 98e6ca48..e3ec6462 100644
--- a/src/libs/libevs/lib_enc/pitch_ol2.cpp
+++ b/src/libs/libevs/lib_enc/pitch_ol2.cpp
@@ -8,6 +8,9 @@
 #include "rom_enc.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -300,3 +303,5 @@ void pitchDoubling_det(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/plc_enc_ext.cpp b/src/libs/libevs/lib_enc/plc_enc_ext.cpp
index 26d5e270..939121d7 100644
--- a/src/libs/libevs/lib_enc/plc_enc_ext.cpp
+++ b/src/libs/libevs/lib_enc/plc_enc_ext.cpp
@@ -9,6 +9,9 @@
 #include "cnst.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 #define NBITS_GACELP              5
 
@@ -107,3 +110,5 @@ void gPLC_encInfo(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/ppp_enc.cpp b/src/libs/libevs/lib_enc/ppp_enc.cpp
index 6bd3f17f..141938cb 100644
--- a/src/libs/libevs/lib_enc/ppp_enc.cpp
+++ b/src/libs/libevs/lib_enc/ppp_enc.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * ppp_quarter_encoder()
@@ -200,3 +203,5 @@ void set_ppp_mode(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/pre_proc.cpp b/src/libs/libevs/lib_enc/pre_proc.cpp
index ebb7fc32..6d96e012 100644
--- a/src/libs/libevs/lib_enc/pre_proc.cpp
+++ b/src/libs/libevs/lib_enc/pre_proc.cpp
@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * pre_proc()
  *
@@ -897,3 +900,5 @@ void pre_proc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/pvq_core_enc.cpp b/src/libs/libevs/lib_enc/pvq_core_enc.cpp
index 6d277764..778570d1 100644
--- a/src/libs/libevs/lib_enc/pvq_core_enc.cpp
+++ b/src/libs/libevs/lib_enc/pvq_core_enc.cpp
@@ -11,6 +11,9 @@
 #include "prot.h"
 #include "stl.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
 * Local functions
 *--------------------------------------------------------------------*/
@@ -510,3 +513,5 @@ void obtainEnergyParameter(
 #undef EPSILON_obtainEnergyParameter
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/pvq_encode.cpp b/src/libs/libevs/lib_enc/pvq_encode.cpp
index d4bd8aee..f787fb10 100644
--- a/src/libs/libevs/lib_enc/pvq_encode.cpp
+++ b/src/libs/libevs/lib_enc/pvq_encode.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "math.h"
 
+namespace evs { 
+
+
 static void pyramidSearch(const float  *s, short L, short  Ptot, float A,  short *ztak, float *stak ) ;
 
 void pvq_encode(
@@ -159,3 +162,5 @@ void pyramidSearch(const float  *s,
     }
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/q_gain2p.cpp b/src/libs/libevs/lib_enc/q_gain2p.cpp
index e84c649d..0252656c 100644
--- a/src/libs/libevs/lib_enc/q_gain2p.cpp
+++ b/src/libs/libevs/lib_enc/q_gain2p.cpp
@@ -9,6 +9,9 @@
 #include "cnst.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------------*
  * Local functions                                                         *
@@ -365,3 +368,5 @@ static int gain_enc_gacelp_uv(
 
     return index;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/qlpc_avq.cpp b/src/libs/libevs/lib_enc/qlpc_avq.cpp
index 9db0a5a1..4a61f0b2 100644
--- a/src/libs/libevs/lib_enc/qlpc_avq.cpp
+++ b/src/libs/libevs/lib_enc/qlpc_avq.cpp
@@ -6,6 +6,9 @@
 #include <stdio.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
 * qlpc_avq()
@@ -327,3 +330,5 @@ int encode_lpc_avq(
 
     return(nb_bits);
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/qlpc_stoch.cpp b/src/libs/libevs/lib_enc/qlpc_stoch.cpp
index 64f63ff4..216d1290 100644
--- a/src/libs/libevs/lib_enc/qlpc_stoch.cpp
+++ b/src/libs/libevs/lib_enc/qlpc_stoch.cpp
@@ -12,6 +12,9 @@
 #include "rom_enc.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
 * lpc_quantization()
 *
@@ -312,3 +315,5 @@ void Unified_weighting(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/range_enc.cpp b/src/libs/libevs/lib_enc/range_enc.cpp
index 3965d838..92ba59e8 100644
--- a/src/libs/libevs/lib_enc/range_enc.cpp
+++ b/src/libs/libevs/lib_enc/range_enc.cpp
@@ -10,6 +10,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local functions
  *-------------------------------------------------------------------*/
@@ -288,3 +291,5 @@ static void rc_enc_write(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/re8_cod.cpp b/src/libs/libevs/lib_enc/re8_cod.cpp
index c16c550c..34814b9c 100644
--- a/src/libs/libevs/lib_enc/re8_cod.cpp
+++ b/src/libs/libevs/lib_enc/re8_cod.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*------------------------------------------------------------------------
  * re8_cod()
@@ -52,3 +55,5 @@ void re8_cod(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/reordernorm.cpp b/src/libs/libevs/lib_enc/reordernorm.cpp
index f0291463..caacc349 100644
--- a/src/libs/libevs/lib_enc/reordernorm.cpp
+++ b/src/libs/libevs/lib_enc/reordernorm.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*/
 /*  Function  reordernorm                                                   */
 /*  ~~~~~~~~~~~~~~~~~~~~~                                                   */
@@ -55,3 +58,5 @@ void reordernorm(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/rom_enc.cpp b/src/libs/libevs/lib_enc/rom_enc.cpp
index 9248bd8e..65f6b36c 100644
--- a/src/libs/libevs/lib_enc/rom_enc.cpp
+++ b/src/libs/libevs/lib_enc/rom_enc.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 const short hangover_hd_tbl[3] = {1, 1, 3};
 const short hangover_sf_tbl[6] = {1, 3, 4, 1, 1, 2};
 const short bwd_start_bin[BWD_N_BINS_MAX] = {1, 3, 6, 11};
@@ -700,3 +703,5 @@ const float hann_window_320[BWD_TOTAL_WIDTH/2] =
  *----------------------------------------------------------------------------------*/
 const int startLineWB[11]  = { 8, 23, 36, 45, 66, 128 /* 13.2kbps */, 200, 320, 320, 320 /* 48kbps */, 320 };
 const int startLineSWB[9] = { 8, 44,  96 /* 13.2kbps */, 160, 320, 320, 256 /* 48kbps */, 341, 640 };
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/rom_enc.h b/src/libs/libevs/lib_enc/rom_enc.h
index ead5d6a5..5e9cc0d4 100644
--- a/src/libs/libevs/lib_enc/rom_enc.h
+++ b/src/libs/libevs/lib_enc/rom_enc.h
@@ -10,6 +10,7 @@
 #include "stat_enc.h"
 #include "cnst.h"
 
+namespace evs {
 /*----------------------------------------------------------------------------------*
  * General tables
  *----------------------------------------------------------------------------------*/
@@ -142,6 +143,7 @@ extern const float LT_MIN_SILENCE_SNR[3];
 extern const int startLineWB[11];
 extern const int startLineSWB[9];
 
+} // end of namespace
 
 #endif
 
diff --git a/src/libs/libevs/lib_enc/rst_enc.cpp b/src/libs/libevs/lib_enc/rst_enc.cpp
index d9b4b6bd..9e359131 100644
--- a/src/libs/libevs/lib_enc/rst_enc.cpp
+++ b/src/libs/libevs/lib_enc/rst_enc.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * CNG_reset_enc()
@@ -56,3 +59,5 @@ void CNG_reset_enc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/set_impulse.cpp b/src/libs/libevs/lib_enc/set_impulse.cpp
index fb093e73..c774f0e3 100644
--- a/src/libs/libevs/lib_enc/set_impulse.cpp
+++ b/src/libs/libevs/lib_enc/set_impulse.cpp
@@ -6,6 +6,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local constant
  *-----------------------------------------------------------------*/
@@ -299,3 +302,5 @@ static void correlate_tc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/setmodeindex.cpp b/src/libs/libevs/lib_enc/setmodeindex.cpp
index afa1de30..15bea6f4 100644
--- a/src/libs/libevs/lib_enc/setmodeindex.cpp
+++ b/src/libs/libevs/lib_enc/setmodeindex.cpp
@@ -12,6 +12,9 @@
 #include "rom_com.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------------
 
@@ -38,3 +41,5 @@ void SetModeIndex(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/sig_clas.cpp b/src/libs/libevs/lib_enc/sig_clas.cpp
index 348fe8d2..cfae231c 100644
--- a/src/libs/libevs/lib_enc/sig_clas.cpp
+++ b/src/libs/libevs/lib_enc/sig_clas.cpp
@@ -8,6 +8,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local constants
  *---------------------------------------------------------------------*/
@@ -309,3 +312,5 @@ short signal_clas(               /* o  : classification for current frames
 
     return clas;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/spec_center.cpp b/src/libs/libevs/lib_enc/spec_center.cpp
index 79fe75be..c7f5500a 100644
--- a/src/libs/libevs/lib_enc/spec_center.cpp
+++ b/src/libs/libevs/lib_enc/spec_center.cpp
@@ -6,6 +6,9 @@
 #include "rom_enc.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * spec_center()
@@ -59,3 +62,5 @@ void spec_center(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/spec_flatness.cpp b/src/libs/libevs/lib_enc/spec_flatness.cpp
index 008979ab..5398bf84 100644
--- a/src/libs/libevs/lib_enc/spec_flatness.cpp
+++ b/src/libs/libevs/lib_enc/spec_flatness.cpp
@@ -7,6 +7,9 @@
 
 #include <assert.h>
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * spec_flatness()
@@ -95,3 +98,5 @@ void spec_flatness(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/speech_music_classif.cpp b/src/libs/libevs/lib_enc/speech_music_classif.cpp
index d13b0590..c19149cf 100644
--- a/src/libs/libevs/lib_enc/speech_music_classif.cpp
+++ b/src/libs/libevs/lib_enc/speech_music_classif.cpp
@@ -11,6 +11,9 @@
 #include "rom_enc.h"
 #include "rom_com.h"    /* Common static table prototypes         */
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * Local constants
@@ -1891,3 +1894,5 @@ static void order_spectrum( float *vec, short len )
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/stat_enc.h b/src/libs/libevs/lib_enc/stat_enc.h
index 0ebc70d9..b36cfdaf 100644
--- a/src/libs/libevs/lib_enc/stat_enc.h
+++ b/src/libs/libevs/lib_enc/stat_enc.h
@@ -9,6 +9,7 @@
 #include "stat_com.h"          /* Common structures                      */
 #include "cnst.h"
 
+namespace evs {
 
 /*------------------------------------------------------------------------------------------*
  * Indice
@@ -1226,5 +1227,6 @@ typedef struct
 struct PLC_ENC_EVS;
 typedef struct PLC_ENC_EVS * HANDLE_PLC_ENC_EVS;
 
+} // end of namespace
 
 #endif
diff --git a/src/libs/libevs/lib_enc/stat_noise_uv_enc.cpp b/src/libs/libevs/lib_enc/stat_noise_uv_enc.cpp
index b531ec2e..21cfb7ef 100644
--- a/src/libs/libevs/lib_enc/stat_noise_uv_enc.cpp
+++ b/src/libs/libevs/lib_enc/stat_noise_uv_enc.cpp
@@ -6,6 +6,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * stat_noise_uv_enc()
  *
@@ -69,3 +72,5 @@ void stat_noise_uv_enc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/subband_fft.cpp b/src/libs/libevs/lib_enc/subband_fft.cpp
index d119d46c..b03850cb 100644
--- a/src/libs/libevs/lib_enc/subband_fft.cpp
+++ b/src/libs/libevs/lib_enc/subband_fft.cpp
@@ -6,6 +6,9 @@
 #include "prot.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 
 
@@ -184,3 +187,5 @@ void subband_FFT(
 
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/swb_bwe_enc.cpp b/src/libs/libevs/lib_enc/swb_bwe_enc.cpp
index 81ff7115..b18766ab 100644
--- a/src/libs/libevs/lib_enc/swb_bwe_enc.cpp
+++ b/src/libs/libevs/lib_enc/swb_bwe_enc.cpp
@@ -12,6 +12,9 @@
 #include "basop_util.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local functions
  *---------------------------------------------------------------------*/
@@ -1725,3 +1728,5 @@ void hq_generic_hf_encoding(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/swb_bwe_enc_hr.cpp b/src/libs/libevs/lib_enc/swb_bwe_enc_hr.cpp
index d47f6520..15a01db7 100644
--- a/src/libs/libevs/lib_enc/swb_bwe_enc_hr.cpp
+++ b/src/libs/libevs/lib_enc/swb_bwe_enc_hr.cpp
@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * en_band_quant()
  *
@@ -471,3 +474,5 @@ void swb_bwe_enc_hr(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/swb_bwe_enc_lr.cpp b/src/libs/libevs/lib_enc/swb_bwe_enc_lr.cpp
index 34891808..f25bba36 100644
--- a/src/libs/libevs/lib_enc/swb_bwe_enc_lr.cpp
+++ b/src/libs/libevs/lib_enc/swb_bwe_enc_lr.cpp
@@ -10,6 +10,9 @@
 #include "rom_com.h"
 #include "stat_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * GetSubbandCorrIndex2_har()
  *
@@ -671,3 +674,5 @@ void swb_bwe_enc_lr(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/swb_pre_proc.cpp b/src/libs/libevs/lib_enc/swb_pre_proc.cpp
index 579f5c58..c3e2deae 100644
--- a/src/libs/libevs/lib_enc/swb_pre_proc.cpp
+++ b/src/libs/libevs/lib_enc/swb_pre_proc.cpp
@@ -10,6 +10,9 @@
 #include "rom_com.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local constants
@@ -308,3 +311,5 @@ void swb_pre_proc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/swb_tbe_enc.cpp b/src/libs/libevs/lib_enc/swb_tbe_enc.cpp
index e268fab8..9174bf3e 100644
--- a/src/libs/libevs/lib_enc/swb_tbe_enc.cpp
+++ b/src/libs/libevs/lib_enc/swb_tbe_enc.cpp
@@ -10,6 +10,9 @@
 #include "rom_com.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local functions
  *-----------------------------------------------------------------*/
@@ -2027,3 +2030,5 @@ void TBEreset_enc(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/tcq_core_enc.cpp b/src/libs/libevs/lib_enc/tcq_core_enc.cpp
index 57c9ceac..5b560b95 100644
--- a/src/libs/libevs/lib_enc/tcq_core_enc.cpp
+++ b/src/libs/libevs/lib_enc/tcq_core_enc.cpp
@@ -12,6 +12,9 @@
 #include "basop_util.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
  * tcq_core_LR_enc()
@@ -429,3 +432,5 @@ void tcq_core_LR_enc(
     return;
 
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/tcx_ltp_enc.cpp b/src/libs/libevs/lib_enc/tcx_ltp_enc.cpp
index b81961e8..9d01a83b 100644
--- a/src/libs/libevs/lib_enc/tcx_ltp_enc.cpp
+++ b/src/libs/libevs/lib_enc/tcx_ltp_enc.cpp
@@ -7,6 +7,9 @@
 #include "rom_enc.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 
 
@@ -419,3 +422,5 @@ void tcx_ltp_encode( int tcxltp_on,
 
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/tcx_utils_enc.cpp b/src/libs/libevs/lib_enc/tcx_utils_enc.cpp
index 933590b5..6c238653 100644
--- a/src/libs/libevs/lib_enc/tcx_utils_enc.cpp
+++ b/src/libs/libevs/lib_enc/tcx_utils_enc.cpp
@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 
 
 /* compute noise-measure flags for spectrum filling and quantization (0: tonal, 1: noise-like) */
@@ -1216,3 +1219,5 @@ void attenuateNbSpectrum(int L_frame, float *spectrum)
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/tfa_enc.cpp b/src/libs/libevs/lib_enc/tfa_enc.cpp
index f20c1427..cd4d11f2 100644
--- a/src/libs/libevs/lib_enc/tfa_enc.cpp
+++ b/src/libs/libevs/lib_enc/tfa_enc.cpp
@@ -6,6 +6,9 @@
 #include <assert.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 void tfaCalcEnv(const float* shb_speech, float* enr)
@@ -65,3 +68,5 @@ short tfaEnc_TBE(float* enr, short last_core, float* voicing, float* pitch_buf)
 
     return tfa_flag;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/tns_base_enc.cpp b/src/libs/libevs/lib_enc/tns_base_enc.cpp
index 2960873a..6e2b7851 100644
--- a/src/libs/libevs/lib_enc/tns_base_enc.cpp
+++ b/src/libs/libevs/lib_enc/tns_base_enc.cpp
@@ -10,6 +10,9 @@
 #include <math.h>
 #include <assert.h>
 
+namespace evs { 
+
+
 
 #define HLM_MIN_NRG (32768.0f * 2*NORM_MDCT_FACTOR / (640*640))
 
@@ -313,3 +316,5 @@ static void Parcor2Index(const float parCoeff[], int index[], int order)
     }
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/transient_detection.cpp b/src/libs/libevs/lib_enc/transient_detection.cpp
index bede7001..5c5cb06f 100644
--- a/src/libs/libevs/lib_enc/transient_detection.cpp
+++ b/src/libs/libevs/lib_enc/transient_detection.cpp
@@ -12,6 +12,9 @@
 #include <stdarg.h>
 #include <math.h>
 
+namespace evs { 
+
+
 
 
 #define MIN_BLOCK_ENERGY 107.37f
@@ -596,3 +599,5 @@ static void CalculateSubblockEnergies(float const * input, int nSamplesAvailable
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/transition_enc.cpp b/src/libs/libevs/lib_enc/transition_enc.cpp
index 7806ec9e..9623b504 100644
--- a/src/libs/libevs/lib_enc/transition_enc.cpp
+++ b/src/libs/libevs/lib_enc/transition_enc.cpp
@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local functions
  *-----------------------------------------------------------------*/
@@ -975,3 +978,5 @@ static void gain_trans_enc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/update_decision.cpp b/src/libs/libevs/lib_enc/update_decision.cpp
index 075c2f40..31cfa6a0 100644
--- a/src/libs/libevs/lib_enc/update_decision.cpp
+++ b/src/libs/libevs/lib_enc/update_decision.cpp
@@ -6,6 +6,9 @@
 #include <stdio.h>
 #include <math.h>
 
+namespace evs { 
+
+
 
 
 void bg_music_decision(T_CldfbVadState *st,
@@ -246,3 +249,5 @@ int update_decision(T_CldfbVadState *st,
     return update_flag;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/updt_enc.cpp b/src/libs/libevs/lib_enc/updt_enc.cpp
index e0ea1dec..9127ae8b 100644
--- a/src/libs/libevs/lib_enc/updt_enc.cpp
+++ b/src/libs/libevs/lib_enc/updt_enc.cpp
@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * updt_enc()
  *
@@ -231,3 +234,5 @@ void updt_IO_switch_enc(
 
     return;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/updt_tar.cpp b/src/libs/libevs/lib_enc/updt_tar.cpp
index eb75844f..5f9462e4 100644
--- a/src/libs/libevs/lib_enc/updt_tar.cpp
+++ b/src/libs/libevs/lib_enc/updt_tar.cpp
@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*----------------------------------------------------------------------------------*
  * procedure updt_tar:
  *
@@ -26,3 +29,5 @@ void updt_tar(
         x2[i] = x[i] - gain*y[i];
     }
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/vad.cpp b/src/libs/libevs/lib_enc/vad.cpp
index fdd26ba5..827a6621 100644
--- a/src/libs/libevs/lib_enc/vad.cpp
+++ b/src/libs/libevs/lib_enc/vad.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * Local constants
@@ -1007,3 +1010,5 @@ short wb_vad(
 
     return flag;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/vad_param_updt.cpp b/src/libs/libevs/lib_enc/vad_param_updt.cpp
index 417d427c..083ba923 100644
--- a/src/libs/libevs/lib_enc/vad_param_updt.cpp
+++ b/src/libs/libevs/lib_enc/vad_param_updt.cpp
@@ -8,6 +8,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * vad_param_updt()
  *
@@ -116,3 +119,5 @@ void vad_param_updt(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/vad_proc.cpp b/src/libs/libevs/lib_enc/vad_proc.cpp
index 173fad0f..a0e825ec 100644
--- a/src/libs/libevs/lib_enc/vad_proc.cpp
+++ b/src/libs/libevs/lib_enc/vad_proc.cpp
@@ -11,6 +11,9 @@
 #include "prot.h"
 #include "rom_enc.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * vad_init()
@@ -262,3 +265,5 @@ short vad_proc(
     return vad_flag;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/vbr_average_rate.cpp b/src/libs/libevs/lib_enc/vbr_average_rate.cpp
index e0873483..6fba24c5 100644
--- a/src/libs/libevs/lib_enc/vbr_average_rate.cpp
+++ b/src/libs/libevs/lib_enc/vbr_average_rate.cpp
@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*------------------------------------------------------------------*
  * Local constants
@@ -166,3 +169,5 @@ void update_average_rate(
 }
 
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/vlpc_1st_cod.cpp b/src/libs/libevs/lib_enc/vlpc_1st_cod.cpp
index bdf7d9cb..95d400c1 100644
--- a/src/libs/libevs/lib_enc/vlpc_1st_cod.cpp
+++ b/src/libs/libevs/lib_enc/vlpc_1st_cod.cpp
@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 extern float const dico_lsf_abs_8b[];
 
@@ -117,3 +120,5 @@ int vlpc_1st_cod(       /* output: codebook index                  */
 
     return index;
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/vlpc_2st_cod.cpp b/src/libs/libevs/lib_enc/vlpc_2st_cod.cpp
index 2817eb47..0c2e0b86 100644
--- a/src/libs/libevs/lib_enc/vlpc_2st_cod.cpp
+++ b/src/libs/libevs/lib_enc/vlpc_2st_cod.cpp
@@ -9,6 +9,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*------------------------------------------------------------------*
 * vlpc_2st_cod()
 *
@@ -104,3 +107,5 @@ int vlpc_2st_cod(   /* output: number of allocated bits        */
 
     return( nbits );
 }
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/voiced_enc.cpp b/src/libs/libevs/lib_enc/voiced_enc.cpp
index 64af9d45..2084b101 100644
--- a/src/libs/libevs/lib_enc/voiced_enc.cpp
+++ b/src/libs/libevs/lib_enc/voiced_enc.cpp
@@ -8,6 +8,9 @@
 #include "cnst.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local functions
@@ -645,3 +648,5 @@ static void SynthesisFilter(
     return;
 }
 
+
+} // end of namespace
diff --git a/src/libs/libevs/lib_enc/waveadjust_fec_cod.cpp b/src/libs/libevs/lib_enc/waveadjust_fec_cod.cpp
index 91d3bb9c..8d93ecd8 100644
--- a/src/libs/libevs/lib_enc/waveadjust_fec_cod.cpp
+++ b/src/libs/libevs/lib_enc/waveadjust_fec_cod.cpp
@@ -8,6 +8,9 @@
 #include <stdlib.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * SFM_Cal()
@@ -41,3 +44,5 @@ float SFM_Cal(
 
     return (float)SFM;
 }
+
+} // end of namespace