Commit a26205cb authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'evs_enc_pull_fxd' into 'main' 

EVS encoder fixed files integrated to IVAS workspace

See merge request !86
parents a7a703c5 e4121009

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ CFLAGS += $(foreach DIR,$(SRC_DIRS),-I$(DIR)) 
VPATH     = $(SRC_DIRS)



# Filter out files that are not part of the build

EXCLUDED_FILES = SNR_calc_fx.c

EXCLUDED_FILES =



###############################################################################

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ 
    <ClInclude Include="..\lib_com\prot_fx1.h" />

    <ClInclude Include="..\lib_com\rom_basop_util.h" />

    <ClInclude Include="..\lib_com\rom_com.h" />

    <ClInclude Include="..\lib_com\rom_com_fx.h" />

    <ClInclude Include="..\lib_com\stat_com.h" />

    <ClInclude Include="..\lib_com\stat_com_fx_2.h" />

    <ClInclude Include="..\lib_com\stl.h" />

Workspace_msvc/lib_com.vcxproj.filters

+175 −54
Original line number Diff line number Diff line
@@ -402,6 +402,124 @@ 
    </ClCompile>

    <ClCompile Include="..\lib_com\float_to_fix_ops.c" />

    <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c" />

    <ClCompile Include="..\lib_com\ACcontextMapping.c" />

    <ClCompile Include="..\lib_com\ari.c" />

    <ClCompile Include="..\lib_com\arith_coder.c" />

    <ClCompile Include="..\lib_com\ari_hm.c" />

    <ClCompile Include="..\lib_com\basop32.c" />

    <ClCompile Include="..\lib_com\basop_com_lpc.c" />

    <ClCompile Include="..\lib_com\basop_lsf_tools.c" />

    <ClCompile Include="..\lib_com\basop_tcx_utils.c" />

    <ClCompile Include="..\lib_com\basop_util.c" />

    <ClCompile Include="..\lib_com\bitalloc.c" />

    <ClCompile Include="..\lib_com\bitallocsum.c" />

    <ClCompile Include="..\lib_com\bitstream.c" />

    <ClCompile Include="..\lib_com\bits_alloc.c" />

    <ClCompile Include="..\lib_com\calc_st_com.c" />

    <ClCompile Include="..\lib_com\cb_shape.c" />

    <ClCompile Include="..\lib_com\cldfb.c" />

    <ClCompile Include="..\lib_com\cng_exc.c" />

    <ClCompile Include="..\lib_com\core_com_config.c" />

    <ClCompile Include="..\lib_com\deemph.c" />

    <ClCompile Include="..\lib_com\delay_comp.c" />

    <ClCompile Include="..\lib_com\disclaimer.c" />

    <ClCompile Include="..\lib_com\dlpc_bfi.c" />

    <ClCompile Include="..\lib_com\edct.c" />

    <ClCompile Include="..\lib_com\enh1632.c" />

    <ClCompile Include="..\lib_com\enh40.c" />

    <ClCompile Include="..\lib_com\enhancer.c" />

    <ClCompile Include="..\lib_com\enr_1_az.c" />

    <ClCompile Include="..\lib_com\env_adj.c" />

    <ClCompile Include="..\lib_com\env_stab.c" />

    <ClCompile Include="..\lib_com\env_stab_trans.c" />

    <ClCompile Include="..\lib_com\est_tilt.c" />

    <ClCompile Include="..\lib_com\fd_cng_com.c" />

    <ClCompile Include="..\lib_com\fft.c" />

    <ClCompile Include="..\lib_com\fft_cldfb.c" />

    <ClCompile Include="..\lib_com\fft_rel.c" />

    <ClCompile Include="..\lib_com\fill_spectrum.c" />

    <ClCompile Include="..\lib_com\findpulse.c" />

    <ClCompile Include="..\lib_com\fine_gain_bits.c" />

    <ClCompile Include="..\lib_com\frame_ener.c" />

    <ClCompile Include="..\lib_com\get_gain.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation.c" />

    <ClCompile Include="..\lib_com\gs_gains.c" />

    <ClCompile Include="..\lib_com\gs_inact_switching.c" />

    <ClCompile Include="..\lib_com\gs_noisefill.c" />

    <ClCompile Include="..\lib_com\gs_preech.c" />

    <ClCompile Include="..\lib_com\guided_plc_util.c" />

    <ClCompile Include="..\lib_com\hp50.c" />

    <ClCompile Include="..\lib_com\hq2_bit_alloc.c" />

    <ClCompile Include="..\lib_com\hq2_core_com.c" />

    <ClCompile Include="..\lib_com\hq2_noise_inject.c" />

    <ClCompile Include="..\lib_com\hq_bit_allocation.c" />

    <ClCompile Include="..\lib_com\hq_conf.c" />

    <ClCompile Include="..\lib_com\hq_tools.c" />

    <ClCompile Include="..\lib_com\hvq_pvq_bitalloc.c" />

    <ClCompile Include="..\lib_com\ifft_rel.c" />

    <ClCompile Include="..\lib_com\igf_base.c" />

    <ClCompile Include="..\lib_com\index_pvq_opt.c" />

    <ClCompile Include="..\lib_com\interleave_spectrum.c" />

    <ClCompile Include="..\lib_com\interpol.c" />

    <ClCompile Include="..\lib_com\int_lsp.c" />

    <ClCompile Include="..\lib_com\isf_dec_amr_wb.c" />

    <ClCompile Include="..\lib_com\ivas_agc_com_fx.c" />

    <ClCompile Include="..\lib_com\ivas_dirac_com.c" />

    <ClCompile Include="..\lib_com\ivas_masa_com.c" />

    <ClCompile Include="..\lib_com\ivas_mct_com.c" />

    <ClCompile Include="..\lib_com\ivas_mdct_core_com.c" />

    <ClCompile Include="..\lib_com\ivas_rom_com.c" />

    <ClCompile Include="..\lib_com\ivas_sns_com_fx.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com_fx.c" />

    <ClCompile Include="..\lib_com\ivas_tools.c" />

    <ClCompile Include="..\lib_com\lag_wind.c" />

    <ClCompile Include="..\lib_com\lerp.c" />

    <ClCompile Include="..\lib_com\limit_t0.c" />

    <ClCompile Include="..\lib_com\logqnorm.c" />

    <ClCompile Include="..\lib_com\longarith.c" />

    <ClCompile Include="..\lib_com\low_rate_band_att.c" />

    <ClCompile Include="..\lib_com\lpc_tools.c" />

    <ClCompile Include="..\lib_com\lsf_dec_bfi.c" />

    <ClCompile Include="..\lib_com\lsf_msvq_ma.c" />

    <ClCompile Include="..\lib_com\lsf_tools.c" />

    <ClCompile Include="..\lib_com\lsp_conv_poly.c" />

    <ClCompile Include="..\lib_com\modif_fs.c" />

    <ClCompile Include="..\lib_com\mslvq_com.c" />

    <ClCompile Include="..\lib_com\parameter_bitmaping.c" />

    <ClCompile Include="..\lib_com\phase_dispersion.c" />

    <ClCompile Include="..\lib_com\pred_lt4.c" />

    <ClCompile Include="..\lib_com\preemph.c" />

    <ClCompile Include="..\lib_com\pvq_com.c" />

    <ClCompile Include="..\lib_com\range_com.c" />

    <ClCompile Include="..\lib_com\re8_ppv.c" />

    <ClCompile Include="..\lib_com\re8_util.c" />

    <ClCompile Include="..\lib_com\realft.c" />

    <ClCompile Include="..\lib_com\recovernorm.c" />

    <ClCompile Include="..\lib_com\reordvct.c" />

    <ClCompile Include="..\lib_com\residu.c" />

    <ClCompile Include="..\lib_com\rom_com.c" />

    <ClCompile Include="..\lib_com\stab_est.c" />

    <ClCompile Include="..\lib_com\stat_noise_uv_mod.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_hr.c" />

    <ClCompile Include="..\lib_com\swb_tbe_com.c" />

    <ClCompile Include="..\lib_com\syn_12k8.c" />

    <ClCompile Include="..\lib_com\syn_filt.c" />

    <ClCompile Include="..\lib_com\tcq_position_arith.c" />

    <ClCompile Include="..\lib_com\tcx_ltp.c" />

    <ClCompile Include="..\lib_com\tcx_mdct.c" />

    <ClCompile Include="..\lib_com\tcx_mdct_window.c" />

    <ClCompile Include="..\lib_com\tcx_utils.c" />

    <ClCompile Include="..\lib_com\tec_com.c" />

    <ClCompile Include="..\lib_com\tools.c" />

    <ClCompile Include="..\lib_com\trans_direct.c" />

    <ClCompile Include="..\lib_com\trans_inv.c" />

    <ClCompile Include="..\lib_com\vlpc_2st_com.c" />

    <ClCompile Include="..\lib_com\weight.c" />

    <ClCompile Include="..\lib_com\weight_a.c" />

    <ClCompile Include="..\lib_com\window.c" />

    <ClCompile Include="..\lib_com\window_ola.c" />

    <ClCompile Include="..\lib_com\wtda.c" />

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">
@@ -474,6 +592,9 @@ 
    </ClInclude>

    <ClInclude Include="..\lib_com\prot_fx2.h" />

    <ClInclude Include="..\lib_com\prot_fx1.h" />

    <ClInclude Include="..\lib_com\rom_com_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_evs_c">

