Commit 952414b7 authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

Merge remote-tracking branch 'origin/main' into 1721_fix_activated_hp20_recoding

parents 03918345 aa6fbd17

Workspace_msvc/lib_com.vcxproj

+1 −8
Original line number Diff line number Diff line
@@ -217,9 +217,8 @@ 
    <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_rotation_com.c" />

    <ClCompile Include="..\lib_com\ivas_rotation_com_fx.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_fx.c" />
@@ -265,7 +264,6 @@ 
    <ClCompile Include="..\lib_com\residu_fx.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\stab_est_fx.c" />
@@ -283,7 +281,6 @@ 
    <ClCompile Include="..\lib_com\tcx_utils_fx.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\trans_inv_fx.c" />
@@ -315,7 +312,6 @@ 
    <ClInclude Include="..\lib_com\ivas_error_utils.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" />
@@ -328,12 +324,9 @@ 
    <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" />

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

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

    <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" />

Workspace_msvc/lib_com.vcxproj.filters

+6 −28
Original line number Diff line number Diff line
@@ -73,15 +73,9 @@ 
    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>
@@ -184,9 +178,6 @@ 
    <ClCompile Include="..\lib_com\bits_alloc_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -439,12 +430,6 @@ 
    <ClCompile Include="..\lib_com\rom_basop_util.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -487,9 +472,6 @@ 
    <ClCompile Include="..\lib_com\tns_base.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -517,6 +499,12 @@ 
    <ClCompile Include="..\lib_com\wtda_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\ivas_error.h">
@@ -531,9 +519,6 @@ 
    <ClInclude Include="..\lib_com\ivas_stat_com.h">

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>
@@ -588,15 +573,9 @@ 
    <ClInclude Include="..\lib_com\rom_com.h">

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>
@@ -629,7 +608,6 @@ 
    </ClInclude>

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

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

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

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_all_c">

Workspace_msvc/lib_enc.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd_fx.c" />

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

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

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

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

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

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

Workspace_msvc/lib_enc.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -253,9 +253,6 @@ 
    <ClCompile Include="..\lib_enc\hvq_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

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

      <Filter>encoder_all_c</Filter>

    </ClCompile>

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

      <Filter>encoder_all_c</Filter>

    </ClCompile>

lib_com/cldfb_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include "stat_dec.h"

#include "prot_fx.h"

#include "rom_com.h"

#include "rom_com_fx.h"

#include "wmc_auto.h"

#if __STDC_VERSION__ >= 199901L

#if defined __ICL