Commit 2a154c7b authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into...

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into basop-2288-clang18-compiler-warning-with-o3-walloc-size-larger-than-in-ivas_vbap_fx-c
parents 656bfd62 82ef8f7d
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
/******************************************************************************************************

   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
   (C) 2022-2026 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+0 −13
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@
    <ClCompile Include="..\lib_com\gain_inov_fx.c" />
    <ClCompile Include="..\lib_com\get_gain_fx.c" />
    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c" />
    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c" />
    <ClCompile Include="..\lib_com\gs_gains_fx.c" />
    <ClCompile Include="..\lib_com\gs_inact_switching_fx.c" />
    <ClCompile Include="..\lib_com\gs_noisefill_fx.c" />
@@ -285,20 +284,11 @@
    <ClCompile Include="..\lib_com\wtda_fx.c" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\lib_com\basop32.h" />
    <ClInclude Include="..\lib_com\basop_proto_func.h" />
    <ClInclude Include="..\lib_com\basop_settings.h" />
    <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" />
@@ -317,9 +307,6 @@
    <ClInclude Include="..\lib_com\rom_basop_util.h" />
    <ClInclude Include="..\lib_com\rom_com.h" />
    <ClInclude Include="..\lib_com\stat_com.h" />
    <ClInclude Include="..\lib_com\stl.h" />
    <ClInclude Include="..\lib_com\typedef.h" />
    <ClInclude Include="..\lib_com\typedefs.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
+3 −42
Original line number Diff line number Diff line
@@ -265,12 +265,6 @@
    <ClCompile Include="..\lib_com\get_gain_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\gs_gains_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
@@ -481,6 +475,9 @@
    <ClCompile Include="..\lib_com\rom_com_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\lib_com\ivas_error.h">
@@ -501,9 +498,6 @@
    <ClInclude Include="..\lib_com\ivas_rom_com.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\basop32.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\basop_settings.h">
      <Filter>common_h</Filter>
    </ClInclude>
@@ -513,33 +507,9 @@
    <ClInclude Include="..\lib_com\cnst.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\complex_basop.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\control.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\count.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\basop_util.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\enh40.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\enh32.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\enh64.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\enh1632.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\enhUL32.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\rom_basic_math.h">
      <Filter>common_h</Filter>
    </ClInclude>
@@ -552,9 +522,6 @@
    <ClInclude Include="..\lib_com\stat_com.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\stl.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\move.h">
      <Filter>common_h</Filter>
    </ClInclude>
@@ -570,12 +537,6 @@
    <ClInclude Include="..\lib_com\oper_32b.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\typedef.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\typedefs.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\log2.h">
      <Filter>common_h</Filter>
    </ClInclude>
+2 −2
Original line number Diff line number Diff line
@@ -209,11 +209,12 @@
    <ClCompile Include="..\lib_dec\init_dec_fx.c" />
    <ClCompile Include="..\lib_dec\inov_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_agc_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_core_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_cpe_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_dec_render_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_dirac_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_entropy_decoder_fx.c" />
@@ -223,7 +224,6 @@
    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_ism_param_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_ism_renderer_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_jbm_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_lfe_dec_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_lfe_plc_fx.c" />
    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec_fx.c" />
+6 −6
Original line number Diff line number Diff line
@@ -326,9 +326,6 @@
    <ClCompile Include="..\lib_dec\vlpc_2st_dec_fx.c">
      <Filter>decoder_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal_fx.c">
      <Filter>decoder_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_dec\ivas_core_dec_fx.c">
      <Filter>decoder_ivas_c</Filter>
    </ClCompile>
@@ -362,9 +359,6 @@
    <ClCompile Include="..\lib_dec\ivas_ism_renderer_fx.c">
      <Filter>decoder_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_dec\ivas_jbm_dec_fx.c">
      <Filter>decoder_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec_fx.c">
      <Filter>decoder_ivas_c</Filter>
    </ClCompile>
@@ -509,6 +503,12 @@
    <ClCompile Include="..\lib_dec\rom_dec_fx.c">
      <Filter>decoder_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_dec\ivas_dec_fx.c">
      <Filter>decoder_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_dec\ivas_dec_render_fx.c">
      <Filter>decoder_ivas_c</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\lib_dec\lib_dec.h" />
Loading