Commit d57666dc authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main-pc' into 1359_basop_PortFlpMR1320

parents ee04f3a3 1dc0bd82

.gitlab-ci.yml

+134 −58

File changed.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#        cmake --build . --config Release





cmake_minimum_required(VERSION 3.1)

cmake_minimum_required(VERSION 3.10)



set(CMAKE_C_STANDARD 99)
@@ -121,7 +121,7 @@ if(WMOPS) 
  add_definitions("-DWMOPS=1")

endif()



project(stereo-evs)

project(stereo-evs LANGUAGES C)

set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer

include(CTest)

Workspace_msvc/lib_com.vcxproj

+43 −37
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ 
    <ClCompile Include="..\lib_com\cb_shape_fx.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\complex_basop.c" />
@@ -200,47 +199,46 @@ 
    <ClCompile Include="..\lib_com\int_lsp.c" />

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_com\ivas_mcmasa_com.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_mc_com.c" />

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_com\ivas_mcmasa_com-fx.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_com\ivas_transient_det_fx.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\limit_t0_fx.c" />

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

    <ClCompile Include="..\lib_com\logqnorm_fx.c" />
@@ -281,7 +279,6 @@ 
    <ClCompile Include="..\lib_com\swb_bwe_com_fx.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\syn_filt_fx.c" />
@@ -312,22 +309,30 @@ 
    <ClInclude Include="..\lib_com\basop_util.h" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ClInclude Include="..\lib_com\rom_com_fx.h" />
@@ -336,6 +341,7 @@ 
    <ClInclude Include="..\lib_com\stl.h" />

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

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

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

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

Workspace_msvc/lib_com.vcxproj.filters

+104 −106
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup>

    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_qspherical_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_sba_config.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mc_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mcmasa_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mc_param_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_dft_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_filters.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_cov_smooth.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_entropy_coder_common.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_fb_mixer.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_arith.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_transient_det.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mdft_imdft.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_pca_tools.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_spar_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_ism_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_omasa_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_lfe_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\enh64.c">

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -379,9 +304,6 @@ 
    <ClCompile Include="..\lib_com\cldfb.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\complex_basop.c">

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -469,18 +391,6 @@ 
    <ClCompile Include="..\lib_com\ivas_agc_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>
@@ -493,18 +403,12 @@ 
    <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -526,9 +430,6 @@ 
    <ClCompile Include="..\lib_com\rom_com.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -544,6 +445,98 @@ 
    <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_arith_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_cov_smooth_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_entropy_coder_common_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_dirac_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_fb_mixer_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_filters_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_ism_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_lfe_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_masa_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mc_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mc_param_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mcmasa_com-fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mct_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mdct_core_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mdft_imdft_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_omasa_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_pca_tools_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_qmetadata_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_sba_config_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_spar_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_dft_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_transient_det_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_tools_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

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

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">
@@ -579,18 +572,12 @@ 
    <ClInclude Include="..\lib_com\ivas_error_utils.h">

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>
@@ -628,8 +615,19 @@ 
      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_all_c</Filter>

      <Filter>common_h</Filter>

    </ClInclude>

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

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

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

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

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

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

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

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

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

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

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

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_evs_c">

Workspace_msvc/lib_dec.vcxproj

+47 −61

File changed.

Preview size limit exceeded, changes collapsed.