Workspace_msvc/lib_enc.vcxproj

+136 −0
Original line number Diff line number Diff line
@@ -140,8 +140,80 @@ 
    </Lib>

  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\lib_enc\ACcontextMapping_enc_fx.c" />

    <ClCompile Include="..\lib_enc\acelp_core_enc_fx.c" />

    <ClCompile Include="..\lib_enc\acelp_core_switch_enc_fx.c" />

    <ClCompile Include="..\lib_enc\acelp_enc_util_fx.c" />

    <ClCompile Include="..\lib_enc\amr_wb_enc_fx.c" />

    <ClCompile Include="..\lib_enc\analy_lp_fx.c" />

    <ClCompile Include="..\lib_enc\analy_sp_fx.c" />

    <ClCompile Include="..\lib_enc\arith_coder_enc_fx.c" />

    <ClCompile Include="..\lib_enc\ari_enc_fx.c" />

    <ClCompile Include="..\lib_enc\ari_hm_enc_fx.c" />

    <ClCompile Include="..\lib_enc\avq_cod_fx.c" />

    <ClCompile Include="..\lib_enc\bass_psfilter_enc_fx.c" />

    <ClCompile Include="..\lib_enc\bw_detect_fx.c" />

    <ClCompile Include="..\lib_enc\cng_enc_fx.c" />

    <ClCompile Include="..\lib_enc\cod2t32_fx.c" />

    <ClCompile Include="..\lib_enc\cod4t64_fx.c" />

    <ClCompile Include="..\lib_enc\cod_ace_fx.c" />

    <ClCompile Include="..\lib_enc\cod_tcx_fx.c" />

    <ClCompile Include="..\lib_enc\cod_uv_fx.c" />

    <ClCompile Include="..\lib_enc\comvad_decision_fx.c" />

    <ClCompile Include="..\lib_enc\core_enc_2div_fx.c" />

    <ClCompile Include="..\lib_enc\core_enc_init_fx.c" />

    <ClCompile Include="..\lib_enc\core_enc_ol_fx.c" />

    <ClCompile Include="..\lib_enc\core_enc_reconf_fx.c" />

    <ClCompile Include="..\lib_enc\core_enc_switch_fx.c" />

    <ClCompile Include="..\lib_enc\core_enc_updt_fx.c" />

    <ClCompile Include="..\lib_enc\core_switching_enc_fx.c" />

    <ClCompile Include="..\lib_enc\corr_xh_fx.c" />

    <ClCompile Include="..\lib_enc\cor_shif_fx.c" />

    <ClCompile Include="..\lib_enc\decision_matrix_enc_fx.c" />

    <ClCompile Include="..\lib_enc\detect_transient_fx.c" />

    <ClCompile Include="..\lib_enc\diffcod_fx.c" />

    <ClCompile Include="..\lib_enc\dtx_fx.c" />

    <ClCompile Include="..\lib_enc\enc_acelpx_fx.c" />

    <ClCompile Include="..\lib_enc\enc_acelp_fx.c" />

    <ClCompile Include="..\lib_enc\enc_acelp_tcx_main_fx.c" />

    <ClCompile Include="..\lib_enc\enc_amr_wb_fx.c" />

    <ClCompile Include="..\lib_enc\enc_gain_fx.c" />

    <ClCompile Include="..\lib_enc\enc_gen_voic_fx.c" />

    <ClCompile Include="..\lib_enc\enc_gen_voic_rf_fx.c" />

    <ClCompile Include="..\lib_enc\enc_higher_acelp_fx.c" />

    <ClCompile Include="..\lib_enc\enc_nelp_fx.c" />

    <ClCompile Include="..\lib_enc\enc_pit_exc_fx.c" />

    <ClCompile Include="..\lib_enc\enc_ppp_fx.c" />

    <ClCompile Include="..\lib_enc\enc_prm_fx.c" />

    <ClCompile Include="..\lib_enc\enc_tran_fx.c" />

    <ClCompile Include="..\lib_enc\enc_uv_fx.c" />

    <ClCompile Include="..\lib_enc\energy_fx.c" />

    <ClCompile Include="..\lib_enc\eval_pit_contr_fx.c" />

    <ClCompile Include="..\lib_enc\evs_enc_fx.c" />

    <ClCompile Include="..\lib_enc\ext_sig_ana_fx.c" />

    <ClCompile Include="..\lib_enc\fd_cng_enc_fx.c" />

    <ClCompile Include="..\lib_enc\FEC_enc_fx.c" />

    <ClCompile Include="..\lib_enc\find_tar_fx.c" />

    <ClCompile Include="..\lib_enc\find_tilt_fx.c" />

    <ClCompile Include="..\lib_enc\find_uv_fx.c" />

    <ClCompile Include="..\lib_enc\find_wsp_fx.c" />

    <ClCompile Include="..\lib_enc\frame_spec_dif_cor_rate_fx.c" />

    <ClCompile Include="..\lib_enc\gain_enc_fx.c" />

    <ClCompile Include="..\lib_enc\gaus_enc_fx.c" />

    <ClCompile Include="..\lib_enc\gp_clip_fx.c" />

    <ClCompile Include="..\lib_enc\gs_enc_fx.c" />

    <ClCompile Include="..\lib_enc\guided_plc_enc_fx.c" />

    <ClCompile Include="..\lib_enc\hf_cod_amrwb_fx.c" />

    <ClCompile Include="..\lib_enc\hq_classifier_enc_fx.c" />

    <ClCompile Include="..\lib_enc\hq_core_enc_fx.c" />

    <ClCompile Include="..\lib_enc\hq_env_enc_fx.c" />

    <ClCompile Include="..\lib_enc\hq_hr_enc_fx.c" />

    <ClCompile Include="..\lib_enc\hq_lr_enc_fx.c" />

    <ClCompile Include="..\lib_enc\hvq_enc_fx.c" />

    <ClCompile Include="..\lib_enc\igf_enc_fx.c" />

    <ClCompile Include="..\lib_enc\igf_scf_enc_fx.c" />

    <ClCompile Include="..\lib_enc\init_enc_fx.c" />

    <ClCompile Include="..\lib_enc\inov_enc_fx.c" />

    <ClCompile Include="..\lib_enc\isf_enc_amr_wb_fx.c" />

    <ClCompile Include="..\lib_enc\ivas_agc_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c" />
