merge duplicated files (d0e88a87) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_com.vcxproj

+1 −8

Original line number	Diff line number	Diff line
		@@ -215,9 +215,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" />
		@@ -264,7 +263,6 @@
		<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" />
		<ClCompile Include="..\lib_com\stat_noise_uv_mod_fx.c" />
		@@ -281,7 +279,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" />
		@@ -313,7 +310,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" />
		@@ -326,12 +322,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

+3 −25

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>
		@@ -442,9 +433,6 @@
		<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 +475,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 +502,9 @@
		<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>
		</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">

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

lib_com/cng_exc_fx.c

+14 −8

Original line number	Diff line number	Diff line
		/*====================================================================================
		EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
		====================================================================================*/

		#include <stdint.h>
		#include "options.h" /* Compilation switches */
		#include "cnst.h" /* Common constants */
		#include "prot_fx.h" /* Function prototypes */
		#include "rom_com.h"
		#include "ivas_rom_com_fx.h"
		#include "ivas_rom_com.h"


		/---------------------------------------------------------------------
		* Local constants
		---------------------------------------------------------------------/

		#define A2 6554
		#define OmA2 ( 32768 - A2 )
		#define GAIN_VAR 11811 /* in Q31 divided by 2 (Q30) */

		const Word16 att_pow_tbl[SIZE_SCALE_TABLE_STEREO + 1] = { 9234, 10361, 13044, 16422, 22669, 31292, 32767, 26634, 28212, 20674, 16422, 27254, 30934, 32767 };


		/-------------------------------------------------------
		* CNG_exc()
		*

lib_com/fft_fx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@
		#include "cnst.h"
		#include "prot_fx.h"
		#include "rom_com.h"
		#include "rom_com_fx.h"
		#include "wmc_auto.h"
		#include "complex_basop.h"

		@@ -7174,7 +7173,6 @@ void rfft_fx(

		#define WMC_TOOL_SKIP

		#define SHC( x ) ( (Word16) x )
		#define FFTC( x ) WORD322WORD16( (Word32) x )

		#define C81_FX ( FFTC( 0x5a82799a ) ) /* FL2WORD32( 7.071067811865475e-1) */