@@ -275,12 +347,53 @@ 
    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc.c" />

    <ClCompile Include="..\lib_enc\lead_indexing.c" />

    <ClCompile Include="..\lib_enc\lead_indexing_fx.c" />

    <ClCompile Include="..\lib_enc\lib_enc.c" />

    <ClCompile Include="..\lib_enc\long_enr.c" />

    <ClCompile Include="..\lib_enc\long_enr_fx.c" />

    <ClCompile Include="..\lib_enc\lp_exc_e.c" />

    <ClCompile Include="..\lib_enc\lp_exc_e_fx.c" />

    <ClCompile Include="..\lib_enc\lsf_enc.c" />

    <ClCompile Include="..\lib_enc\lsf_enc_fx.c" />

    <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc.c" />

    <ClCompile Include="..\lib_enc\lsf_msvq_ma_enc_fx.c" />

    <ClCompile Include="..\lib_enc\ltd_stable.c" />

    <ClCompile Include="..\lib_enc\ltd_stable_fx.c" />

    <ClCompile Include="..\lib_enc\mdct_classifier_fx.c" />

    <ClCompile Include="..\lib_enc\mdct_selector_fx.c" />

    <ClCompile Include="..\lib_enc\mslvq_enc_fx.c" />

    <ClCompile Include="..\lib_enc\multi_harm_fx.c" />

    <ClCompile Include="..\lib_enc\noise_adjust_fx.c" />

    <ClCompile Include="..\lib_enc\nois_est_fx.c" />

    <ClCompile Include="..\lib_enc\normalizecoefs_fx.c" />

    <ClCompile Include="..\lib_enc\peak_vq_enc_fx.c" />

    <ClCompile Include="..\lib_enc\pitch_ol2_fx.c" />

    <ClCompile Include="..\lib_enc\pitch_ol_fx.c" />

    <ClCompile Include="..\lib_enc\pit_enc_fx.c" />

    <ClCompile Include="..\lib_enc\plc_enc_ext_fx.c" />

    <ClCompile Include="..\lib_enc\ppp_enc_fx.c" />

    <ClCompile Include="..\lib_enc\pre_proc_fx.c" />

    <ClCompile Include="..\lib_enc\pvq_core_enc_fx.c" />

    <ClCompile Include="..\lib_enc\pvq_encode_fx.c" />

    <ClCompile Include="..\lib_enc\qlpc_avq_fx.c" />

    <ClCompile Include="..\lib_enc\qlpc_stoch_fx.c" />

    <ClCompile Include="..\lib_enc\q_gain2p_fx.c" />

    <ClCompile Include="..\lib_enc\range_enc_fx.c" />

    <ClCompile Include="..\lib_enc\re8_cod_fx.c" />

    <ClCompile Include="..\lib_enc\reordernorm_fx.c" />

    <ClCompile Include="..\lib_enc\rst_enc_fx.c" />

    <ClCompile Include="..\lib_enc\scale_enc_fx.c" />

    <ClCompile Include="..\lib_enc\setmodeindex_fx.c" />

    <ClCompile Include="..\lib_enc\set_impulse_fx.c" />

    <ClCompile Include="..\lib_enc\sig_clas_fx.c" />

    <ClCompile Include="..\lib_enc\SNR_calc_fx.c" />

    <ClCompile Include="..\lib_enc\spec_center_fx.c" />

    <ClCompile Include="..\lib_enc\spec_flatness_fx.c" />

    <ClCompile Include="..\lib_enc\speech_music_classif_fx.c" />

    <ClCompile Include="..\lib_enc\stat_noise_uv_enc_fx.c" />

    <ClCompile Include="..\lib_enc\subband_fft_fx.c" />

    <ClCompile Include="..\lib_enc\swb_bwe_enc_fx.c" />

    <ClCompile Include="..\lib_enc\swb_bwe_enc_hr_fx.c" />

    <ClCompile Include="..\lib_enc\swb_bwe_enc_lr_fx.c" />

    <ClCompile Include="..\lib_enc\mdct_classifier.c" />

    <ClCompile Include="..\lib_enc\mdct_selector.c" />
@@ -322,32 +435,55 @@ 
    <ClCompile Include="..\lib_enc\swb_bwe_enc_hr.c" />

    <ClCompile Include="..\lib_enc\swb_bwe_enc_lr.c" />

    <ClCompile Include="..\lib_enc\swb_pre_proc.c" />

    <ClCompile Include="..\lib_enc\swb_pre_proc_fx.c" />

    <ClCompile Include="..\lib_enc\swb_tbe_enc.c" />

    <ClCompile Include="..\lib_enc\swb_tbe_enc_fx.c" />

    <ClCompile Include="..\lib_enc\tcq_core_enc.c" />

    <ClCompile Include="..\lib_enc\tcq_core_enc_fx.c" />

    <ClCompile Include="..\lib_enc\tcx_ltp_enc.c" />

    <ClCompile Include="..\lib_enc\tcx_ltp_enc_fx.c" />

    <ClCompile Include="..\lib_enc\tcx_utils_enc.c" />

    <ClCompile Include="..\lib_enc\tcx_utils_enc_fx.c" />

    <ClCompile Include="..\lib_enc\tfa_enc.c" />

    <ClCompile Include="..\lib_enc\tfa_enc_fx.c" />

    <ClCompile Include="..\lib_enc\tns_base_enc.c" />

    <ClCompile Include="..\lib_enc\tns_base_enc_fx.c" />

    <ClCompile Include="..\lib_enc\transient_detection.c" />

    <ClCompile Include="..\lib_enc\transient_detection_fx.c" />

    <ClCompile Include="..\lib_enc\transition_enc.c" />

    <ClCompile Include="..\lib_enc\transition_enc_fx.c" />

    <ClCompile Include="..\lib_enc\update_decision.c" />

    <ClCompile Include="..\lib_enc\update_decision_fx.c" />

    <ClCompile Include="..\lib_enc\updt_enc.c" />

    <ClCompile Include="..\lib_enc\updt_enc_fx.c" />

    <ClCompile Include="..\lib_enc\updt_tar.c" />

    <ClCompile Include="..\lib_enc\updt_tar_fx.c" />

    <ClCompile Include="..\lib_enc\vad.c" />

    <ClCompile Include="..\lib_enc\vad_basop_fx.c" />

    <ClCompile Include="..\lib_enc\vad_fx.c" />

    <ClCompile Include="..\lib_enc\vad_param_updt.c" />

    <ClCompile Include="..\lib_enc\vad_param_updt_fx.c" />

    <ClCompile Include="..\lib_enc\vad_proc.c" />

    <ClCompile Include="..\lib_enc\vad_proc_fx.c" />

    <ClCompile Include="..\lib_enc\vbr_average_rate.c" />

    <ClCompile Include="..\lib_enc\vbr_average_rate_fx.c" />

    <ClCompile Include="..\lib_enc\vlpc_1st_cod.c" />

    <ClCompile Include="..\lib_enc\vlpc_1st_cod_fx.c" />

    <ClCompile Include="..\lib_enc\vlpc_2st_cod.c" />

    <ClCompile Include="..\lib_enc\vlpc_2st_cod_fx.c" />

    <ClCompile Include="..\lib_enc\voiced_enc.c" />

    <ClCompile Include="..\lib_enc\voiced_enc_fx.c" />

    <ClCompile Include="..\lib_enc\waveadjust_fec_cod.c" />

    <ClCompile Include="..\lib_enc\waveadjust_fec_cod_fx.c" />

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_enc\ivas_rom_enc.h" />

    <ClInclude Include="..\lib_enc\ivas_stat_enc.h" />

    <ClInclude Include="..\lib_enc\lib_enc.h" />

    <ClInclude Include="..\lib_enc\prot_fx_enc.h" />

    <ClInclude Include="..\lib_enc\rom_enc.h" />

    <ClInclude Include="..\lib_enc\stat_enc.h" />

    <ClInclude Include="..\lib_enc\vad_basop.h" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="lib_com.vcxproj">

Workspace_msvc/lib_enc.vcxproj.filters

+408 −0

File changed.

Preview size limit exceeded, changes collapsed.