diff --git a/Workspace_msvc/lib_com.vcxproj b/Workspace_msvc/lib_com.vcxproj index f55a30abbd690261a49233e1d5cadbbb59ef1c9a..28dae4b83bcd32f3fac943c53d3420f30e53c6fb 100644 --- a/Workspace_msvc/lib_com.vcxproj +++ b/Workspace_msvc/lib_com.vcxproj @@ -399,8 +399,7 @@ - - + diff --git a/Workspace_msvc/lib_com.vcxproj.filters b/Workspace_msvc/lib_com.vcxproj.filters index d46cc4712a40bc6363cc3460921e6dc9d1cac854..46d83453ac2480c96dc4f570a757346e4fd4d77b 100644 --- a/Workspace_msvc/lib_com.vcxproj.filters +++ b/Workspace_msvc/lib_com.vcxproj.filters @@ -593,11 +593,10 @@ common_h - - common_h + diff --git a/Workspace_msvc/renderer.vcxproj b/Workspace_msvc/renderer.vcxproj index c62874ec0afbfb789e4d8814ab3938b3e33f3410..1f95040e1f2189e4fed248f58eddd0e27e8da7a0 100644 --- a/Workspace_msvc/renderer.vcxproj +++ b/Workspace_msvc/renderer.vcxproj @@ -65,7 +65,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;.%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions) EnableFastChecks diff --git a/apps/renderer.c b/apps/renderer.c index 1cc4c1a321cc59149a23d78cdd4a426f84826df9..fcc1a04b785a036a6582e84b14a4a3fa845c30db 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -49,7 +49,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" +#include "prot_fx.h" #endif #define WMC_TOOL_SKIP diff --git a/lib_com/ACcontextMapping_fx.c b/lib_com/ACcontextMapping_fx.c index 6cf368a46d5f166a2866d9e0a71f23651d65edec..ef550869294a871eac2f8084330357af76a39452 100644 --- a/lib_com/ACcontextMapping_fx.c +++ b/lib_com/ACcontextMapping_fx.c @@ -6,8 +6,7 @@ #include "options.h" #include "basop_util.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /* Returns: index of next coefficient */ diff --git a/lib_com/ari_fx.c b/lib_com/ari_fx.c index a16885a62a723d1abd6e6afa9ee585eb146f8366..3b36d10b320b4ca5ef082d785740f10754e03ba1 100644 --- a/lib_com/ari_fx.c +++ b/lib_com/ari_fx.c @@ -5,8 +5,7 @@ #include #include "assert.h" #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" /** diff --git a/lib_com/ari_hm_fx.c b/lib_com/ari_hm_fx.c index 425823d27380ff43359f741bd16c784fd9f20dcb..767aea860a1f2591044ee1b3ee9de2c0ce1c380a 100644 --- a/lib_com/ari_hm_fx.c +++ b/lib_com/ari_hm_fx.c @@ -9,8 +9,7 @@ #include "cnst.h" #include "basop_util.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) ) void UnmapIndex( diff --git a/lib_com/arith_coder_fx.c b/lib_com/arith_coder_fx.c index 54533aacab113bf313d1edfcc4ae63f94a2bb69d..64cc81d04c07e795318487e3314dd0242216b140 100644 --- a/lib_com/arith_coder_fx.c +++ b/lib_com/arith_coder_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "cnst.h" diff --git a/lib_com/bitalloc_fx.c b/lib_com/bitalloc_fx.c index 78f6ac2764e31bd1e2f9410f7d7015408777ee8b..c20235e391d15ae9f3e1a8b1ebf2efe1e7a0e561 100644 --- a/lib_com/bitalloc_fx.c +++ b/lib_com/bitalloc_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ void bitalloc_fx( Word16 *y, /* i : reordered norm of sub-vectors Q0 */ diff --git a/lib_com/bitallocsum_fx.c b/lib_com/bitallocsum_fx.c index fd34a0c1d225791932e1b1e38c6a7e607fb58f8e..c3803eb947e2485ac6c6e60bd03b4a35f7530126 100644 --- a/lib_com/bitallocsum_fx.c +++ b/lib_com/bitallocsum_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------------- * bitallocsum_fx() diff --git a/lib_com/bits_alloc_fx.c b/lib_com/bits_alloc_fx.c index 0638b903c828699c91c578f07603db8418a6ace2..da120dc82bffb672bfa8d4d99acde2f553d2bb2d 100644 --- a/lib_com/bits_alloc_fx.c +++ b/lib_com/bits_alloc_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/bitstream_fx.c b/lib_com/bitstream_fx.c index 2bf4ecf9111b84b6a34397a7db6520bff12b26b7..f10493eeac1d083e262c49e1fa44a9c4a5d51268 100644 --- a/lib_com/bitstream_fx.c +++ b/lib_com/bitstream_fx.c @@ -39,7 +39,7 @@ #include #include "options.h" #include "ivas_cnst.h" /* Common constants */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "ivas_prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/cb_shape_fx.c b/lib_com/cb_shape_fx.c index d8dec57d6e2b008080f310d4a5ca32814ed7af75..880b60205fb2a6fa102826e4ec343ebca8c4a18f 100644 --- a/lib_com/cb_shape_fx.c +++ b/lib_com/cb_shape_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* */ /* * E_GAIN_f_pitch_sharpening diff --git a/lib_com/cldfb.c b/lib_com/cldfb.c index 9083ac14f2b782020032cf950e3d6612b639335e..4b618f556e32b26bc8bd3b94e556e2964df69b08 100644 --- a/lib_com/cldfb.c +++ b/lib_com/cldfb.c @@ -40,11 +40,10 @@ #include #include "stat_dec.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "rom_com_fx.h" #include "wmc_auto.h" -#include "prot_fx2.h" #if __STDC_VERSION__ >= 199901L #if defined __ICL #define restrict __restrict diff --git a/lib_com/cldfb_evs.c b/lib_com/cldfb_evs.c index 1e7d5bd8f21f8fb739c5b6f04c982843f3b0facb..2a27fbb24439172b32cc34107724e43bff51dc06 100644 --- a/lib_com/cldfb_evs.c +++ b/lib_com/cldfb_evs.c @@ -20,8 +20,7 @@ #include "stat_com.h" #include "rom_com.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include #define STATE_BUFFER_SIZE ( 9 + 16 ) diff --git a/lib_com/cng_exc_fx.c b/lib_com/cng_exc_fx.c index c43d08014963392e62f117c051382da636b7758f..e2475bbad9d3112be95030303a3f095dc3ecd52e 100644 --- a/lib_com/cng_exc_fx.c +++ b/lib_com/cng_exc_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#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" diff --git a/lib_com/codec_tcx_common.c b/lib_com/codec_tcx_common.c index 79f0fa4c57e355992586f670fc57ab7884244699..f956cba9b2da81b8f6b9e32fb0e3536c15532869 100644 --- a/lib_com/codec_tcx_common.c +++ b/lib_com/codec_tcx_common.c @@ -7,8 +7,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_basop_util.h" #include "rom_com.h" diff --git a/lib_com/core_com_config.c b/lib_com/core_com_config.c index e01bb339a286f4c415d8aca6c1170f7980825549..a10ecac19110b777bf32ff0c5fe80d60d94b229c 100644 --- a/lib_com/core_com_config.c +++ b/lib_com/core_com_config.c @@ -41,7 +41,7 @@ #include "prot.h" #include "wmc_auto.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define FSCALE_DENOM_BY_12800_Q15 1311 /*-------------------------------------------------------------------* diff --git a/lib_com/deemph.c b/lib_com/deemph.c index 1c00dde1aacd2a483386a6fbd86bcd364caa2b98..9583a79d4c21627746d37604084611bbbccc0dc1 100644 --- a/lib_com/deemph.c +++ b/lib_com/deemph.c @@ -38,8 +38,7 @@ #include "options.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * deemph() * diff --git a/lib_com/delay_comp.c b/lib_com/delay_comp.c index b0ccb9888fef756176942476880acd84f513783c..c1e1e869ccf7edaffd278c77435f785e950ce39c 100644 --- a/lib_com/delay_comp.c +++ b/lib_com/delay_comp.c @@ -39,8 +39,7 @@ #include "prot.h" #include "ivas_cnst.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------------- * get_delay() diff --git a/lib_com/dlpc_bfi_fx.c b/lib_com/dlpc_bfi_fx.c index 43a8c360c29dec0fdaf2fdafef5c12c2392be151..be4b2769671f470b500ca229cf0c41b6120c384d 100644 --- a/lib_com/dlpc_bfi_fx.c +++ b/lib_com/dlpc_bfi_fx.c @@ -6,8 +6,7 @@ /* Header files */ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" void dlpc_bfi( const Word16 L_frame, diff --git a/lib_com/edct_fx.c b/lib_com/edct_fx.c index 721a5bf2536ea194c76c1616e3be46899b4dde6c..bd27d2137a5234757c747e4b90270f0c69c67bbf 100644 --- a/lib_com/edct_fx.c +++ b/lib_com/edct_fx.c @@ -4,11 +4,10 @@ #include #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_com/enhancer_fx.c b/lib_com/enhancer_fx.c index 2482bf58b0057b764a6f56a7c953627368e9b068..7f529ec125be9e019273fec1354b8abc302108b8 100644 --- a/lib_com/enhancer_fx.c +++ b/lib_com/enhancer_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ #include "basop_util.h" /*---------------------------------------------------------------------* diff --git a/lib_com/enr_1_az.c b/lib_com/enr_1_az.c index 2f663deaf3cbbf1ca229cff68f3f2f32c2bc7c65..3285c515a469368aa8f0d7f366614a5c74b197e1 100644 --- a/lib_com/enr_1_az.c +++ b/lib_com/enr_1_az.c @@ -39,7 +39,7 @@ #include "cnst.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * enr_1_Az() diff --git a/lib_com/env_adj.c b/lib_com/env_adj.c index 874bf4aa8298ab77d2ef17ecef371c1e87b75c69..39e29e8fa48f220f9b788726f50ed7fb175d300a 100644 --- a/lib_com/env_adj.c +++ b/lib_com/env_adj.c @@ -40,8 +40,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------------* * env_adj() diff --git a/lib_com/env_stab.c b/lib_com/env_stab.c index a05cb79ba18affd18eea126a02f1a352d7b756ff..1ccdd1184a130314dc1319c5374a3265e4cc7696 100644 --- a/lib_com/env_stab.c +++ b/lib_com/env_stab.c @@ -43,8 +43,7 @@ #include "rom_com.h" #include "wmc_auto.h" #include "stl.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------------* * Local constants *--------------------------------------------------------------------------*/ diff --git a/lib_com/env_stab_trans.c b/lib_com/env_stab_trans.c index 29473bd66aa2b7d89b0fd30c0cbef368f3edeb9f..1d1ccff3245ffa8af2fafeacd023e534bc00f356 100644 --- a/lib_com/env_stab_trans.c +++ b/lib_com/env_stab_trans.c @@ -41,8 +41,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------------* * env_stab_transient_detect() * diff --git a/lib_com/est_tilt_fx.c b/lib_com/est_tilt_fx.c index c556536e4e0489e29be1217cab38950cf60c72d5..6f541c11f3f459016f3637e2d699e7902e8906fe 100644 --- a/lib_com/est_tilt_fx.c +++ b/lib_com/est_tilt_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" #include "basop_util.h" diff --git a/lib_com/fd_cng_com.c b/lib_com/fd_cng_com.c index 8a03d64cacc106952925e1de292888f522de9081..bf501e2f76646fa550558ef7583a1f3f5103b295 100644 --- a/lib_com/fd_cng_com.c +++ b/lib_com/fd_cng_com.c @@ -39,7 +39,7 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "wmc_auto.h" diff --git a/lib_com/fd_cng_com_fx.c b/lib_com/fd_cng_com_fx.c index c8387c40a11b530f646363fa1ce91b461ad8ee3c..dd84969a91dba71c14cbcf49315a1022d47a4da2 100644 --- a/lib_com/fd_cng_com_fx.c +++ b/lib_com/fd_cng_com_fx.c @@ -9,8 +9,7 @@ #include "options.h" #include "rom_basop_util.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #define DELTA_SHIFT 2 diff --git a/lib_com/fft_cldfb_fx.c b/lib_com/fft_cldfb_fx.c index 6271eea2662614b131ec35080de00a1ac8f7aa99..d60a285f5561ca43ee3b695f4fa7af6ed3bc5633 100644 --- a/lib_com/fft_cldfb_fx.c +++ b/lib_com/fft_cldfb_fx.c @@ -37,7 +37,7 @@ #include #include "options.h" #include -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "wmc_auto.h" #include "basop_util.h" diff --git a/lib_com/fft_evs.c b/lib_com/fft_evs.c index 3ff15a5c665674e06641356243f8451656a748c3..56b735804472042cf19e8d6f9dd97bfa78533dbb 100644 --- a/lib_com/fft_evs.c +++ b/lib_com/fft_evs.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_basop_util.h" #include "rom_com.h" diff --git a/lib_com/fft_fx.c b/lib_com/fft_fx.c index 4fe9aac607e965a8b196d76b9d799356ee6e441c..d7a1aa12fec957fa7491ab20364d44cb9ad56fe3 100644 --- a/lib_com/fft_fx.c +++ b/lib_com/fft_fx.c @@ -45,8 +45,7 @@ #include #include "cnst.h" // #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" //#include "cnst_fx.h" #include "rom_com.h" #include "rom_com_fx.h" diff --git a/lib_com/fft_fx_evs.c b/lib_com/fft_fx_evs.c index fa25f6847c27e0e96167e20eb92957ec7367e541..c17de364316b9a4093286ce66ae45358534f4300 100644 --- a/lib_com/fft_fx_evs.c +++ b/lib_com/fft_fx_evs.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ #include "stl.h" #include diff --git a/lib_com/fft_rel.c b/lib_com/fft_rel.c index 1cf917f8f8fa7187a186243af93b50e754be64f2..4682fb65e5522f1f7bbed3284118dfea8c70d7aa 100644 --- a/lib_com/fft_rel.c +++ b/lib_com/fft_rel.c @@ -39,8 +39,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_com/fft_rel_fx.c b/lib_com/fft_rel_fx.c index 8460995926f260e7c9155f98b163253495f42d40..b07cb3acbe15034a5f13a05cf1d6a35a8892c708 100644 --- a/lib_com/fft_rel_fx.c +++ b/lib_com/fft_rel_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ #include "stl.h" #include "stdint.h" diff --git a/lib_com/fill_spectrum.c b/lib_com/fill_spectrum.c index 7571b03bacef420e60286d56db29685364c559f7..b75a670178eb0e4d3a550d826b3bd856cd5ffbef 100644 --- a/lib_com/fill_spectrum.c +++ b/lib_com/fill_spectrum.c @@ -40,8 +40,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/findpulse.c b/lib_com/findpulse.c index c04b13a4d09fb5871b3fd31b7762fe8507c1edd1..e7104810c704a825563f95c3115307041f222f5a 100644 --- a/lib_com/findpulse.c +++ b/lib_com/findpulse.c @@ -40,8 +40,7 @@ #include "prot.h" #include "cnst.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*----------------------------------------------------------------------------------* * findpulse() diff --git a/lib_com/fine_gain_bits_fx.c b/lib_com/fine_gain_bits_fx.c index e2f1dd8c7873eab7ff0028401634a48a61f4c03a..627eda6e0a29878d2a104cd2c356d7a560093fc2 100644 --- a/lib_com/fine_gain_bits_fx.c +++ b/lib_com/fine_gain_bits_fx.c @@ -3,10 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/float_to_fix_ops.c b/lib_com/float_to_fix_ops.c index 5547bb30c28b3a02d3be8fd36b9701d4bde256d0..5ba9b55a632b61ab8ca8638af242a9a6cadfe769 100644 --- a/lib_com/float_to_fix_ops.c +++ b/lib_com/float_to_fix_ops.c @@ -4,7 +4,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" Word32 floatToFixed( float f, Word16 Q ) { diff --git a/lib_com/frame_ener.c b/lib_com/frame_ener.c index 4fa6e41baeaf2379cb9cb4e46f17597c06150fce..5af9eed54817734d963c4fbfe5bcad03f66bedfc 100644 --- a/lib_com/frame_ener.c +++ b/lib_com/frame_ener.c @@ -40,8 +40,7 @@ #include "cnst.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*----------------------------------------------------------------------------------* * fer_energy() * diff --git a/lib_com/gain_inov_fx.c b/lib_com/gain_inov_fx.c index 7f767c0280cec81306d84c54e7b143c867a5396e..e2f65421a479a918a98a3a884910e849f324fbe0 100644 --- a/lib_com/gain_inov_fx.c +++ b/lib_com/gain_inov_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/get_gain.c b/lib_com/get_gain.c index 43d39ae318a9b1a0b31b35d0507412cfecb45767..5f9c8f56a0f67b4355d6af240da3134733a56b38 100644 --- a/lib_com/get_gain.c +++ b/lib_com/get_gain.c @@ -38,8 +38,7 @@ #include "options.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*----------------------------------------------------------------------------------* * get_gain() diff --git a/lib_com/gs_bitallocation_fx.c b/lib_com/gs_bitallocation_fx.c index 112d94e51b598c04b00d8831156fa61ef3bb0c0a..943291cec8a416278ca5dc4f6b0449bc29e3f95a 100644 --- a/lib_com/gs_bitallocation_fx.c +++ b/lib_com/gs_bitallocation_fx.c @@ -2,12 +2,11 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "assert.h" /* Debug prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ +#include "assert.h" /* Debug prototypes */ #include "stl.h" /*==================================================================================*/ diff --git a/lib_com/gs_bitallocation_ivas_fx.c b/lib_com/gs_bitallocation_ivas_fx.c index 0e742612082f8af8de283f4c3a079644cc96d98b..6bc6eac23711a45293ac7b4aae01f8add9ee8bf1 100644 --- a/lib_com/gs_bitallocation_ivas_fx.c +++ b/lib_com/gs_bitallocation_ivas_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ #include "prot.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "ivas_prot.h" /* Function prototypes */ #include "assert.h" /* Debug prototypes */ #include "stl.h" diff --git a/lib_com/gs_gains_fx.c b/lib_com/gs_gains_fx.c index 048099e258131712e35271795d4a35117ced61ac..4de024088b91d5d005196915898c47bd143487d6 100644 --- a/lib_com/gs_gains_fx.c +++ b/lib_com/gs_gains_fx.c @@ -37,8 +37,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stl.h" /*-------------------------------------------------------------------* diff --git a/lib_com/gs_inact_switching_fx.c b/lib_com/gs_inact_switching_fx.c index 446f9849bc6c6d3117e2090797576e38c979f1b2..01a0556208933370f8cb507ed705e700f5df5b3d 100644 --- a/lib_com/gs_inact_switching_fx.c +++ b/lib_com/gs_inact_switching_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" /*-------------------------------------------------------------------* diff --git a/lib_com/gs_noisefill_fx.c b/lib_com/gs_noisefill_fx.c index 3e5bfab969ef5bce364ab3df0d7b92fe8169f8d4..2dea2adef957003bf5943d58b7576da6feb92116 100644 --- a/lib_com/gs_noisefill_fx.c +++ b/lib_com/gs_noisefill_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * gs_noisf() diff --git a/lib_com/gs_preech.c b/lib_com/gs_preech.c index 8765dc7e0aad7ae903bae9a900b728aebd474860..1c3c3ccfebe23fc6a268c80417435302aad0e5c1 100644 --- a/lib_com/gs_preech.c +++ b/lib_com/gs_preech.c @@ -41,8 +41,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_com/guided_plc_util_fx.c b/lib_com/guided_plc_util_fx.c index a95e9a5c44ed9f9da5e27eac8eca3a6f6a136070..2610a7693db6701bbede427b8115aacb58e30e2f 100644 --- a/lib_com/guided_plc_util_fx.c +++ b/lib_com/guided_plc_util_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_com/hp50.c b/lib_com/hp50.c index d6aaebea253d3ff74748be788e7b3e29f6b0290b..dbabd5632224e2cabe735a9c4b6a333e6289b703 100644 --- a/lib_com/hp50.c +++ b/lib_com/hp50.c @@ -39,8 +39,7 @@ #include "options.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /* * hp20 diff --git a/lib_com/hq2_bit_alloc_fx.c b/lib_com/hq2_bit_alloc_fx.c index c43b11ae58935660c6b83c4ccf490609a6f7b543..486de81de13abff40fb0e1fd33da87d016e59e0c 100644 --- a/lib_com/hq2_bit_alloc_fx.c +++ b/lib_com/hq2_bit_alloc_fx.c @@ -32,7 +32,7 @@ #include #include "options.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #define MIN_BITS_FIX 0 /* QRk=18 */ diff --git a/lib_com/hq2_core_com_fx.c b/lib_com/hq2_core_com_fx.c index b00a25aaa6eb4fc79dfc088dfddec8cbc90ad168..206a37bc84924d96ff41c9e14031da2686bf6314 100644 --- a/lib_com/hq2_core_com_fx.c +++ b/lib_com/hq2_core_com_fx.c @@ -35,7 +35,7 @@ #include "options.h" #include "cnst.h" /* Audio core constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------------* diff --git a/lib_com/hq2_noise_inject_fx.c b/lib_com/hq2_noise_inject_fx.c index c47bb5cfdc986221e43db90caf26669764cdef6c..c7326bd8e6b89b48cd25cae686d473677ceedc28 100644 --- a/lib_com/hq2_noise_inject_fx.c +++ b/lib_com/hq2_noise_inject_fx.c @@ -32,7 +32,7 @@ #include #include "options.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "oper_32b.h" #include "move.h" #include "count.h" diff --git a/lib_com/hq_bit_allocation_fx.c b/lib_com/hq_bit_allocation_fx.c index 8b476fb073f840ab6e851c7c741e775bfbc72c1b..4ac2252f840d40a1b38e68171127c7698e8d20aa 100644 --- a/lib_com/hq_bit_allocation_fx.c +++ b/lib_com/hq_bit_allocation_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "stl.h" /* required for wmc_tool */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "stl.h" /* required for wmc_tool */ +#include "prot_fx.h" /* Function prototypes */ +#include "cnst.h" /* Common constants */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/hq_conf.c b/lib_com/hq_conf.c index 4dfe55d80573342be9894ee43f2fd5df814cb953..d96448b02f216491c3fce4087f508b2b84de9d75 100644 --- a/lib_com/hq_conf.c +++ b/lib_com/hq_conf.c @@ -40,8 +40,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------------* * hq_configure() diff --git a/lib_com/hq_conf_fx.c b/lib_com/hq_conf_fx.c index bed185ae137f3046b79091592a31002331cfcd0f..eb675986b941327f64030740700e97dcf40ef763 100644 --- a/lib_com/hq_conf_fx.c +++ b/lib_com/hq_conf_fx.c @@ -4,10 +4,9 @@ #include #include "options.h" -#include "cnst.h" /* Audio core constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "cnst.h" /* Audio core constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/hq_tools_fx.c b/lib_com/hq_tools_fx.c index ae3468c9ae1f3d10c65be8a422e96b96a90629c4..ddc12e4eb59dfdcd0f83723449413ad6f754fb7d 100644 --- a/lib_com/hq_tools_fx.c +++ b/lib_com/hq_tools_fx.c @@ -38,7 +38,7 @@ #include "options.h" /* Compilation switches */ #include "rom_com.h" /* Static table prototypes FIP version */ #include "stl.h" /* required for wmc_tool */ -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/hvq_pvq_bitalloc_fx.c b/lib_com/hvq_pvq_bitalloc_fx.c index 487aaf2ea8f2448aba21fca1e06946d0747fda3d..4775f1b7822e808553fe60c62d10bf39ec7a6315 100644 --- a/lib_com/hvq_pvq_bitalloc_fx.c +++ b/lib_com/hvq_pvq_bitalloc_fx.c @@ -5,9 +5,8 @@ #include "options.h" /* Compilation switches */ #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "cnst.h" /* Common constants */ /*--------------------------------------------------------------------------*/ /* Function hvq_pvq_bitalloc */ diff --git a/lib_com/ifft_rel.c b/lib_com/ifft_rel.c index c1e8687164023acb56bfb7058aa975788b939c0b..43aa3f122860712ab0f33bb466f36ad5bbd2c492 100644 --- a/lib_com/ifft_rel.c +++ b/lib_com/ifft_rel.c @@ -39,8 +39,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------* * Local constants *-----------------------------------------------------------------*/ diff --git a/lib_com/igf_base.c b/lib_com/igf_base.c index 658707947596e3ea302bdc14adcb938822c7d3dd..637dd0270ff48384dddfc988071a41b7ae7e3284 100644 --- a/lib_com/igf_base.c +++ b/lib_com/igf_base.c @@ -41,7 +41,7 @@ #include "rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*---------------------------------------------------------------------* diff --git a/lib_com/igf_base_fx.c b/lib_com/igf_base_fx.c index ac1a1bcdeeb86a66761814c1376634393e0f47fc..022720707b89f513cd299cc8eeba1b5c2fb3f740 100644 --- a/lib_com/igf_base_fx.c +++ b/lib_com/igf_base_fx.c @@ -8,8 +8,7 @@ #include #include "options.h" #include "stl.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "basop_util.h" diff --git a/lib_com/index_pvq_opt_fx.c b/lib_com/index_pvq_opt_fx.c index 2f75d8ac8233234b8294532ce0e91d59fc149e75..3ca87f63825890d0c13eb85534e52d95ee28d7b5 100644 --- a/lib_com/index_pvq_opt_fx.c +++ b/lib_com/index_pvq_opt_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #define N_OPT_FX 5 /* complexity setting, direct functional calculation limit & low dim recursion limit */ diff --git a/lib_com/int_lsp.c b/lib_com/int_lsp.c index a79a6bba5e4d432f59eaf22121bf55f2a63c0374..b6528030e17949b4ff1af298ed0996668d5d87ae 100644 --- a/lib_com/int_lsp.c +++ b/lib_com/int_lsp.c @@ -40,8 +40,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*---------------------------------------------------------------------* * int_lsp() diff --git a/lib_com/interleave_spectrum.c b/lib_com/interleave_spectrum.c index f5e6acf3175bf57bed7d6062c5d71c372a170490..9fdba4c77be73760a2090220daecf80eb3a7304f 100644 --- a/lib_com/interleave_spectrum.c +++ b/lib_com/interleave_spectrum.c @@ -40,8 +40,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/interpol.c b/lib_com/interpol.c index 2dfab173b28ffbc49195a1f17ec9b0f89198a8aa..f4e42de2c1b484589ca1fd06d5f677b15a00a7c3 100644 --- a/lib_com/interpol.c +++ b/lib_com/interpol.c @@ -39,8 +39,7 @@ #include "prot.h" #include "wmc_auto.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" /*-------------------------------------------------------------------* diff --git a/lib_com/isf_dec_amr_wb_fx.c b/lib_com/isf_dec_amr_wb_fx.c index 4327339b834aace3a7c0b628c93e18be32f0ca75..586dea53549dcaa098721848f4301909748f5d02 100644 --- a/lib_com/isf_dec_amr_wb_fx.c +++ b/lib_com/isf_dec_amr_wb_fx.c @@ -31,10 +31,10 @@ *******************************************************************************************************/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef _MSC_VER void E_LPC_isf_isp_conversion( const Word16 isf[], Word16 isp[], const Word16 m ); diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c index 0be1c40ffef45dcf91aec10274d63d4d10f5b3dc..83269c34bdb7ac4cf95ae9471c40c05aa63d67ee 100644 --- a/lib_com/ivas_cov_smooth.c +++ b/lib_com/ivas_cov_smooth.c @@ -36,7 +36,7 @@ #include "ivas_prot.h" #include "wmc_auto.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------------------------* * Local constants diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c index 1762c9f688813ca03c491dbbf5f85466c6affaab..cce2880bd4cd4041ce2681eb64ace0b8dfab76ab 100644 --- a/lib_com/ivas_dirac_com.c +++ b/lib_com/ivas_dirac_com.c @@ -40,8 +40,7 @@ #include "prot.h" #include "cnst.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_com/ivas_fb_mixer.c b/lib_com/ivas_fb_mixer.c index 0b890d7a89beb0b338085b499c0750b8ec7ecfbc..59b62491cbd9f375a9a8a3123dd7c8773f376ccd 100644 --- a/lib_com/ivas_fb_mixer.c +++ b/lib_com/ivas_fb_mixer.c @@ -39,8 +39,7 @@ #include #include "wmc_auto.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" #endif diff --git a/lib_com/ivas_ism_com.c b/lib_com/ivas_ism_com.c index 6955e83e3d410ca2dfa2f78abc7982c85a99be12..6a287d2daa7256d1c79f2a00ddda56db54e9990b 100644 --- a/lib_com/ivas_ism_com.c +++ b/lib_com/ivas_ism_com.c @@ -41,8 +41,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED diff --git a/lib_com/ivas_masa_com.c b/lib_com/ivas_masa_com.c index e1aa643d62f0203d0ae5dc74fc673f57b402eb57..e0005e4b8bcd34e69c6f72da85649de46e69213d 100644 --- a/lib_com/ivas_masa_com.c +++ b/lib_com/ivas_masa_com.c @@ -41,7 +41,7 @@ #include "ivas_stat_dec.h" #include "wmc_auto.h" #include "ivas_rom_com_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" diff --git a/lib_com/ivas_mc_param_com.c b/lib_com/ivas_mc_param_com.c index 5297d332a8439b961b9b884a87f1f35acfd9490d..1b19b9037c75678cec3b28759ed605fddecd0c68 100644 --- a/lib_com/ivas_mc_param_com.c +++ b/lib_com/ivas_mc_param_com.c @@ -36,7 +36,7 @@ #include "options.h" #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_stat_com.h" #include "ivas_rom_com.h" diff --git a/lib_com/ivas_mct_com.c b/lib_com/ivas_mct_com.c index f68f576f90a209fae0f66c8584e6a7c18b8c744c..dd79107482c4fb69974d810720acd6fbca5e5fab 100644 --- a/lib_com/ivas_mct_com.c +++ b/lib_com/ivas_mct_com.c @@ -35,7 +35,6 @@ #include "ivas_cnst.h" #include "ivas_prot.h" #include "prot.h" -#include "prot_fx1.h" #include "wmc_auto.h" #include diff --git a/lib_com/ivas_mdct_core_com.c b/lib_com/ivas_mdct_core_com.c index a715790b8f2554e12acf62f890d19de54ba6c417..7e7a00cfc71e19746759cf9ed1da0852d1d4ecfe 100644 --- a/lib_com/ivas_mdct_core_com.c +++ b/lib_com/ivas_mdct_core_com.c @@ -37,8 +37,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_com/ivas_mdct_imdct_fx.c b/lib_com/ivas_mdct_imdct_fx.c index e5bdfca190fca1aa1ea5232a1e65174d25641033..c25f4fab4bdcba6f02162341aa654d2fec309cc9 100644 --- a/lib_com/ivas_mdct_imdct_fx.c +++ b/lib_com/ivas_mdct_imdct_fx.c @@ -32,7 +32,7 @@ #include #include "options.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "ivas_rom_com_fx.h" #ifdef DEBUGGING diff --git a/lib_com/ivas_mdft_imdft.c b/lib_com/ivas_mdft_imdft.c index 2a785bd342fc48f803b07c18bb150efee7cefea9..564285b094a41ecc65afedfdacf4ca53345fea1c 100644 --- a/lib_com/ivas_mdft_imdft.c +++ b/lib_com/ivas_mdft_imdft.c @@ -41,8 +41,7 @@ #ifdef IVAS_FLOAT_FIXED #include #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_com/ivas_omasa_com.c b/lib_com/ivas_omasa_com.c index d7f25bfbb4fd0470c82e493f62a6cf50ff957d34..5dbe0386623a0845e217207edbca48b86f06bfe9 100644 --- a/lib_com/ivas_omasa_com.c +++ b/lib_com/ivas_omasa_com.c @@ -36,11 +36,10 @@ #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "prot.h" -#include "prot_fx1.h" #include "ivas_rom_com.h" #include "rom_com.h" #include -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------- * Local constants diff --git a/lib_com/ivas_pca_tools.c b/lib_com/ivas_pca_tools.c index 2fa1f11f013381709393ebbff8db49a5b27f08a1..f2c6d8d0e96fbc851d878ed4e01c0edef0c3de50 100644 --- a/lib_com/ivas_pca_tools.c +++ b/lib_com/ivas_pca_tools.c @@ -40,7 +40,7 @@ #include "wmc_auto.h" #include "prot.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" +#include "prot_fx.h" #endif /*---------------------------------------------------------------------* diff --git a/lib_com/ivas_qmetadata_com.c b/lib_com/ivas_qmetadata_com.c index dcd68f04b8e062c677f4df9d026aab957a932cac..3bcec831e87b6d4ee95bb86a0a08d6c5d6df389d 100644 --- a/lib_com/ivas_qmetadata_com.c +++ b/lib_com/ivas_qmetadata_com.c @@ -38,11 +38,10 @@ #include "ivas_rom_com.h" #include "ivas_prot.h" #include "prot.h" -#include "prot_fx1.h" #include "cnst.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif #ifdef IVAS_FLOAT_FIXED diff --git a/lib_com/ivas_sns_com_fx.c b/lib_com/ivas_sns_com_fx.c index 9e83cd240c5ebfdb583cd351d669289ef3cfd387..ee29a001dd2266263cb97a95f0838ef75f8e5ce4 100644 --- a/lib_com/ivas_sns_com_fx.c +++ b/lib_com/ivas_sns_com_fx.c @@ -34,8 +34,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "rom_com.h" #include "ivas_rom_com.h" diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c index 36938507a21808b4f96c83a81bc46fe51dd8e9ac..485424125fb9b33c79485b79f72597a0a223185e 100644 --- a/lib_com/ivas_spar_com.c +++ b/lib_com/ivas_spar_com.c @@ -36,8 +36,7 @@ #include "basop_util.h" #include "ivas_stat_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "rom_com.h" #include "ivas_rom_com.h" diff --git a/lib_com/ivas_spar_com_quant_util.c b/lib_com/ivas_spar_com_quant_util.c index 667d21b7f0627d1217a589d654b8edbe5e0fa0fd..78541fd9dcde361cf2c1e00ae763e569a3806aff 100644 --- a/lib_com/ivas_spar_com_quant_util.c +++ b/lib_com/ivas_spar_com_quant_util.c @@ -34,13 +34,11 @@ #include "options.h" #include "math.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include #include "wmc_auto.h" -#include "prot_fx1.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" #endif diff --git a/lib_com/ivas_stereo_ica_com_fx.c b/lib_com/ivas_stereo_ica_com_fx.c index 6ffce03e4c8c772f40d070b16fdc1e93c9c36aa1..a4881b800803102bef98a9b5e9f81aad9e9678f5 100644 --- a/lib_com/ivas_stereo_ica_com_fx.c +++ b/lib_com/ivas_stereo_ica_com_fx.c @@ -37,8 +37,7 @@ #include "cnst.h" #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "wmc_auto.h" #include "rom_com.h" diff --git a/lib_com/ivas_stereo_mdct_bands_com.c b/lib_com/ivas_stereo_mdct_bands_com.c index 3c06612c415706e90d39bbe5b3486f20ecd1a42b..7fa5c100da36287956e0768ac66d8b96964ecf46 100644 --- a/lib_com/ivas_stereo_mdct_bands_com.c +++ b/lib_com/ivas_stereo_mdct_bands_com.c @@ -40,8 +40,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_com/ivas_stereo_mdct_stereo_com.c b/lib_com/ivas_stereo_mdct_stereo_com.c index 28e22b28c46911ae3bf26a510969af724673cac1..a17ba876fe4c1d79a0bd6f09c592adfe189533ce 100644 --- a/lib_com/ivas_stereo_mdct_stereo_com.c +++ b/lib_com/ivas_stereo_mdct_stereo_com.c @@ -37,8 +37,7 @@ #include "wmc_auto.h" #include #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_com/ivas_stereo_td_bit_alloc.c b/lib_com/ivas_stereo_td_bit_alloc.c index 7378308270226bd71c91c592d96d582d38aaf56d..a03100b254b7490b14f5a386555ff0f6be28f109 100644 --- a/lib_com/ivas_stereo_td_bit_alloc.c +++ b/lib_com/ivas_stereo_td_bit_alloc.c @@ -41,8 +41,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif #ifdef IVAS_FLOAT_FIXED diff --git a/lib_com/ivas_tools.c b/lib_com/ivas_tools.c index f579e64fc9bf994b2d2e2207693abb4d63547b74..0fd41f02f494bbb7e0a92a24e5abcac64a661d58 100644 --- a/lib_com/ivas_tools.c +++ b/lib_com/ivas_tools.c @@ -35,12 +35,10 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx1.h" #include "ivas_prot.h" #include "wmc_auto.h" #include "ivas_rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/ivas_transient_det.c b/lib_com/ivas_transient_det.c index a8841845aa60f53ac08e49290c8b5714604f36a6..de238aa5bb6ae29368ead722b2b70bc43cc8cca8 100644 --- a/lib_com/ivas_transient_det.c +++ b/lib_com/ivas_transient_det.c @@ -39,7 +39,7 @@ #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" +#include "prot_fx.h" #endif #include "ivas_stat_com.h" diff --git a/lib_com/lag_wind.c b/lib_com/lag_wind.c index e7fe28882f226c80bfe275a1408adbd5dc6c8184..5e289b34fe6f24cf3538ec37383f89a54c26f936 100644 --- a/lib_com/lag_wind.c +++ b/lib_com/lag_wind.c @@ -38,8 +38,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "rom_com.h" #include "wmc_auto.h" diff --git a/lib_com/lerp.c b/lib_com/lerp.c index eea745b81edefae07087ca009f5f33361b4b1c93..80e789c4cac102b2aa5a24d95599d4b71157f5fc 100644 --- a/lib_com/lerp.c +++ b/lib_com/lerp.c @@ -37,8 +37,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "wmc_auto.h" diff --git a/lib_com/limit_t0_fx.c b/lib_com/limit_t0_fx.c index 97aa4fd8fdfea28183d1b6f04b73e26638cb3285..6573a7925e67489aedcc548a2a4ace59b060e66b 100644 --- a/lib_com/limit_t0_fx.c +++ b/lib_com/limit_t0_fx.c @@ -3,10 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" diff --git a/lib_com/logqnorm_fx.c b/lib_com/logqnorm_fx.c index 902a120b421e5dcf5f9a70b646f5d69646f00780..fbbf2a464eb2bfcd1f18fcf59b8d327d66fdf2b0 100644 --- a/lib_com/logqnorm_fx.c +++ b/lib_com/logqnorm_fx.c @@ -31,10 +31,10 @@ *******************************************************************************************************/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ -#include "cnst.h" /* Common constants */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ +#include "cnst.h" /* Common constants */ /*--------------------------------------------------------------------------* * Local constants diff --git a/lib_com/longarith.c b/lib_com/longarith.c index 2617034d9c7a3887b3e9db84f60a0e2970345caa..65070f093f6bec177b9f5ce288efbb94772e7ce8 100644 --- a/lib_com/longarith.c +++ b/lib_com/longarith.c @@ -41,7 +41,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_com/low_rate_band_att_fx.c b/lib_com/low_rate_band_att_fx.c index a71311f38bc8bf395c3d91907bc99afe02e721a1..f593089b16c4dbd14760862f244b4751f6824021 100644 --- a/lib_com/low_rate_band_att_fx.c +++ b/lib_com/low_rate_band_att_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_com/lpc_tools.c b/lib_com/lpc_tools.c index 382ca06d860d5da4fd1c3e1254471b57265ecd07..ff6dfea48adcedcbb8899a9a1b0ad6f853f25c10 100644 --- a/lib_com/lpc_tools.c +++ b/lib_com/lpc_tools.c @@ -42,7 +42,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------* * Local constants diff --git a/lib_com/lpc_tools_fx.c b/lib_com/lpc_tools_fx.c index 83b59079a24a1b49c75a0dceb9669df0beb208cd..d4c01f46c0108504026973ebc7a6a048f748c6b7 100644 --- a/lib_com/lpc_tools_fx.c +++ b/lib_com/lpc_tools_fx.c @@ -38,7 +38,7 @@ #include #include "options.h" /* Compilation switches */ #include "ivas_cnst.h" /* Common constants */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" #include "basop_util.h" diff --git a/lib_com/lsf_dec_bfi_fx.c b/lib_com/lsf_dec_bfi_fx.c index 4c10059d0b2e627d80316ad3381ecf1801e2e76b..14b842115cd75cafc4fee5c9675d5c3ee66e189b 100644 --- a/lib_com/lsf_dec_bfi_fx.c +++ b/lib_com/lsf_dec_bfi_fx.c @@ -8,8 +8,7 @@ #include "basop_util.h" #include "rom_com.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*---------------------------------------------------------------------* diff --git a/lib_com/lsf_msvq_ma_fx.c b/lib_com/lsf_msvq_ma_fx.c index a423cb9512264ae1056c1cd266b403ead40723a1..409566ddcc351bd7ab99b75eebebeac74cd707c1 100644 --- a/lib_com/lsf_msvq_ma_fx.c +++ b/lib_com/lsf_msvq_ma_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" #include "options.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifndef swap diff --git a/lib_com/lsf_tools.c b/lib_com/lsf_tools.c index 0b92239224777d3e99ccbf09c7de2a087781f2e5..ddce7c19914bfb70759d3366d1443d750a205aa8 100644 --- a/lib_com/lsf_tools.c +++ b/lib_com/lsf_tools.c @@ -44,8 +44,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*-------------------------------------------------------------------* diff --git a/lib_com/lsf_tools_fx.c b/lib_com/lsf_tools_fx.c index c0f7bd613b0bdba16ec5bb4634f881aec93ac07e..c3a5fc40ed2a614dc0b08d81933dfb149f2577e2 100644 --- a/lib_com/lsf_tools_fx.c +++ b/lib_com/lsf_tools_fx.c @@ -36,7 +36,7 @@ #include "basop_util.h" #include "rom_com.h" #include "ivas_cnst.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_error.h" diff --git a/lib_com/lsp_conv_poly_fx.c b/lib_com/lsp_conv_poly_fx.c index 0cda281eaa64f36ebdc362f643cc933700f085f7..70b9190027ffde618edbea070a1a3624122db200 100644 --- a/lib_com/lsp_conv_poly_fx.c +++ b/lib_com/lsp_conv_poly_fx.c @@ -10,7 +10,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_com/modif_fs.c b/lib_com/modif_fs.c index 4bccd568b93c66dca6e1e7aac5f04bbec9a3643c..67593def40fda55788f296974738c043ecc238a2 100644 --- a/lib_com/modif_fs.c +++ b/lib_com/modif_fs.c @@ -41,7 +41,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * modify_Fs() diff --git a/lib_com/modif_fs_fx.c b/lib_com/modif_fs_fx.c index 1845bcde2a2f2649ebb81ed887565973b6224b45..c0c42d31911cd1a88d9b3ba818aeac2c29e6b4b7 100644 --- a/lib_com/modif_fs_fx.c +++ b/lib_com/modif_fs_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /* Static table prototypes */ #include #include "rom_enc.h" /* prototypes */ diff --git a/lib_com/mslvq_com.c b/lib_com/mslvq_com.c index 00b77cebfad6178cf4e12d4411ff4506153ef2fc..d7d4c427be231228e23c01dcdf7beb0f7448e97c 100644 --- a/lib_com/mslvq_com.c +++ b/lib_com/mslvq_com.c @@ -41,7 +41,7 @@ #include "prot.h" #include "wmc_auto.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" /*-----------------------------------------------------------------* diff --git a/lib_com/mslvq_com_fx.c b/lib_com/mslvq_com_fx.c index b2e0e0b2387d5d9d54af6956f42d58b0036f267d..cce15973882f52b07387750d336a3973c05fb501 100644 --- a/lib_com/mslvq_com_fx.c +++ b/lib_com/mslvq_com_fx.c @@ -32,7 +32,7 @@ #include "options.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "stl.h" #include "rom_com.h" diff --git a/lib_com/nelp_fx.c b/lib_com/nelp_fx.c index f0420e3dbf30cbd1cd9bd0c2bd74bec7b429285b..690db58652d44357ae0ccff452100c9099c0f741 100644 --- a/lib_com/nelp_fx.c +++ b/lib_com/nelp_fx.c @@ -33,7 +33,7 @@ #include #include "options.h" #include "rom_com.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*===================================================================*/ diff --git a/lib_com/parameter_bitmaping.c b/lib_com/parameter_bitmaping.c index 5b6374ee038e7e6a43e406dffa2b1d84a5d2b167..2be70b058664caabd37b9745bbcea9efbffe1696 100644 --- a/lib_com/parameter_bitmaping.c +++ b/lib_com/parameter_bitmaping.c @@ -39,7 +39,7 @@ #include "options.h" #include "stat_com.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "wmc_auto.h" diff --git a/lib_com/parameter_bitmaping_fx.c b/lib_com/parameter_bitmaping_fx.c index ee5dd7d73761190a476adef39d200af70f4b7ac1..e66d7b60342f8ea86197d8aae57f22814e2bf24a 100644 --- a/lib_com/parameter_bitmaping_fx.c +++ b/lib_com/parameter_bitmaping_fx.c @@ -2,7 +2,7 @@ #include #include "options.h" #include "stat_com.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "wmc_auto.h" /** Get nBits long value from bitstream into *pStream. */ diff --git a/lib_com/phase_dispersion_fx.c b/lib_com/phase_dispersion_fx.c index 74ae7708c645fb5e067e09b8aab574f80b17cbd6..b7ca7b739b9f8a93a780a2843c59f0c065b142ce 100644 --- a/lib_com/phase_dispersion_fx.c +++ b/lib_com/phase_dispersion_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* EV-VBR compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/ppp_fx.c b/lib_com/ppp_fx.c index 673ffd469acf8650234cc94293239085ee064d24..390c0a47ce1b5ec84c118f3911a939ba84baeb83 100644 --- a/lib_com/ppp_fx.c +++ b/lib_com/ppp_fx.c @@ -33,7 +33,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*===================================================================*/ /* FUNCTION : Interpol_delay_fx () */ diff --git a/lib_com/pred_lt4_fx.c b/lib_com/pred_lt4_fx.c index a6672c2b221e24e4768449b60f2653ec8cf061fe..21bd9f541e420387a60b6e141a80cc2bd6ef7250 100644 --- a/lib_com/pred_lt4_fx.c +++ b/lib_com/pred_lt4_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_com/preemph_fx.c b/lib_com/preemph_fx.c index e610e9fd784e70c861195804ace9161d905b2275..63de35dca4110d2b0c9948e50d1bf04d11878c1f 100644 --- a/lib_com/preemph_fx.c +++ b/lib_com/preemph_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------* * preemph_copy_fx() * diff --git a/lib_com/prot.h b/lib_com/prot.h index 96bdd1952dff41fe1ff9765124f7d124d757437c..1dbf548a6738fe15523b5c52ae15f6f4a290d2da 100644 --- a/lib_com/prot.h +++ b/lib_com/prot.h @@ -166,18 +166,6 @@ float sum2_f( const int16_t lvec /* i : length of input vector */ ); -#ifdef IVAS_FLOAT_FIXED -Word32 sum2_f_32_fx( - const Word32 *vec, /* i : input vector */ - const int16_t lvec, /* i : length of input vector */ - Word16 gb ); - -Word32 sum2_32_fx( - const Word32 *vec, /* i : input vector */ - const Word16 lvec, /* i : length of input vector */ - Word16 *e ); -#endif - void set_c( int8_t y[], /* i/o: Vector to set */ const int8_t a, /* i : Value to set the vector to */ @@ -276,14 +264,12 @@ int16_t minimum( float *min_val /* o : minimum value in the input vector */ ); -#ifndef IVAS_FLOAT_FIXED /*! r: index of the minimum value in the input vector */ int16_t minimum_s( const int16_t *vec, /* i : Input vector */ const int16_t lvec, /* i : Vector length */ int16_t *min_val /* o : minimum value in the input vector */ ); -#endif /*! r: return index with max energy value in vector */ int16_t emaximum( @@ -336,15 +322,6 @@ void v_sub( const int16_t N /* i : Vector length */ ); -#ifdef IVAS_FLOAT_FIXED -void v_mult_fixed( - const Word32 x1[], /* i : Input vector 1 */ - const Word32 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ - const Word16 N /* i : Vector length */ -); -#endif - void v_mult( const float x1[], /* i : Input vector 1 */ const float x2[], /* i : Input vector 2 */ @@ -365,20 +342,6 @@ void v_sub_s( int16_t y[], /* o : Output vector that contains vector 1 - vector 2 */ const int16_t N /* i : Vector length */ ); -#ifdef IVAS_FLOAT_FIXED -void v_sub_s16_fx( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ - const Word16 N /* i : Vector length */ -); -void v_sub32_fx( - const Word32 x1[], /* i : Input vector 1 */ - const Word32 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */ - const Word16 N /* i : Vector length */ -); -#endif // IVAS_FLOAT_FIXED /*! r: index of the winning codeword */ int16_t squant( @@ -505,22 +468,6 @@ void delay_signal_float( const int16_t delay /* i : delay in samples */ ); -#ifdef IVAS_FLOAT_FIXED -void delay_signal_fx( - Word32 x[], /* i/o: signal to be delayed */ - const int16_t len, /* i : length of the input signal */ - Word32 mem[], /* i/o: synchronization memory */ - const int16_t delay /* i : delay in samples */ -); -void delay_signal_q_adj_fx( - Word32 x[], /* i/o: signal to be delayed */ - const int16_t len, /* i : length of the input signal */ - Word32 mem[], /* i/o: synchronization memory */ - const int16_t delay, /* i : delay in samples */ - const Word16 q_x, - const Word16 q_mem ); -#endif - ivas_error push_indice( BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */ int16_t id, /* i : ID of the indice */ @@ -1754,7 +1701,6 @@ void diff_envelope_coding( int16_t *difidx /* o : differential code */ ); -#ifndef IVAS_FLOAT_FIXED /*! r: Number of bits */ int16_t decode_envelope_indices( Decoder_State *st, /* i/o: decoder state structure */ @@ -1765,9 +1711,7 @@ int16_t decode_envelope_indices( const int16_t flag_HQ2, /* i : indicator of HQ2 core */ const int16_t is_transient /* i : transient flag */ ); -#endif -#ifndef IVAS_FLOAT_FIXED /*! r: Number of bits */ void dequantize_norms( Decoder_State *st, /* i/o: decoder state structure */ @@ -1777,7 +1721,6 @@ void dequantize_norms( int16_t *ynrm, /* o : Decoded norm indices */ int16_t *normqlg2 /* o : Log2 of decoded norms */ ); -#endif void hq_configure( const int16_t length, /* i : Frame length */ @@ -1824,7 +1767,6 @@ int16_t hq_classifier_enc( int16_t *hqswb_clas /* o : HQ class */ ); -#ifndef IVAS_FLOAT_FIXED /*! r: Consumed bits */ int16_t hq_classifier_dec( Decoder_State *st, /* i/o: decoder state structure */ @@ -1833,7 +1775,6 @@ int16_t hq_classifier_dec( int16_t *is_transient, /* o : Transient flag */ int16_t *hqswb_clas /* o : HQ class */ ); -#endif void hq_bit_allocation( const int32_t core_brate, /* i : Core bitrate */ @@ -2361,7 +2302,7 @@ void pre_proc( float imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer */ int16_t *hq_core_type /* o : HQ core type */ ); -#endif + /*! r: HQ_CORE/TCX_20_CORE decision */ int16_t mdct_classifier( @@ -2676,19 +2617,7 @@ void swb_tbe_enc( float *White_exc16k, /* o : shaped white excitation for the FB TBE */ const float pitch_buf[] /* i : pitch for each subframe */ ); -#ifdef IVAS_FLOAT_FIXED -void ivas_swb_tbe_dec_fx( - Decoder_State *st, /* i/o: decoder state structure */ - STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */ - const Word32 *bwe_exc_extended_fx, /* i : bandwidth extended excitation */ - Word16 Q_exc, - const Word16 voice_factors_fx[], /* i : voicing factors */ - const Word32 old_syn_12k8_16k_fx[], /* i : low band synthesis */ - Word16 *White_exc16k_fx, /* o : shaped white excitation for the FB TBE */ - Word32 *synth_fx, /* o : SHB synthesis/final synthesis */ - Word16 *pitch_buf_fx, - Word16 *Q_white_exc ); -#endif + void swb_tbe_dec( Decoder_State *st, /* i/o: decoder state structure */ STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */ @@ -2937,18 +2866,6 @@ void swb_bwe_dec_flt( const int16_t output_frame /* i : frame length */ ); -#ifdef IVAS_FLOAT_FIXED -Word16 swb_bwe_dec_fx32( - Decoder_State *st, /* i/o: decoder state structure */ - Word32 output[], /* i : synthesis @internal Fs Q11 */ - Word32 *synth, /* i : ACELP core synthesis/final synthesis Q11 */ - Word32 *hb_synth, /* o : SHB synthesis/final synthesis */ - Word16 use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ - Word16 output_frame /* i : frame length */ -); -#endif // IVAS_FLOAT_FIXED - - void hr_bwe_dec_init_flt( HR_BWE_DEC_HANDLE hBWE_FD_HR /* i/o: HR BWE data handle */ ); @@ -4201,21 +4118,12 @@ void AVQ_encmux( int16_t trgtSvPos /* i : target SV for AVQ bit savings */ ); -#ifndef IVAS_FLOAT_FIXED void ordr_esti( const int16_t k, /* i : sub-vector index */ int16_t *Mpos, /* i/o: dominant sub-vector position from ACV */ int16_t svOrder[], /* i/o: AVQ sub-vector order */ const int16_t Nsv /* i : total sub-vectors in a sub-frames */ ); -#else -void ordr_esti( - const Word16 k, /* i : sub-vector index */ - Word16 *Mpos, /* i/o: dominant sub-vector position from ACV */ - Word16 svOrder[], /* i/o: AVQ sub-vector order */ - const Word16 Nsv /* i : total sub-vectors in a sub-frames */ -); -#endif void re8_cod( int16_t x[], /* i : point in RE8 (8-dimensional integer vector) */ @@ -4648,7 +4556,6 @@ void signaling_enc_rf( Encoder_State *st /* i/o: encoder state structure */ ); -#ifndef IVAS_FLOAT_FIXED ivas_error acelp_core_dec( Decoder_State *st, /* i/o: Decoder state structure */ float output[], /* o : synthesis @internal Fs */ @@ -4672,33 +4579,6 @@ ivas_error acelp_core_dec( STEREO_CNG_DEC_HANDLE hStereoCng, /* i : stereo CNG handle */ const int16_t read_sid_info /* i : read SID info flag */ ); -#endif - -#ifdef IVAS_FLOAT_FIXED -ivas_error acelp_core_dec_ivas_fx( - Decoder_State *st, /* i/o: decoder state structure */ - Word16 output[], /* o : synthesis @internal Fs */ - Word16 synth[], /* o : synthesis */ - Word16 save_hb_synth[], /* o : HB synthesis */ - Word32 bwe_exc_extended[], /* i/o: bandwidth extended excitation */ - Word16 *voice_factors, /* o : voicing factors */ - Word16 old_syn_12k8_16k[], /* o : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE */ - const int16_t sharpFlag, /* i : formant sharpening flag */ - Word16 pitch_buf[NB_SUBFR16k], /* o : floating pitch for each subframe */ - int16_t *unbits, /* o : number of unused bits */ - int16_t *sid_bw, /* o : 0-NB/WB, 1-SWB SID */ - STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */ - const Word16 tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */ - const Word16 tdm_lsfQ_PCh[M], /* i : Q LSFs for primary channel */ - const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ - const int16_t last_element_mode, /* i : last element mode */ - const int32_t last_element_brate, /* i : last element bitrate */ - const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ - const int16_t nchan_out, /* i : number of output channels */ - STEREO_CNG_DEC_HANDLE hStereoCng, /* i : stereo CNG handle */ - const int16_t read_sid_info /* i : read SID info flag */ -); -#endif void bass_psfilter_init( BPF_DEC_HANDLE hBPF /* o : BPF data handle */ @@ -5314,12 +5194,6 @@ ivas_error init_decoder( const MC_MODE mc_mode /* i : MC mode */ ); -#ifdef IVAS_FLOAT_FIXED -void destroy_cldfb_decoder_ivas_fx( - Decoder_State *st /* o : Decoder static variables structure */ -); -#endif // IVAS_FLOAT_FIXED - void destroy_cldfb_decoder_flt( Decoder_State *st /* o : Decoder static variables structure */ ); @@ -5397,17 +5271,6 @@ void wtda( const int16_t L /* i : length */ ); -#ifdef IVAS_FLOAT_FIXED -void wtda_fx32( - const Word32 *new_audio, /* i : input audio Q11 */ - Word32 *wtda_audio, /* o : windowed audio Q11 */ - Word32 *old_wtda, /* i/o: windowed audio from previous frame Q11 */ - const Word16 left_mode, /* i : window overlap of previous frame (0: full, 2: none, or 3: half) */ - const Word16 right_mode, /* i : window overlap of current frame (0: full, 2: none, or 3: half) */ - const Word16 L /* i : length */ -); -#endif - void wtda_ext( const float *new_audio, /* i : input audio */ float *wtda_audio, /* o : windowed audio */ @@ -5465,7 +5328,6 @@ void logqnorm( const int16_t N, /* i : sub-vector size */ const float *thren ); -#ifndef IVAS_FLOAT_FIXED void huff_dec( Decoder_State *st, /* i/o: decoder state structure */ const int16_t N, /* i : Number of codewords to decode */ @@ -5476,7 +5338,6 @@ void huff_dec( const int16_t *huff_tab, /* i : Huffman table order by codeword lengths */ int16_t *index /* o : Decoded index */ ); -#endif void calc_norm( const float *x, /* i : Input vector. */ @@ -5617,38 +5478,30 @@ void hq_hr_dec( ); -#ifndef IVAS_FLOAT_FIXED void hdecnrm_context( Decoder_State *st, /* i/o: decoder state structure */ const int16_t N, /* i : number of norms */ int16_t *index, /* o : indices of quantized norms */ int16_t *n_length /* o : decoded stream length */ ); -#endif -#ifndef IVAS_FLOAT_FIXED void hdecnrm_tran( Decoder_State *st, /* i/o: decoder state structure */ const int16_t N, /* i : number of norms */ int16_t *index /* o : indices of quantized norms */ ); -#endif -#ifndef IVAS_FLOAT_FIXED void hdecnrm_resize( Decoder_State *st, /* i/o: decoder state structure */ const int16_t N, /* i : number of SFMs */ int16_t *index /* o : norm quantization index vector */ ); -#endif -#ifndef IVAS_FLOAT_FIXED void hdecnrm( Decoder_State *st, /* i/o: decoder state structure */ const int16_t N, /* i : number of norms */ int16_t *index /* o : indices of quantized norms */ ); -#endif /*! r: index of last band */ int16_t find_last_band( @@ -6088,18 +5941,6 @@ ivas_error core_switching_post_dec( const int16_t nchan_out, /* i : number of output channels */ const int16_t last_element_mode /* i : element mode of previous frame */ ); -#ifdef IVAS_FLOAT_FIXED -ivas_error core_switching_pre_dec_ivas_fx( - Decoder_State *st, /* i/o: decoder state structure */ - const Word16 output_frame, /* i : frame length */ - const Word32 last_core_brate_st0, /* i : channel 0 last core bitrate */ - const Word16 nchan_out, /* i : number of output channels */ - const Word16 last_element_mode, /* i : last_element_mode */ - const Word32 last_element_brate, /* i : last element bitrate */ - Word16 Q_old_synthFB, - Word16 *Q_olapBufferSynth, - Word16 *Q_olapBufferSynth2 ); -#endif // IVAS_FLOAT_FIXED ivas_error core_switching_pre_dec( Decoder_State *st, /* i/o: decoder state structure */ @@ -6937,14 +6778,6 @@ void hp20_flt( Float32 mem[], const Word32 Fs ); -#ifdef IVAS_FLOAT_FIXED -void hp20_fix32( - Word32 signal_fx[], - const Word16 lg, - Word32 mem_fx[], - const Word32 Fs ); -#endif // IVAS_FLOAT_FIXED - void ham_cos_window_flt( float *fh, const int16_t n1, @@ -6984,21 +6817,6 @@ void enc_acelp_tcx_main( const int16_t vad_hover_flag /* i : VAD hangover flag */ ); -#ifdef IVAS_FLOAT_FIXED -void getTCXMode_ivas_fx( - Decoder_State *st, /* i/o: decoder memory state */ - Decoder_State *st0, /* i : bitstream */ - const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0)*/ -); - -void getTCXWindowing_ivas_fx( - const Word16 core, /* i : current frame mode */ - const Word16 last_core, /* i : last frame mode */ - const Word16 element_mode, /* i : element mode */ - TCX_CONFIG_HANDLE hTcxCfg, /* i/o: TCX configuration handle */ - Decoder_State *st0 /* i : bitstream */ -); -#else void getTCXMode_ivas( Decoder_State *st, /* i/o: decoder memory state */ Decoder_State *st0, /* i : bitstream */ @@ -7012,7 +6830,7 @@ void getTCXWindowing_ivas( TCX_CONFIG_HANDLE hTcxCfg, /* i/o: TCX configuration handle */ Decoder_State *st0 /* i : bitstream */ ); -#endif +//#endif void getLPCparam_ivas( Decoder_State *st, /* i/o: decoder memory state */ @@ -7490,7 +7308,6 @@ void ACcontextMapping_encode2_no_mem_s17_LC( int16_t resQMaxBits, CONTEXT_HM_CONFIG *hm_cfg ); -#ifndef IVAS_FLOAT_FIXED int16_t ACcontextMapping_decode2_no_mem_s17_LC_ivas( Decoder_State *st, /* i/o: decoder state */ int16_t *x, /* o : decoded spectrum */ @@ -7499,7 +7316,6 @@ int16_t ACcontextMapping_decode2_no_mem_s17_LC_ivas( int16_t resQMaxBits, /* i : residual coding maximum bits */ CONTEXT_HM_CONFIG *hm_cfg /* i : context-based harmonic model configuration */ ); -#endif int16_t ACcontextMapping_encode2_estimate_no_mem_s17_LC( const int16_t *x, @@ -7519,7 +7335,6 @@ void RCcontextMapping_encode2_no_mem_s17_LCS( const int16_t resQMaxBits, CONTEXT_HM_CONFIG *hm_cfg ); -#ifndef IVAS_FLOAT_FIXED int16_t RCcontextMapping_decode2_no_mem_s17_LCS( Decoder_State *st, /* i/o: decoder state */ int16_t *x, /* o : decoded spectrum */ @@ -7528,7 +7343,6 @@ int16_t RCcontextMapping_decode2_no_mem_s17_LCS( const int16_t resQMaxBits, /* i : residual coding maximum bits */ CONTEXT_HM_CONFIG *hm_cfg /* i : context-based harmonic model configuration */ ); -#endif int16_t RCcontextMapping_encode2_estimate_no_mem_s17_LCS( int16_t *x, /* Spectral coefficients */ @@ -7879,13 +7693,6 @@ int16_t ari_start_decoding_14bits_prm_ivas( int16_t bp, Tastat *s ); -#ifdef IVAS_FLOAT_FIXED -Word16 ari_start_decoding_14bits_prm_ivas_fx( - const Word16 *ptr, - Word16 bp, - Tastat *s ); -#endif - void ari_decode_14bits_s17_ext_ivas( Decoder_State *st, uint16_t *res, @@ -8925,21 +8732,6 @@ void generate_masking_noise( const int16_t nchan_out /* i : number of output channels */ ); -#ifdef IVAS_FLOAT_FIXED -void generate_masking_noise_ivas_fx( - Word32 *timeDomainBuffer, /* i/o: time-domain signal */ - Word16 *exp_out, /* o : time-domain signal exp */ - HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ - const Word16 length, /* i : frame size */ - const Word16 core, /* i : core */ - const Word16 return_noise, /* i : noise is returned instead of added */ - const Word16 secondary, /* i : flag to indicate secondary noise generation */ - const Word16 element_mode, /* i : element mode */ - STEREO_CNG_DEC_HANDLE hStereoCng, /* i : stereo CNG handle */ - const Word16 nchan_out /* i : number of output channels */ -); -#endif - void generate_masking_noise_update_seed( HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ ); @@ -8957,16 +8749,7 @@ void SynthesisSTFT_dirac_flt( const int16_t samples_out, HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ ); -#ifdef IVAS_FLOAT_FIXED -void SynthesisSTFT_dirac_fx( - Word32 *fftBuffer, /* i : FFT bins */ - Word32 *timeDomainOutput, - Word32 *olapBuffer, - const Word16 *olapWin, - const Word16 samples_out, - HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ -); -#endif + void generate_masking_noise_dirac( HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i : filterbank state */ @@ -8988,19 +8771,6 @@ void generate_stereo_masking_noise( const int16_t nchan_out /* i : number of output channels */ ); -#ifdef IVAS_FLOAT_FIXED -void generate_stereo_masking_noise_fx( - Word16 *syn, /* i/o: time-domain signal */ - Word16 Q_syn, - Decoder_State *st, /* i/o: decoder state structure */ - STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i : TD stereo structure */ - const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ - const int16_t fadeOut, /* i : only fade out of previous state */ - STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ - const int16_t nchan_out /* i : number of output channels */ -); -#endif - void apply_scale_flt( float *scale, /* i : scale factor */ const int16_t bwidth, /* i : audio bandwidth */ @@ -9055,19 +8825,6 @@ void SynthesisSTFT_flt( const int16_t nchan_out /* i : number of output channels */ ); -#ifdef IVAS_FLOAT_FIXED -void SynthesisSTFT_fx( - Word32 *fftBuffer, /* i : FFT bins */ - Word32 *timeDomainOutput, - Word32 *olapBuffer, - const Word16 *olapWin, - const int16_t tcx_transition, - HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ - const int16_t element_mode, /* i : element mode */ - const int16_t nchan_out /* i : number of output channels */ -); -#endif - float rand_gauss_flt( float *x, int16_t *seed ); @@ -9126,12 +8883,6 @@ void FdCng_decodeSID( Decoder_State *st /* i/o: decoder state structure */ ); -#ifdef IVAS_FLOAT_FIXED -void FdCng_decodeSID_ivas_fx( - Decoder_State *st /* i/o: decoder state structure */ -); -#endif - void FdCng_exc_flt( HANDLE_FD_CNG_COM hFdCngCom, int16_t *CNG_mode, @@ -9415,20 +9166,10 @@ void resampleCldfb_ivas( HANDLE_CLDFB_FILTER_BANK hs, /* i/o: filter bank handle */ const int32_t newSamplerate /* i : new samplerate to operate */ ); -#ifdef IVAS_FLOAT_FIXED -ivas_error cldfb_save_memory_ivas_fx( - HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ -); -#endif // IVAS_FLOAT_FIXED ivas_error cldfb_save_memory_ivas( HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ ); -#ifdef IVAS_FLOAT_FIXED -void cldfb_restore_memory_ivas_fx( - HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ -); -#endif // IVAS_FLOAT_FIXED void cldfb_restore_memory_ivas( HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ @@ -9491,7 +9232,6 @@ ivas_error config_acelp1_IVAS( /*! r: ACELP16k flag */ -#ifndef IVAS_FLOAT_FIXED int16_t set_ACELP_flag_IVAS( const int16_t element_mode, /* i : element mode */ const int32_t element_brate, /* i : element bitrate */ @@ -9501,7 +9241,6 @@ int16_t set_ACELP_flag_IVAS( const int16_t bwidth, /* i : audio bandwidth */ const int16_t cng_type /* i : CNG type */ ); -#endif void FEC_clas_estim( const float *syn, @@ -9959,14 +9698,12 @@ int16_t GetPLCModeDecision( Decoder_State *st /* i/o: decoder memory state pointer */ ); -#ifndef IVAS_FLOAT_FIXED void addBassPostFilter( const float *harm_timeIn, const int16_t samplesToProcess, float **rAnalysis, float **iAnalysis, HANDLE_CLDFB_FILTER_BANK cldfb ); -#endif ivas_error TonalMDCTConceal_Init_ivas( TonalMDCTConcealPtr hTonalMDCTConc, @@ -10156,15 +9893,11 @@ int16_t getRestrictedMode( int16_t getMdctWindowLength( const int16_t fscale ); -#ifdef IVAS_FLOAT_FIXED -Word16 sr2fscale( - const Word32 sr_core /* i : internal sampling rate */ -); -#else + int16_t sr2fscale( const int32_t sr_core /* i : internal sampling rate */ ); -#endif + int32_t getCoreSamplerateMode2_flt( const int16_t element_mode, /* i : IVAS element mode */ const int32_t total_brate, /* i : total bitrate */ @@ -10315,7 +10048,6 @@ void IGFDecReadData_flt( const int16_t isIndepFrame /* i : if 1: arith dec force reset, if 0: no reset */ ); -#ifndef IVAS_FLOAT_FIXED /*! r: return igfAllZero flag indicating if no envelope is transmitted */ int16_t IGFDecReadLevel_flt( const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* i/o: instance handle of IGF Deccoder */ @@ -10323,7 +10055,6 @@ int16_t IGFDecReadLevel_flt( const int16_t igfGridIdx, /* i : in case of CELP->TCX switching, use 1.25 framelength */ const int16_t isIndepFrame /* i : if 1: arith dec force reset, if 0: no reset */ ); -#endif void IGFDecRestoreTCX10SubFrameData_flt( const IGF_DEC_INSTANCE_HANDLE hIGFDec, /* o : instance handle of IGF Decoder */ @@ -10427,7 +10158,6 @@ void IGFSCFEncoderRestoreContextState( const int16_t igfGridIdx /* i : igf grid index see declaration of IGF_GRID_IDX for details */ ); -#ifndef IVAS_FLOAT_FIXED void IGFSCFDecoderOpen_ivas( IGFSCFDEC_INSTANCE_HANDLE hPublicData, /* i : handle to public data */ H_IGF_INFO hIgfInfo, /* i : IGF info handle */ @@ -10435,15 +10165,11 @@ void IGFSCFDecoderOpen_ivas( const int16_t bwidth, const int16_t element_mode, const int16_t rf_mode ); -#endif -#ifndef IVAS_FLOAT_FIXED void IGFSCFDecoderReset_ivas( IGFSCFDEC_INSTANCE_HANDLE hPublicData /* i : handle to public data or NULL in case there was no instance created */ ); -#endif -#ifndef IVAS_FLOAT_FIXED void IGFSCFDecoderDecode_ivas( IGFSCFDEC_INSTANCE_HANDLE hPublicData, /* i : handle to public data or NULL in case there was no instance created */ Decoder_State *st, /* i/o: pointer to decoder state */ @@ -10452,7 +10178,6 @@ void IGFSCFDecoderDecode_ivas( const int16_t indepFlag /* i : if 1 on input the decoder will be forced to reset, if 0 on input the decoder will be forced to encode without a reset */ ); -#endif /*! r: offset value */ int16_t tbe_celp_exc_offset_flt( @@ -10499,3 +10224,5 @@ void init_tcx_cfg( const int16_t ini_frame, const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */ ); + +#endif diff --git a/lib_com/prot_fx2.h b/lib_com/prot_fx.h similarity index 92% rename from lib_com/prot_fx2.h rename to lib_com/prot_fx.h index 5ea27f5d8f9c013401f21c11605227975e92ad52..524cf7b736d18fe8f3cc3ab5d50daaf669a149e9 100644 --- a/lib_com/prot_fx2.h +++ b/lib_com/prot_fx.h @@ -50,6 +50,16 @@ #define dynamic_calloc( n1, n2 ) calloc( n1, n2 ) #define dynamic_free( n1 ) free( n1 ) +#define mvr2r_Word32( x, y, n ) Copy32( x, y, n ) +#define mvr2r_Word16( x, y, n ) Copy( x, y, n ) + +#include +#include +#include +#include "options.h" +#include "typedef.h" +#include "cnst.h" +#include "stl.h" #include "ivas_cnst.h" #include "stat_enc.h" #include "stat_dec.h" @@ -60,7 +70,9 @@ #define TCX_IMDCT_SCALE 15 #define TCX_IMDCT_HEADROOM 1 +/*================================================================================*/ /* conversion functions: */ +/*================================================================================*/ // Float to Word32 Word32 float_to_fix( float number, Word32 Q ); @@ -123,6 +135,12 @@ Word16 L_get_q_buf( float *ptr_flt, Word16 length ); Word16 L_get_q_buf1( float *ptr_flt, Word16 length ); #endif +/*================================================================================*/ +/* conversion functions: */ +/*================================================================================*/ + +Word16 norm_ul( UWord32 UL_var1 ); + Word32 Mult_32_16( Word32 a, Word16 b ); @@ -8947,6 +8965,14 @@ void delay_signal_fx( const Word16 delay /* i : delay in samples */ ); +void delay_signal_q_adj_fx( + Word32 x[], /* i/o: signal to be delayed */ + const Word16 len, /* i : length of the input signal */ + Word32 mem[], /* i/o: synchronization memory */ + const Word16 delay, /* i : delay in samples */ + const Word16 q_x, + const Word16 q_mem ); + Word32 anint_fixed( Word32 x, /* i: Round to the nearest integer */ Word16 exp /* i: Exponent for round step */ @@ -9229,7 +9255,6 @@ Word16 deindex_lvq_ivas_fx( Word16 no_bits /* i : number of bits for lattice */ ); -#endif void deleteCldfb_ivas_fx( HANDLE_CLDFB_FILTER_BANK *h_cldfb /* i/o: filter bank handle */ @@ -9312,3 +9337,735 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS( Word16 mode, CONTEXT_HM_CONFIG *hm_cfg /* context-based harmonic model configuration */ ); + +Word16 usdequant_fx( /* Qx*/ + const Word16 idx, /* i: quantizer index Q0*/ + const Word16 qlow, /* i: lowest codebook entry (index 0) Qx*/ + const Word16 delta /* i: quantization step Qy*/ +); + +Word16 usquant_fx( /* o: index of the winning codeword */ + const Word16 x, /* i: scalar value to quantize Qx*/ + Word16 *xq, /* o: quantized value Qx*/ + const Word16 qlow, /* i: lowest codebook entry (index 0) Qx*/ + const Word16 delta, /* i: quantization step Qx-1*/ + const Word16 cbsize /* i: codebook size */ +); + +Word32 Dot_product( /* o : Sum */ + const Word16 x[], /* i : 12bits: x vector */ + const Word16 y[], /* i : 12bits: y vector */ + const Word16 lg /* i : vector length */ +); + +Word32 dotp_fx( /* o : dot product of x[] and y[] */ + const Word16 x[], /* i : vector x[] */ + const Word16 y[], /* i : vector y[] */ + const Word16 n, /* i : vector length */ + Word16 *exp /* (o) : exponent of result (0..+30) */ +); + +Word32 sum2_fx_mod( /* o : sum of all squared vector elements Q(2x+1)*/ + const Word16 *vec, /* i : i vector Qx*/ + const Word16 lvec /* i : length of i vector */ +); + +void Copy_Scale_sig( + const Word16 x[], /* i : signal to scale i Qx */ + Word16 y[], /* o : scaled signal output Qx */ + const Word16 lg, /* i : size of x[] Q0 */ + const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ +); + +void Scale_sig32( + Word32 x[], /* i/o: signal to scale Qx */ + const Word16 lg, /* i : size of x[] Q0 */ + const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ +); + +void Copy_Scale_sig_16_32( + const Word16 x[], /* i : signal to scale i Qx */ + Word32 y[], /* o : scaled signal output Qx */ + const Word16 lg, /* i : size of x[] Q0 */ + const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ +); + +void Copy_Scale_sig_16_32_no_sat( + const Word16 x[], /* i : signal to scale input Qx */ + Word32 y[], /* o : scaled signal output Qx */ + const Word16 lg, /* i : size of x[] Q0 */ + const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ +); + +void Copy_Scale_sig_32_16( + const Word32 x[], /* i : signal to scale i Qx */ + Word16 y[], /* o : scaled signal output Qx */ + const Word16 lg, /* i : size of x[] Q0 */ + const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ +); + +void Random_Fill( + Word16 *seed, /* i/o: random seed */ + Word16 n, /* i : number of values */ + Word16 *y, /* o : output values */ + Word16 scaling /* i : scaling of values */ +); + +Word16 mean_fx( /* o : mean of vector */ + const Word16 *vec_fx, /* i : i vector */ + const Word16 lvec_fx /* i : length of i vector */ +); + +void sort_fx( + Word16 *r, /* i/o: Vector to be sorted in place */ + Word16 lo, /* i : Low limit of sorting range */ + Word16 up /* I : High limit of sorting range */ +); + +void sort_32_fx( + Word32 *r, /* i/o: Vector to be sorted in place */ + const Word16 lo, /* i : Low limit of sorting range */ + const Word16 up /* I : High limit of sorting range */ +); + +Word16 minimum_fx( /* o : index of the minimum value in the input vector */ + const Word16 *vec_fx, /* i : input vector */ + const Word16 lvec_fx, /* i : length of input vector */ + Word16 *min_fx /* o : minimum value in the input vector */ +); + +Word16 maximum_fx( /* o : index of the maximum value in the input vector */ + const Word16 *vec_fx, /* i : input vector */ + const Word16 lvec_fx, /* i : length of input vector */ + Word16 *max_fx /* o : maximum value in the input vector */ +); + +Word16 minimum_abs32_fx( /* o : index of the minimum value in the input vector */ + const Word32 *vec_fx, /* i : input vector */ + const Word16 lvec_fx, /* i : length of input vector */ + Word32 *min_fx /* o : minimum value in the input vector */ +); + +Word16 minimum_32_fx( /* o : index of the minimum value in the input vector */ + const Word32 *vec_fx, /* i : input vector */ + const Word16 lvec_fx, /* i : length of input vector */ + Word32 *min_fx /* o : minimum value in the input vector */ +); + +Word16 maximum_32_fx( /* o : index of the maximum value in the input vector */ + const Word32 *vec, /* i : input vector */ + const Word16 lvec, /* i : length of input vector */ + Word32 *max_val /* o : maximum value in the input vector */ +); + +Word16 maximum_abs_32_fx( /* o : index of the maximum value in the input vector */ + const Word32 *vec, /* i : input vector */ + const Word16 lvec, /* i : length of input vector */ + Word32 *max_val /* o : maximum value in the input vector */ +); + +/*! r: index of the maximum value in the input vector */ +Word16 maximum_s( + const Word16 *vec, /* i : input vector */ + const Word16 lvec, /* i : length of input vector */ + Word16 *max /* o : maximum value in the input vector */ +); + +/*! r: index of the minimum value in the input vector */ +Word16 minimum_s( + const Word16 *vec, /* i : Input vector */ + const Word16 lvec, /* i : Vector length */ + Word16 *min_val /* o : minimum value in the input vector */ +); + +Word16 Exp16Array( + const Word16 n, /* (i): Array size */ + const Word16 *sx /* (i): Data array */ +); + +Word16 Exp32Array( + const Word16 n, /* (i): Array size */ + const Word32 *sx /* (i): Data array */ +); + +Word32 sum16_32_fx( /* o : sum of all vector elements Qx*/ + const Word16 *vec, /* i : input vector Qx*/ + const Word16 lvec /* i : length of input vector */ +); + +Word32 sum32_sat( /* o : sum of all vector elements Qx*/ + const Word32 *vec, /* i : input vector Qx*/ + const Word16 lvec /* i : length of input vector */ +); + +Word32 var_fx_32( /* o: variance of vector Qx+16*/ + const Word16 *x, /* i: input vector Qx*/ + const Word16 Qx, + const Word16 len /* i: length of inputvector */ +); + +Word16 var_fx( /* o: variance of vector Qx*/ + const Word16 *x, /* i: input vector Qx*/ + const Word16 Qx, + const Word16 len /* i: length of inputvector */ +); + +Word16 std_fx( /* o: standard deviation */ + const Word16 x[], /* i: input vector */ + const Word16 len /* i: length of the input vector */ +); + +Word32 dot_product_mat_fx( /* o : the dot product x'*A*x */ + const Word16 *x, /* i : vector x Q15 */ + const Word32 *A, /* i : matrix A Q0*/ + const Word16 m /* i : vector & matrix size */ + +); + +void Vr_subt( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ + Word16 N /* i : Vector lenght */ +); + +Word16 vquant_fx( /* o: index of the winning codevector */ + Word16 x[], /* i: vector to quantize Q13 */ + const Word16 x_mean[], /* i: vector mean to subtract (0 if none)Q13*/ + Word16 xq[], /* o: quantized vector Q13 */ + const Word16 cb[], /* i: codebook Q13 */ + const Word16 dim, /* i: dimension of codebook vectors */ + const Word16 cbsize /* i: codebook size */ +); + +Word16 w_vquant_fx( + Word16 x[], /* i: vector to quantize in Q10 */ + Word16 Qx, + const Word16 weights[], /* i: error weights in Q0 */ + Word16 xq[], /* o: quantized vector in Q15 */ + const Word16 cb[], /* i: codebook in Q15 */ + const Word16 cbsize, /* i: codebook size */ + const Word16 rev_vect /* i: reverse codebook vectors */ +); + +Word16 emaximum_fx( /* o : return index with max energy value in vector Q0 */ + const Word16 Qvec, /* i : Q of input vector Q0 */ + const Word16 *vec, /* i : input vector Qx */ + const Word16 lvec, /* i : length of input vector Q0 */ + Word32 *ener_max /* o : maximum energy value Q0 */ +); + +Word16 emaximum_32fx( /* o : return index with max energy value in vector Q0 */ + const Word16 Qvec, /* i : Q of input vector Q0 */ + const Word32 *vec, /* i : input vector Qx */ + const Word16 lvec, /* i : length of input vector Q0 */ + Word32 *ener_max /* o : maximum energy value Q0 */ +); + +Word32 Mean32( /* o : mean of the elements of the vector */ + const Word32 in[], /* i : input vector */ + const Word16 L /* i : length of input vector */ +); + +Word32 sum32_fx( /* o : sum of all vector elements Qx*/ + const Word32 *vec, /* i : input vector Qx*/ + const Word16 lvec /* i : length of input vector */ +); + +Word16 sum16_fx( /* o : sum of all vector elements Qx*/ + const Word16 *vec, /* i : input vector Qx*/ + const Word16 lvec /* i : length of input vector */ +); + +Word16 own_random2_fx( Word16 seed ); + +void iDiv_and_mod_32( + const Word32 Numer, /* i : 32 bits numerator */ + const Word16 Denom, /* i : 16 bits denominator */ + Word32 *Int_quotient, /* o : integer result of the division (int)(num/den) */ + Word32 *Int_mod, /* o : modulo result of the division num-((int)(num/den)*den)*/ + const Word16 rshift /* i : 0 if no right shift / 1 if the denom is right shifted by 1 */ +); + +void pz_filter_sp_fx( + const Word16 b[], + const Word16 a[], + Word16 x[], + Word16 y[], + Word16 buf[], + Word16 PNR, + Word16 PDR, + Word16 N, + Word16 Qa ); + +Word32 root_a_fx( + Word32 a, + Word16 Q_a, + Word16 *exp_out ); + +Word32 root_a_over_b_fx( + Word32 a, + Word16 Q_a, + Word32 b, + Word16 Q_b, + Word16 *exp_out ); + +void fir_fx( const Word16 x[], /* i : input vector Qx*/ + const Word16 h[], /* i : impulse response of the FIR filter Q12*/ + Word16 y[], /* o : output vector (result of filtering) Qx*/ + Word16 mem[], /* i/o: memory of the input signal (L samples) Qx*/ + const Word16 L, /* i : input vector size */ + const Word16 K, /* i : order of the FIR filter (K+1 coefs.) */ + const Word16 upd /* i : 1 = update the memory, 0 = not */ + , + Word16 shift /* i : difference between Q15 and scaling of h[] */ +); +void v_add_32( + const Word32 x1[], /* i : Input vector 1 */ + const Word32 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */ + const Word16 N /* i : Vector length */ +); + +void v_shr_32( + Word32 x1[], /* i : Input vector 1 */ + Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */ + const Word16 N, /* i : Vector length */ + Word16 shift /*shift value*/ +); + +void v_sub_32( + const Word32 x1[], /* i : Input vector 1 */ + const Word32 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */ + const Word16 N /* i : Vector length */ +); + + +void v_add_16( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word16 y[], /* o : Output vector that contains vector 1 + vector 2 */ + const Word16 N /* i : Vector length */ +); + +void v_sub_16( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ + const Word16 N /* i : Vector length */ +); + + +Word16 squant_fx( /* o: index of the winning codeword */ + const Word16 x, /* i: scalar value to quantize */ + Word16 *xq, /* o: quantized value */ + const Word16 cb[], /* i: codebook */ + const Word16 cbsize /* i: codebook size */ +); + +void pz_filter_dp_fx( + const Word16 b[], + const Word16 a[], + Word16 x[], + Word16 y[], + Word32 buf[], + Word16 PNR, + Word16 PDR, + Word16 N, + Word16 Qa ); + +void Copy_Scale_sig32_16( + const Word32 *src, /* i : signal to scale Qx */ + Word16 *dst, /* o : scaled signal Qx */ + Word16 len, /* i : size of x[] Q0 */ + Word16 exp0 ); /* i : exponent: x = round(x << exp) Qx ?exp */ + +void v_multc_att( + const Word16 x[], /* i : Input vector Qx */ + const Word16 att, /* i : Constant Q15, <= MAX_16 */ + Word16 y[], /* o : Output vector that contains att*x */ + const Word16 N /* i : Vector length */ +); + +void v_multc_att32( + const Word32 x[], /* i : Input vector Qx */ + const Word16 att, /* i : Constant Q15, <= MAX_16 */ + Word32 y[], /* o : Output vector that contains att*x */ + const Word16 N /* i : Vector length */ +); + +void v_multc_att3232( + const Word32 x[], /* i : Input vector Qx */ + const Word32 att, /* i : Constant Q32, <= MAX_32 */ + Word32 y[], /* o : Output vector that contains att*x */ + const Word16 N /* i : Vector length */ +); + +void v_L_mult_1616( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ + const Word16 N /* i : Vector length */ +); + +void v_L_mult_3216( + const Word32 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ + const Word16 N /* i : Vector length */ +); + +void add_vec_fx( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 Qx1, /* i : SCaling of input 1 */ + const Word16 x2[], /* i : Input vector 2 */ + const Word16 Qx2, /* i : SCaling of input 1 */ + Word16 y[], /* o : Output vector that contains vector 1 + vector 2 */ + const Word16 Qy, /* i : SCaling of output 1 */ + const Word16 N /* i : Vector lenght */ +); + +Word32 Add_flt32_flt32( /* o: Result (Normalized) */ + Word32 a, /* i: 1st Value */ + Word16 exp_a, /* i: Exponent of 1st Value (Q of Value) */ + Word32 b, /* i: 2nd Value */ + Word16 exp_b, /* i: Exponent of 2nd Value (Q of Value) */ + Word16 *exp_out /* o: Exponent of Result */ +); + +Word32 Mul_flt32_Q15( /* o: Result (Normalized) */ + Word32 value, /* i: Pseudo_float Value */ + Word16 *exp_v, /*i/o: Exponent of Value (Q of Value) */ + Word16 frac /* i: Q15 value */ +); + +Word32 Div_flt32_flt32( /* o: Result (Normalized) */ + Word32 a, /* i: 1st Value */ + Word16 exp_a, /* i: Exponent of 1st Value (Q of Value) */ + Word32 b, /* i: 2nd Value */ + Word16 exp_b, /* i: Exponent of 2nd Value (Q of Value) */ + Word16 *exp_out /* o: Exponent of Result */ +); + +Word32 Calc_Energy_Autoscaled( /* o: Result (Energy) */ + const Word16 *signal, /* i: Signal */ + Word16 signal_exp, /* i: Exponent of Signal (Q of Signal) */ + Word16 len, /* i: Frame Length */ + Word16 *energy_exp /* o: Exponent of Energy (Q of Energy) */ +); + +Word16 Find_Max_Norm16( const Word16 *src, Word16 len ); + +Word16 Find_Max_Norm32( const Word32 *src, Word16 len ); + +Word32 Sqrt_Ratio32( /* o: Result in Q31 */ + Word32 L_val1, /* i: Mantisa of Val1 */ + Word16 exp1, /* i: Exp of Val1 (>0: Val was Left Shifted, <0:Right Shifted) */ + Word32 L_val2, /* i: Mantisa of Val2 */ + Word16 exp2, /* i: Exp of Val2 (same as exp1) */ + Word16 *exp /* o: Exp of Result (# of 'L_shl' Req to get to Final Value) */ +); + +Word16 Invert16( /* result in Q'15 + 'exp' */ + Word16 val, + Word16 *exp ); + +Word16 find_rem( Word16 n, Word16 m, Word16 *r ); + +Word32 find_remd( Word32 n, Word32 m, Word32 *r ); + +Word16 rint_new_fx( + Word32 x /*Q16 */ +); + +Word16 erb_diff_search_fx( Word16 *prev_erb, const Word16 *curr_erb, Word16 *dif_erb, Word16 *pow_spec, const Word16 *cb_fx, Word16 cb_size, Word16 cb_dim, Word16 offset ); + +void Acelp_dec_total_exc( + Word16 *exc_fx, /* i/o: adapt. excitation exc */ + Word16 *exc2_fx, /* i/o: adapt. excitation/total exc */ + const Word16 gain_code16, /* i : Gain code Q0 */ + const Word16 gain_pit_fx, /* i ; Pitch gain in Q14 */ + const Word16 i_subfr, /* i ; subfr */ + const Word16 *code_fx, /* i : code in Q9 */ + const Word16 L_subfr /* i : Subframne lenght */ +); + +UWord32 UL_inverse( const UWord32 UL_val, Word16 *exp ); + +UWord32 UL_div( const UWord32 UL_num, const UWord32 UL_den ); + +Word16 ratio( const Word32 numer, const Word32 denom, Word16 *expo ); + +void hp400_12k8_fx( + Word16 signal[], /* i/o: input signal / output is divided by 16 */ + const Word16 lg, /* i : lenght of signal */ + Word16 mem[] /* i/o: filter memory [6] */ +); + +Word16 dot_prod_satcontr( const Word16 *x, const Word16 *y, Word16 qx, Word16 qy, Word16 *qo, Word16 len ); + +void E_UTIL_f_convolve( const Word16 x[], const Word16 h[], Word16 y[], const Word16 size ); + +void floating_point_add( + Word32 *mx, /* io: mantissa of the addend Q31 */ + Word16 *ex, /* io: exponent of the addend Q0 */ + const Word32 my, /* i: mantissa of the adder Q31 */ + const Word16 ey /* i: exponent of the adder Q0 */ +); +/*delay_signal_fx is also present*/ +void delay_signal( + Word16 x[], /* i/o: signal to be delayed */ + const Word16 len, /* i : length of the input signal */ + Word16 mem[], /* i/o: synchronization memory */ + const Word16 delay /* i : delay in samples */ +); + +void delay_signal32( + Word32 x[], /* i/o: signal to be delayed */ + const Word16 len, /* i : length of the input signal */ + Word32 mem[], /* i/o: synchronization memory */ + const Word16 delay /* i : delay in samples */ +); + +Word16 lin_interp_fx( + const Word16 x, /* i : the value to be mapped */ + const Word16 x1, /* i : source range interval: low end */ + const Word16 y1, /* i : source range interval: high end */ + const Word16 x2, /* i : target range interval: low */ + const Word16 y2, /* i : target range interval: high */ + const Word16 flag_sat /* i : flag to indicate whether to apply saturation */ +); + +Word16 ceil_log_2( UWord64 val ); + +Word32 imax_pos_fx( + const Word32 *y /* i : Input vector for peak interpolation */ +); + +void msvq_dec_fx( + const Word16 *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ + const Word16 dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ + const Word16 offs[], /* i : Starting dimension of each codebook stage (NULL: 0) */ + const Word16 stages, /* i : Number of stages */ + const Word16 N, /* i : Vector dimension */ + const Word16 maxN, /* i : Codebook dimension */ + const Word16 Idx[], /* i : Indices */ + const Word16 applyIDCT_flag, /* i : applyIDCT flag */ + const Word32 *invTrfMatrix, /* i : synthesis matrix */ + Word32 *uq, /* o : quantized vector */ + Word16 *uq_ind, /* o : quantized vector (fixed point) */ + Word16 exp ); + +void dec_FDCNG_MSVQ_stage1_fx( + Word16 j_full, /* i : index full range */ + Word16 n, /* i : dimension to generate */ + const Word32 *invTrfMatrix, /* i : IDCT matrix for synthesis */ + const DCTTYPE idcttype, /* i : specify which IDCT */ + Word32 *uq, /* o : synthesized stage1 vector */ + Word16 *uq_ind /* o : synthesized stage1 vector in BASOP */ +); + +void dctT2_N_apply_matrix_fx( + const Word32 *input, /* i : input in fdcng or DCT(fdcng) domain */ + Word32 *output, /* o : output in DCT(fdcng) or fdcng ordomain */ + const Word16 dct_dim, /* i : dct processing dim possibly truncated */ + const Word16 fdcngvq_dim, /* i : fdcng domain length */ + const Word32 *matrix, /* i : IDCT matrix */ + const Word16 matrix_row_dim, /* i : */ + const DCTTYPE dcttype /* i : matrix operation type */ +); + +Word32 sum2_f_32_fx( + const Word32 *vec, /* i : input vector */ + const int16_t lvec, /* i : length of input vector */ + Word16 gb ); + +Word32 sum2_32_fx( + const Word32 *vec, /* i : input vector */ + const Word16 lvec, /* i : length of input vector */ + Word16 *e ); + +void v_mult_fixed( + const Word32 x1[], /* i : Input vector 1 */ + const Word32 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ + const Word16 N /* i : Vector length */ +); + +void v_sub_s16_fx( + const Word16 x1[], /* i : Input vector 1 */ + const Word16 x2[], /* i : Input vector 2 */ + Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ + const Word16 N /* i : Vector length */ +); + +void v_sub32_fx( + const Word32 x1[], /* i : Input vector 1 */ + const Word32 x2[], /* i : Input vector 2 */ + Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */ + const Word16 N /* i : Vector length */ +); + +void ivas_swb_tbe_dec_fx( + Decoder_State *st, /* i/o: decoder state structure */ + STEREO_ICBWE_DEC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */ + const Word32 *bwe_exc_extended_fx, /* i : bandwidth extended excitation */ + Word16 Q_exc, + const Word16 voice_factors_fx[], /* i : voicing factors */ + const Word32 old_syn_12k8_16k_fx[], /* i : low band synthesis */ + Word16 *White_exc16k_fx, /* o : shaped white excitation for the FB TBE */ + Word32 *synth_fx, /* o : SHB synthesis/final synthesis */ + Word16 *pitch_buf_fx, + Word16 *Q_white_exc ); + +Word16 swb_bwe_dec_fx32( + Decoder_State *st, /* i/o: decoder state structure */ + Word32 output[], /* i : synthesis @internal Fs Q11 */ + Word32 *synth, /* i : ACELP core synthesis/final synthesis Q11 */ + Word32 *hb_synth, /* o : SHB synthesis/final synthesis */ + Word16 use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ + Word16 output_frame /* i : frame length */ +); + +ivas_error acelp_core_dec_ivas_fx( + Decoder_State *st, /* i/o: decoder state structure */ + Word16 output[], /* o : synthesis @internal Fs */ + Word16 synth[], /* o : synthesis */ + Word16 save_hb_synth[], /* o : HB synthesis */ + Word32 bwe_exc_extended[], /* i/o: bandwidth extended excitation */ + Word16 *voice_factors, /* o : voicing factors */ + Word16 old_syn_12k8_16k[], /* o : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE */ + const int16_t sharpFlag, /* i : formant sharpening flag */ + Word16 pitch_buf[NB_SUBFR16k], /* o : floating pitch for each subframe */ + int16_t *unbits, /* o : number of unused bits */ + int16_t *sid_bw, /* o : 0-NB/WB, 1-SWB SID */ + STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */ + const Word16 tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */ + const Word16 tdm_lsfQ_PCh[M], /* i : Q LSFs for primary channel */ + const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ + const int16_t last_element_mode, /* i : last element mode */ + const int32_t last_element_brate, /* i : last element bitrate */ + const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ + const int16_t nchan_out, /* i : number of output channels */ + STEREO_CNG_DEC_HANDLE hStereoCng, /* i : stereo CNG handle */ + const int16_t read_sid_info /* i : read SID info flag */ +); + +void destroy_cldfb_decoder_ivas_fx( + Decoder_State *st /* o : Decoder static variables structure */ +); + +void wtda_fx32( + const Word32 *new_audio, /* i : input audio Q11 */ + Word32 *wtda_audio, /* o : windowed audio Q11 */ + Word32 *old_wtda, /* i/o: windowed audio from previous frame Q11 */ + const Word16 left_mode, /* i : window overlap of previous frame (0: full, 2: none, or 3: half) */ + const Word16 right_mode, /* i : window overlap of current frame (0: full, 2: none, or 3: half) */ + const Word16 L /* i : length */ +); + +ivas_error core_switching_pre_dec_ivas_fx( + Decoder_State *st, /* i/o: decoder state structure */ + const Word16 output_frame, /* i : frame length */ + const Word32 last_core_brate_st0, /* i : channel 0 last core bitrate */ + const Word16 nchan_out, /* i : number of output channels */ + const Word16 last_element_mode, /* i : last_element_mode */ + const Word32 last_element_brate, /* i : last element bitrate */ + Word16 Q_old_synthFB, + Word16 *Q_olapBufferSynth, + Word16 *Q_olapBufferSynth2 ); + +void hp20_fix32( + Word32 signal_fx[], + const Word16 lg, + Word32 mem_fx[], + const Word32 Fs ); + +void getTCXMode_ivas_fx( + Decoder_State *st, /* i/o: decoder memory state */ + Decoder_State *st0, /* i : bitstream */ + const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0)*/ +); + +void getTCXWindowing_ivas_fx( + const Word16 core, /* i : current frame mode */ + const Word16 last_core, /* i : last frame mode */ + const Word16 element_mode, /* i : element mode */ + TCX_CONFIG_HANDLE hTcxCfg, /* i/o: TCX configuration handle */ + Decoder_State *st0 /* i : bitstream */ +); + +Word16 ari_start_decoding_14bits_prm_ivas_fx( + const Word16 *ptr, + Word16 bp, + Tastat *s ); + +void generate_masking_noise_ivas_fx( + Word32 *timeDomainBuffer, /* i/o: time-domain signal */ + Word16 *exp_out, /* o : time-domain signal exp */ + HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ + const Word16 length, /* i : frame size */ + const Word16 core, /* i : core */ + const Word16 return_noise, /* i : noise is returned instead of added */ + const Word16 secondary, /* i : flag to indicate secondary noise generation */ + const Word16 element_mode, /* i : element mode */ + STEREO_CNG_DEC_HANDLE hStereoCng, /* i : stereo CNG handle */ + const Word16 nchan_out /* i : number of output channels */ +); + +void SynthesisSTFT_dirac_fx( + Word32 *fftBuffer, /* i : FFT bins */ + Word32 *timeDomainOutput, + Word32 *olapBuffer, + const Word16 *olapWin, + const Word16 samples_out, + HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ +); + +void generate_stereo_masking_noise_fx( + Word16 *syn, /* i/o: time-domain signal */ + Word16 Q_syn, + Decoder_State *st, /* i/o: decoder state structure */ + STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i : TD stereo structure */ + const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ + const int16_t fadeOut, /* i : only fade out of previous state */ + STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ + const int16_t nchan_out /* i : number of output channels */ +); + +void SynthesisSTFT_fx( + Word32 *fftBuffer, /* i : FFT bins */ + Word32 *timeDomainOutput, + Word32 *olapBuffer, + const Word16 *olapWin, + const int16_t tcx_transition, + HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ + const int16_t element_mode, /* i : element mode */ + const int16_t nchan_out /* i : number of output channels */ +); + +void FdCng_decodeSID_ivas_fx( + Decoder_State *st /* i/o: decoder state structure */ +); + +void cldfb_restore_memory_ivas_fx( + HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ +); + +ivas_error cldfb_save_memory_ivas_fx( + HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ +); + +void ordr_esti( + const Word16 k, /* i : sub-vector index */ + Word16 *Mpos, /* i/o: dominant sub-vector position from ACV */ + Word16 svOrder[], /* i/o: AVQ sub-vector order */ + const Word16 Nsv /* i : total sub-vectors in a sub-frames */ +); + +Word16 sr2fscale( + const Word32 sr_core /* i : internal sampling rate */ +); + +#endif diff --git a/lib_com/prot_fx1.h b/lib_com/prot_fx1.h deleted file mode 100644 index b7867429bd5dad5d05cd8bd38c62ab25b5b6cfc2..0000000000000000000000000000000000000000 --- a/lib_com/prot_fx1.h +++ /dev/null @@ -1,636 +0,0 @@ -/****************************************************************************************************** - - (C) 2022-2024 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 - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of 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 - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#ifndef PROT_FX1_H -#define PROT_FX1_H - -#include -#include -#include -#include "options.h" -#include "typedef.h" -#include "cnst.h" -#include "stl.h" -#define mvr2r_Word32( x, y, n ) Copy32( x, y, n ) -#define mvr2r_Word16( x, y, n ) Copy( x, y, n ) - -int16_t norm_ul( uint32_t UL_var1 ); -Word16 usdequant_fx( /* Qx*/ - const Word16 idx, /* i: quantizer index Q0*/ - const Word16 qlow, /* i: lowest codebook entry (index 0) Qx*/ - const Word16 delta /* i: quantization step Qy*/ -); - -Word16 usquant_fx( /* o: index of the winning codeword */ - const Word16 x, /* i: scalar value to quantize Qx*/ - Word16 *xq, /* o: quantized value Qx*/ - const Word16 qlow, /* i: lowest codebook entry (index 0) Qx*/ - const Word16 delta, /* i: quantization step Qx-1*/ - const Word16 cbsize /* i: codebook size */ -); - -Word32 Dot_product( /* o : Sum */ - const Word16 x[], /* i : 12bits: x vector */ - const Word16 y[], /* i : 12bits: y vector */ - const Word16 lg /* i : vector length */ -); - -Word32 dotp_fx( /* o : dot product of x[] and y[] */ - const Word16 x[], /* i : vector x[] */ - const Word16 y[], /* i : vector y[] */ - const Word16 n, /* i : vector length */ - Word16 *exp /* (o) : exponent of result (0..+30) */ -); - -Word32 sum2_fx( /* o : sum of all squared vector elements Q(2x+1)*/ - const Word16 *vec, /* i : i vector Qx*/ - const Word16 lvec /* i : length of i vector */ -); - -Word32 sum2_fx_mod( /* o : sum of all squared vector elements Q(2x+1)*/ - const Word16 *vec, /* i : i vector Qx*/ - const Word16 lvec /* i : length of i vector */ -); - -void Copy( - const Word16 x[], /* i : i vector */ - Word16 y[], /* o : output vector */ - const Word16 L /* i : vector length */ -); - -void Copy32( - const Word32 x[], /* i : i vector */ - Word32 y[], /* o : output vector */ - const Word16 L /* i : vector length */ -); - -void set8_fx( - Word8 y[], /* i/o: Vector to set */ - const Word8 a, /* i : Value to set the vector to */ - const Word16 N /* i : Lenght of the vector */ -); - -void set16_fx( - Word16 y[], /* i/o: Vector to set */ - const Word16 a, /* i : Value to set the vector to */ - const Word16 N /* i : Lenght of the vector */ -); - -void set32_fx( - Word32 y[], /* i/o: Vector to set */ - const Word32 a, /* i : Value to set the vector to */ - const Word16 N /* i : Lenght of the vector */ -); - -void Copy_Scale_sig( - const Word16 x[], /* i : signal to scale i Qx */ - Word16 y[], /* o : scaled signal output Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -void Copy_Scale_sig_16_32( - const Word16 x[], /* i : signal to scale i Qx */ - Word32 y[], /* o : scaled signal output Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -void Copy_Scale_sig_16_32_no_sat( - const Word16 x[], /* i : signal to scale input Qx */ - Word32 y[], /* o : scaled signal output Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -void Copy_Scale_sig_32_16( - const Word32 x[], /* i : signal to scale i Qx */ - Word16 y[], /* o : scaled signal output Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -void Scale_sig32( - Word32 x[], /* i/o: signal to scale Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -void Random_Fill( - Word16 *seed, /* i/o: random seed */ - Word16 n, /* i : number of values */ - Word16 *y, /* o : output values */ - Word16 scaling /* i : scaling of values */ -); - -void Scale_sig( - Word16 x[], /* i/o: signal to scale Qx */ - const Word16 lg, /* i : size of x[] Q0 */ - const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */ -); - -Word16 mean_fx( /* o : mean of vector */ - const Word16 *vec_fx, /* i : i vector */ - const Word16 lvec_fx /* i : length of i vector */ -); - -void Vr_add( - const Word16 *in1, /* i : Input vector 1 */ - const Word16 *in2, /* i : Input vector 2 */ - Word16 *out, /* o : Output vector that contains vector 1 + vector 2 */ - Word16 Len /* i : Vector lenght */ -); -void sort_fx( - Word16 *r, /* i/o: Vector to be sorted in place */ - Word16 lo, /* i : Low limit of sorting range */ - Word16 up /* I : High limit of sorting range */ -); -void sort_32_fx( - Word32 *r, /* i/o: Vector to be sorted in place */ - const Word16 lo, /* i : Low limit of sorting range */ - const Word16 up /* I : High limit of sorting range */ -); -Word16 minimum_fx( /* o : index of the minimum value in the input vector */ - const Word16 *vec_fx, /* i : input vector */ - const Word16 lvec_fx, /* i : length of input vector */ - Word16 *min_fx /* o : minimum value in the input vector */ -); -Word16 maximum_fx( /* o : index of the maximum value in the input vector */ - const Word16 *vec_fx, /* i : input vector */ - const Word16 lvec_fx, /* i : length of input vector */ - Word16 *max_fx /* o : maximum value in the input vector */ -); -Word16 minimum_abs32_fx( /* o : index of the minimum value in the input vector */ - const Word32 *vec_fx, /* i : input vector */ - const Word16 lvec_fx, /* i : length of input vector */ - Word32 *min_fx /* o : minimum value in the input vector */ -); -Word16 minimum_32_fx( /* o : index of the minimum value in the input vector */ - const Word32 *vec_fx, /* i : input vector */ - const Word16 lvec_fx, /* i : length of input vector */ - Word32 *min_fx /* o : minimum value in the input vector */ -); -Word16 maximum_32_fx( /* o : index of the maximum value in the input vector */ - const Word32 *vec, /* i : input vector */ - const Word16 lvec, /* i : length of input vector */ - Word32 *max_val /* o : maximum value in the input vector */ -); -Word16 maximum_abs_32_fx( /* o : index of the maximum value in the input vector */ - const Word32 *vec, /* i : input vector */ - const Word16 lvec, /* i : length of input vector */ - Word32 *max_val /* o : maximum value in the input vector */ -); -#ifdef IVAS_FLOAT_FIXED -/*! r: index of the maximum value in the input vector */ -Word16 maximum_s( - const Word16 *vec, /* i : input vector */ - const Word16 lvec, /* i : length of input vector */ - Word16 *max /* o : maximum value in the input vector */ -); - -/*! r: index of the minimum value in the input vector */ -Word16 minimum_s( - const Word16 *vec, /* i : Input vector */ - const Word16 lvec, /* i : Vector length */ - Word16 *min_val /* o : minimum value in the input vector */ -); -#endif -Word16 Exp16Array( - const Word16 n, /* (i): Array size */ - const Word16 *sx /* (i): Data array */ -); -Word16 Exp32Array( - const Word16 n, /* (i): Array size */ - const Word32 *sx /* (i): Data array */ -); -Word32 sum16_32_fx( /* o : sum of all vector elements Qx*/ - const Word16 *vec, /* i : input vector Qx*/ - const Word16 lvec /* i : length of input vector */ -); -Word32 sum32_sat( /* o : sum of all vector elements Qx*/ - const Word32 *vec, /* i : input vector Qx*/ - const Word16 lvec /* i : length of input vector */ -); -Word32 var_fx_32( /* o: variance of vector Qx+16*/ - const Word16 *x, /* i: input vector Qx*/ - const Word16 Qx, - const Word16 len /* i: length of inputvector */ -); -Word16 var_fx( /* o: variance of vector Qx*/ - const Word16 *x, /* i: input vector Qx*/ - const Word16 Qx, - const Word16 len /* i: length of inputvector */ -); -Word16 std_fx( /* o: standard deviation */ - const Word16 x[], /* i: input vector */ - const Word16 len /* i: length of the input vector */ -); -Word32 dot_product_mat_fx( /* o : the dot product x'*A*x */ - const Word16 *x, /* i : vector x Q15 */ - const Word32 *A, /* i : matrix A Q0*/ - const Word16 m /* i : vector & matrix size */ - -); -void Vr_subt( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ - Word16 N /* i : Vector lenght */ -); -Word16 vquant_fx( /* o: index of the winning codevector */ - Word16 x[], /* i: vector to quantize Q13 */ - const Word16 x_mean[], /* i: vector mean to subtract (0 if none)Q13*/ - Word16 xq[], /* o: quantized vector Q13 */ - const Word16 cb[], /* i: codebook Q13 */ - const Word16 dim, /* i: dimension of codebook vectors */ - const Word16 cbsize /* i: codebook size */ -); -Word16 w_vquant_fx( - Word16 x[], /* i: vector to quantize in Q10 */ - Word16 Qx, - const Word16 weights[], /* i: error weights in Q0 */ - Word16 xq[], /* o: quantized vector in Q15 */ - const Word16 cb[], /* i: codebook in Q15 */ - const Word16 cbsize, /* i: codebook size */ - const Word16 rev_vect /* i: reverse codebook vectors */ -); -Word16 emaximum_fx( /* o : return index with max energy value in vector Q0 */ - const Word16 Qvec, /* i : Q of input vector Q0 */ - const Word16 *vec, /* i : input vector Qx */ - const Word16 lvec, /* i : length of input vector Q0 */ - Word32 *ener_max /* o : maximum energy value Q0 */ -); -Word16 emaximum_32fx( /* o : return index with max energy value in vector Q0 */ - const Word16 Qvec, /* i : Q of input vector Q0 */ - const Word32 *vec, /* i : input vector Qx */ - const Word16 lvec, /* i : length of input vector Q0 */ - Word32 *ener_max /* o : maximum energy value Q0 */ -); -Word32 Mean32( /* o : mean of the elements of the vector */ - const Word32 in[], /* i : input vector */ - const Word16 L /* i : length of input vector */ -); -Word32 sum32_fx( /* o : sum of all vector elements Qx*/ - const Word32 *vec, /* i : input vector Qx*/ - const Word16 lvec /* i : length of input vector */ -); -Word16 sum16_fx( /* o : sum of all vector elements Qx*/ - const Word16 *vec, /* i : input vector Qx*/ - const Word16 lvec /* i : length of input vector */ -); -Word16 Random( /* o : output random value */ - Word16 *seed /* i/o: random seed */ -); -Word16 own_random2_fx( Word16 seed ); -void iDiv_and_mod_32( - const Word32 Numer, /* i : 32 bits numerator */ - const Word16 Denom, /* i : 16 bits denominator */ - Word32 *Int_quotient, /* o : integer result of the division (int)(num/den) */ - Word32 *Int_mod, /* o : modulo result of the division num-((int)(num/den)*den)*/ - const Word16 rshift /* i : 0 if no right shift / 1 if the denom is right shifted by 1 */ -); -void pz_filter_sp_fx( - const Word16 b[], - const Word16 a[], - Word16 x[], - Word16 y[], - Word16 buf[], - Word16 PNR, - Word16 PDR, - Word16 N, - Word16 Qa ); -Word32 root_a_fx( - Word32 a, - Word16 Q_a, - Word16 *exp_out ); -Word32 root_a_over_b_fx( - Word32 a, - Word16 Q_a, - Word32 b, - Word16 Q_b, - Word16 *exp_out ); -void fir_fx( const Word16 x[], /* i : input vector Qx*/ - const Word16 h[], /* i : impulse response of the FIR filter Q12*/ - Word16 y[], /* o : output vector (result of filtering) Qx*/ - Word16 mem[], /* i/o: memory of the input signal (L samples) Qx*/ - const Word16 L, /* i : input vector size */ - const Word16 K, /* i : order of the FIR filter (K+1 coefs.) */ - const Word16 upd /* i : 1 = update the memory, 0 = not */ - , - Word16 shift /* i : difference between Q15 and scaling of h[] */ -); - -void fir_fx( const Word16 x[], /* i : input vector Qx*/ - const Word16 h[], /* i : impulse response of the FIR filter Q12*/ - Word16 y[], /* o : output vector (result of filtering) Qx*/ - Word16 mem[], /* i/o: memory of the input signal (L samples) Qx*/ - const Word16 L, /* i : input vector size */ - const Word16 K, /* i : order of the FIR filter (K+1 coefs.) */ - const Word16 upd /* i : 1 = update the memory, 0 = not */ - , - Word16 shift /* i : difference between Q15 and scaling of h[] */ -); - -void v_add_32( - const Word32 x1[], /* i : Input vector 1 */ - const Word32 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */ - const Word16 N /* i : Vector length */ -); - -void v_shr_32( - Word32 x1[], /* i : Input vector 1 */ - Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */ - const Word16 N, /* i : Vector length */ - Word16 shift /*shift value*/ -); - -void v_sub_32( - const Word32 x1[], /* i : Input vector 1 */ - const Word32 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */ - const Word16 N /* i : Vector length */ -); - - -void v_add_16( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word16 y[], /* o : Output vector that contains vector 1 + vector 2 */ - const Word16 N /* i : Vector length */ -); - -void v_sub_16( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word16 y[], /* o : Output vector that contains vector 1 - vector 2 */ - const Word16 N /* i : Vector length */ -); - - -Word16 squant_fx( /* o: index of the winning codeword */ - const Word16 x, /* i: scalar value to quantize */ - Word16 *xq, /* o: quantized value */ - const Word16 cb[], /* i: codebook */ - const Word16 cbsize /* i: codebook size */ -); -void pz_filter_dp_fx( - const Word16 b[], - const Word16 a[], - Word16 x[], - Word16 y[], - Word32 buf[], - Word16 PNR, - Word16 PDR, - Word16 N, - Word16 Qa ); -void Copy_Scale_sig32_16( - const Word32 *src, /* i : signal to scale Qx */ - Word16 *dst, /* o : scaled signal Qx */ - Word16 len, /* i : size of x[] Q0 */ - Word16 exp0 ); /* i : exponent: x = round(x << exp) Qx ?exp */ - -void v_multc_att( - const Word16 x[], /* i : Input vector Qx */ - const Word16 att, /* i : Constant Q15, <= MAX_16 */ - Word16 y[], /* o : Output vector that contains att*x */ - const Word16 N /* i : Vector length */ -); -void v_multc_att32( - const Word32 x[], /* i : Input vector Qx */ - const Word16 att, /* i : Constant Q15, <= MAX_16 */ - Word32 y[], /* o : Output vector that contains att*x */ - const Word16 N /* i : Vector length */ -); -void v_multc_att3232( - const Word32 x[], /* i : Input vector Qx */ - const Word32 att, /* i : Constant Q32, <= MAX_32 */ - Word32 y[], /* o : Output vector that contains att*x */ - const Word16 N /* i : Vector length */ -); -void v_L_mult_1616( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ - const Word16 N /* i : Vector length */ -); -void v_L_mult_3216( - const Word32 x1[], /* i : Input vector 1 */ - const Word16 x2[], /* i : Input vector 2 */ - Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */ - const Word16 N /* i : Vector length */ -); -void add_vec_fx( - const Word16 x1[], /* i : Input vector 1 */ - const Word16 Qx1, /* i : SCaling of input 1 */ - const Word16 x2[], /* i : Input vector 2 */ - const Word16 Qx2, /* i : SCaling of input 1 */ - Word16 y[], /* o : Output vector that contains vector 1 + vector 2 */ - const Word16 Qy, /* i : SCaling of output 1 */ - const Word16 N /* i : Vector lenght */ -); -Word32 Add_flt32_flt32( /* o: Result (Normalized) */ - Word32 a, /* i: 1st Value */ - Word16 exp_a, /* i: Exponent of 1st Value (Q of Value) */ - Word32 b, /* i: 2nd Value */ - Word16 exp_b, /* i: Exponent of 2nd Value (Q of Value) */ - Word16 *exp_out /* o: Exponent of Result */ -); -Word32 Mul_flt32_Q15( /* o: Result (Normalized) */ - Word32 value, /* i: Pseudo_float Value */ - Word16 *exp_v, /*i/o: Exponent of Value (Q of Value) */ - Word16 frac /* i: Q15 value */ -); -Word32 Div_flt32_flt32( /* o: Result (Normalized) */ - Word32 a, /* i: 1st Value */ - Word16 exp_a, /* i: Exponent of 1st Value (Q of Value) */ - Word32 b, /* i: 2nd Value */ - Word16 exp_b, /* i: Exponent of 2nd Value (Q of Value) */ - Word16 *exp_out /* o: Exponent of Result */ -); -Word32 Calc_Energy_Autoscaled( /* o: Result (Energy) */ - const Word16 *signal, /* i: Signal */ - Word16 signal_exp, /* i: Exponent of Signal (Q of Signal) */ - Word16 len, /* i: Frame Length */ - Word16 *energy_exp /* o: Exponent of Energy (Q of Energy) */ -); -Word16 Find_Max_Norm16( const Word16 *src, Word16 len ); - -Word16 Find_Max_Norm32( const Word32 *src, Word16 len ); - -Word32 Sqrt_Ratio32( /* o: Result in Q31 */ - Word32 L_val1, /* i: Mantisa of Val1 */ - Word16 exp1, /* i: Exp of Val1 (>0: Val was Left Shifted, <0:Right Shifted) */ - Word32 L_val2, /* i: Mantisa of Val2 */ - Word16 exp2, /* i: Exp of Val2 (same as exp1) */ - Word16 *exp /* o: Exp of Result (# of 'L_shl' Req to get to Final Value) */ -); - -Word16 Invert16( /* result in Q'15 + 'exp' */ - Word16 val, - Word16 *exp ); - -Word16 find_rem( Word16 n, Word16 m, Word16 *r ); -Word32 find_remd( Word32 n, Word32 m, Word32 *r ); - -Word16 rint_new_fx( - Word32 x /*Q16 */ -); - -Word16 erb_diff_search_fx( Word16 *prev_erb, const Word16 *curr_erb, Word16 *dif_erb, Word16 *pow_spec, const Word16 *cb_fx, Word16 cb_size, Word16 cb_dim, Word16 offset ); - -void Acelp_dec_total_exc( - Word16 *exc_fx, /* i/o: adapt. excitation exc */ - Word16 *exc2_fx, /* i/o: adapt. excitation/total exc */ - const Word16 gain_code16, /* i : Gain code Q0 */ - const Word16 gain_pit_fx, /* i ; Pitch gain in Q14 */ - const Word16 i_subfr, /* i ; subfr */ - const Word16 *code_fx, /* i : code in Q9 */ - const Word16 L_subfr /* i : Subframne lenght */ -); - -UWord32 UL_inverse( const UWord32 UL_val, Word16 *exp ); - -UWord32 UL_div( const UWord32 UL_num, const UWord32 UL_den ); - -Word16 ratio( const Word32 numer, const Word32 denom, Word16 *expo ); - -void hp400_12k8_fx( - Word16 signal[], /* i/o: input signal / output is divided by 16 */ - const Word16 lg, /* i : lenght of signal */ - Word16 mem[] /* i/o: filter memory [6] */ -); - -#if 0 -void hp400_12k8_ivas_fx( - Word16 signal[], /* i/o: input signal / output is divided by 16 */ - const Word16 lg, /* i : lenght of signal */ - Word16 mem[] /* i/o: filter memory [6] */ -); -#endif -Word16 dot_prod_satcontr( const Word16 *x, const Word16 *y, Word16 qx, Word16 qy, Word16 *qo, Word16 len ); - -void E_UTIL_f_convolve( const Word16 x[], const Word16 h[], Word16 y[], const Word16 size ); - -void floating_point_add( - Word32 *mx, /* io: mantissa of the addend Q31 */ - Word16 *ex, /* io: exponent of the addend Q0 */ - const Word32 my, /* i: mantissa of the adder Q31 */ - const Word16 ey /* i: exponent of the adder Q0 */ -); - - -#ifdef IVAS_FLOAT_FIXED -void fft_fx( - Word32 *re, /* i/o: real part */ - Word32 *im, /* i/o: imag part */ - const Word16 length, /* i : length of fft */ - const Word16 s /* i : sign */ -); - -#endif -void delay_signal( - Word16 x[], /* i/o: signal to be delayed */ - const Word16 len, /* i : length of the input signal */ - Word16 mem[], /* i/o: synchronization memory */ - const Word16 delay /* i : delay in samples */ -); - -void delay_signal32( - Word32 x[], /* i/o: signal to be delayed */ - const Word16 len, /* i : length of the input signal */ - Word32 mem[], /* i/o: synchronization memory */ - const Word16 delay /* i : delay in samples */ -); - -Word16 lin_interp_fx( - const Word16 x, /* i : the value to be mapped */ - const Word16 x1, /* i : source range interval: low end */ - const Word16 y1, /* i : source range interval: high end */ - const Word16 x2, /* i : target range interval: low */ - const Word16 y2, /* i : target range interval: high */ - const Word16 flag_sat /* i : flag to indicate whether to apply saturation */ -); - -Word16 ceil_log_2( UWord64 val ); - -Word32 imax_pos_fx( - const Word32 *y /* i : Input vector for peak interpolation */ -); - -#ifdef IVAS_FLOAT_FIXED -void re8_k2y_fx( - const Word16 *k, /* i : Voronoi index k[0..7] */ - const Word16 m, /* i : Voronoi modulo (m = 2^r = 1<=2) */ - Word16 *y /* o : 8-dimensional point y[0..7] in RE8 */ -); - -void re8_PPV_fx( - const Word32 x[], /* i : point in R^8Q15 */ - Word16 y[] /* o : point in RE8 (8-dimensional integer vector) */ -); - -void msvq_dec_fx( - const Word16 *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ - const Word16 dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ - const Word16 offs[], /* i : Starting dimension of each codebook stage (NULL: 0) */ - const Word16 stages, /* i : Number of stages */ - const Word16 N, /* i : Vector dimension */ - const Word16 maxN, /* i : Codebook dimension */ - const Word16 Idx[], /* i : Indices */ - const Word16 applyIDCT_flag, /* i : applyIDCT flag */ - const Word32 *invTrfMatrix, /* i : synthesis matrix */ - Word32 *uq, /* o : quantized vector */ - Word16 *uq_ind, /* o : quantized vector (fixed point) */ - Word16 exp ); - -void dec_FDCNG_MSVQ_stage1_fx( - Word16 j_full, /* i : index full range */ - Word16 n, /* i : dimension to generate */ - const Word32 *invTrfMatrix, /* i : IDCT matrix for synthesis */ - const DCTTYPE idcttype, /* i : specify which IDCT */ - Word32 *uq, /* o : synthesized stage1 vector */ - Word16 *uq_ind /* o : synthesized stage1 vector in BASOP */ -); - -void dctT2_N_apply_matrix_fx( - const Word32 *input, /* i : input in fdcng or DCT(fdcng) domain */ - Word32 *output, /* o : output in DCT(fdcng) or fdcng ordomain */ - const Word16 dct_dim, /* i : dct processing dim possibly truncated */ - const Word16 fdcngvq_dim, /* i : fdcng domain length */ - const Word32 *matrix, /* i : IDCT matrix */ - const Word16 matrix_row_dim, /* i : */ - const DCTTYPE dcttype /* i : matrix operation type */ -); - -#endif -#endif diff --git a/lib_com/pvq_com_fx.c b/lib_com/pvq_com_fx.c index 2a7e9a8ecdabb3544f45d50353e2d5688ca32780..23c42119bc8bef6c19e295fa0e4eff816d51db35 100644 --- a/lib_com/pvq_com_fx.c +++ b/lib_com/pvq_com_fx.c @@ -3,10 +3,9 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" /* Function prototypes */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ /*! r: Approximate integer division for positive input using lookup table */ UWord32 intLimCDivPos_fx( diff --git a/lib_com/range_com_fx.c b/lib_com/range_com_fx.c index 0b46d73359df1e3dd8f21d53ad9c87138e1ba06f..22a7fb8eaf75a13955baba8ca1a0b919f223614c 100644 --- a/lib_com/range_com_fx.c +++ b/lib_com/range_com_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_com/re8_ppv_fx.c b/lib_com/re8_ppv_fx.c index a786f99362ad656953fb2128d5e1ddd84c4977c0..f330f22c2070006ab76240ea118b83e868c1ce10 100644 --- a/lib_com/re8_ppv_fx.c +++ b/lib_com/re8_ppv_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" /*-------------------------------------------------------------------* diff --git a/lib_com/re8_util_fx.c b/lib_com/re8_util_fx.c index db58c3fae5da1da710b78215498462ac6771703b..00909e2f5b6a48602dc439213ba30568fb7b4a19 100644 --- a/lib_com/re8_util_fx.c +++ b/lib_com/re8_util_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_com/recovernorm_fx.c b/lib_com/recovernorm_fx.c index e5b72fc51010adc4f8b23990074a364c12b52c4c..a61e1f1839391144f9e9611ab813593c6c953260 100644 --- a/lib_com/recovernorm_fx.c +++ b/lib_com/recovernorm_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ /*--------------------------------------------------------------------------* * recovernorm_fx() diff --git a/lib_com/reordvct_fx.c b/lib_com/reordvct_fx.c index a26480626f0b2419b49dd9c2debfa067261250dd..07bc21bc836e768a71efb553917fdb12828158ca 100644 --- a/lib_com/reordvct_fx.c +++ b/lib_com/reordvct_fx.c @@ -31,8 +31,8 @@ *******************************************************************************************************/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_com/residu_fx.c b/lib_com/residu_fx.c index 5849fb815170fe1b578122ca7d45949294559351..e06ef40eae5ed94fecd78ecca9673fc1e3dfec09 100644 --- a/lib_com/residu_fx.c +++ b/lib_com/residu_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------------* * Residu3_lc_fx: diff --git a/lib_com/rom_com.c b/lib_com/rom_com.c index 58be1cf3f2673d7f6700fd5a68949addfd43d9ae..3bf612bcad39210a2d74a38c66e9978286c493ff 100644 --- a/lib_com/rom_com.c +++ b/lib_com/rom_com.c @@ -41,7 +41,7 @@ #include "prot.h" #include "basop_util.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /* clang-format off */ diff --git a/lib_com/scale_mem_fx.c b/lib_com/scale_mem_fx.c index e6ca64931dc6f2a2a3f7c8207dfb7fb3e1ea9227..2e61cb93851f6c4ecd3d80bc635244242a40b630 100644 --- a/lib_com/scale_mem_fx.c +++ b/lib_com/scale_mem_fx.c @@ -34,8 +34,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Common prototypes */ -#include "prot_fx2.h" /* Common prototypes */ +#include "options.h" /* Common prototypes */ +#include "prot_fx.h" /* Common prototypes */ #include "ivas_cnst.h" #include "stl.h" diff --git a/lib_com/stab_est_fx.c b/lib_com/stab_est_fx.c index 52998bbae6e5f2790a034ca8f89eff6192b96980..e0c75e5632b0fff6ffb0633acc7b22b627126f23 100644 --- a/lib_com/stab_est_fx.c +++ b/lib_com/stab_est_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* * Local constants diff --git a/lib_com/stat_noise_uv_mod_fx.c b/lib_com/stat_noise_uv_mod_fx.c index 4d3badffc9d1c7d131ab5d72006922f9fcfa727d..9869019fa6fce0836ae920230d65336527464d8d 100644 --- a/lib_com/stat_noise_uv_mod_fx.c +++ b/lib_com/stat_noise_uv_mod_fx.c @@ -3,10 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "cnst.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ +#include "cnst.h" /* Function prototypes */ /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_com/swb_bwe_com_fx.c b/lib_com/swb_bwe_com_fx.c index ff4f55f9fc3679e928e0ef7ccb30f393a4e9add0..0ecd34e83db660fac977521d98ec20e75aeb18dc 100644 --- a/lib_com/swb_bwe_com_fx.c +++ b/lib_com/swb_bwe_com_fx.c @@ -32,8 +32,7 @@ #include #include "options.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/swb_bwe_com_hr_fx.c b/lib_com/swb_bwe_com_hr_fx.c index da8997a26b5e0f8b844a929b3ad3e54fee7408cd..cac0ed123cd0d564bd19cd0b8ad47764dca36ea0 100644 --- a/lib_com/swb_bwe_com_hr_fx.c +++ b/lib_com/swb_bwe_com_hr_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * swb_hr_nonzero_subband_noise_fill() diff --git a/lib_com/swb_bwe_com_lr_fx.c b/lib_com/swb_bwe_com_lr_fx.c index 386db34339494f9722d224a398a1c89e5c753918..adc98d36aa4bc8813e5f1680346db2d359492d53 100644 --- a/lib_com/swb_bwe_com_lr_fx.c +++ b/lib_com/swb_bwe_com_lr_fx.c @@ -33,7 +33,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include diff --git a/lib_com/swb_tbe_com.c b/lib_com/swb_tbe_com.c index 5229543ab9f1175c49e08c61898999cf7f28db29..aec2805a07fb4ec07fc468433241b4dcfc9853dc 100644 --- a/lib_com/swb_tbe_com.c +++ b/lib_com/swb_tbe_com.c @@ -39,8 +39,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "wmc_auto.h" #include "ivas_prot.h" diff --git a/lib_com/swb_tbe_com_fx.c b/lib_com/swb_tbe_com_fx.c index 42cab91fb41e79b967236f500349011b39e9ae59..55ca77c35b494eb573bd5376c6f0a45ce0ade055 100644 --- a/lib_com/swb_tbe_com_fx.c +++ b/lib_com/swb_tbe_com_fx.c @@ -8,8 +8,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_com/syn_12k8_fx.c b/lib_com/syn_12k8_fx.c index f990b0bc9618a3cebb7848d2c388d177d30e720d..86d4c6ef76bbc06a53d7f2bee16af0a546b985ea 100644 --- a/lib_com/syn_12k8_fx.c +++ b/lib_com/syn_12k8_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ /*===========================================================================*/ diff --git a/lib_com/syn_filt_fx.c b/lib_com/syn_filt_fx.c index 5ce65c316fd3338cdf170ab069495ec955c5a78e..e3a3024ba5cdfb351995551dfd5b5baf2e3a3d5f 100644 --- a/lib_com/syn_filt_fx.c +++ b/lib_com/syn_filt_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stl.h" static Word32 syn_kern_2( Word32 L_tmp, const Word16 a[], const Word16 y[] ) diff --git a/lib_com/tcq_position_arith_fx.c b/lib_com/tcq_position_arith_fx.c index 2ae9e850517d08ac1603c46fd4f2785c4fd6b48a..8c4b9a582515ebb6628bc49c7eb0208eddd1abf8 100644 --- a/lib_com/tcq_position_arith_fx.c +++ b/lib_com/tcq_position_arith_fx.c @@ -7,8 +7,7 @@ #include "stl.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" Word32 ar_div( Word32 num, diff --git a/lib_com/tcx_ltp_fx.c b/lib_com/tcx_ltp_fx.c index 134e861af2795b11591f5ee15dd3d2052c7e477d..9d18d4841c273cfe6ccb485508e231013cee98a9 100644 --- a/lib_com/tcx_ltp_fx.c +++ b/lib_com/tcx_ltp_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_com/tcx_mdct_fx.c b/lib_com/tcx_mdct_fx.c index f66ea0d76ff5311ca514ad73485548b60748016c..474f8779bf69aeaaa277a085b36fa97d759cc863 100644 --- a/lib_com/tcx_mdct_fx.c +++ b/lib_com/tcx_mdct_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" static Word16 TCX_MDCT_GetScaleFactor( diff --git a/lib_com/tcx_mdct_window.c b/lib_com/tcx_mdct_window.c index 8276f07d43f7545376edc4365131b2bfcbcba799..65fb6a1a0217a4e94f797dfa7f7d681239fea5e9 100644 --- a/lib_com/tcx_mdct_window.c +++ b/lib_com/tcx_mdct_window.c @@ -40,8 +40,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "wmc_auto.h" diff --git a/lib_com/tcx_utils_fx.c b/lib_com/tcx_utils_fx.c index e5d9f1478fa04b091fd8963db1093cb980213be4..e7987d0cecad106e440145d9e91f34acfbaa391a 100644 --- a/lib_com/tcx_utils_fx.c +++ b/lib_com/tcx_utils_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "rom_basop_util.h" #include "basop_util.h" diff --git a/lib_com/tec_com.c b/lib_com/tec_com.c index d702c4330a6868f981dcf8061f409955ad86660b..32c6e9fef23a75214a4490e13f24856c26f10198 100644 --- a/lib_com/tec_com.c +++ b/lib_com/tec_com.c @@ -5,8 +5,7 @@ #include #include "options.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "rom_com.h" diff --git a/lib_com/tns_base.c b/lib_com/tns_base.c index b0b8bb8e36bc6650e11405eaf75911de7d93b01b..9aafaddba7f50183987e6caa30003352c92469dc 100644 --- a/lib_com/tns_base.c +++ b/lib_com/tns_base.c @@ -10,8 +10,7 @@ #include "stat_com.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" /*---------------------------------------------------------------------------- diff --git a/lib_com/tools.c b/lib_com/tools.c index 4b1d12be2c0656823d4462b2c4b1a4dbb4134774..a2912019d1f1db143a0a7894317d2ffc692979ff 100644 --- a/lib_com/tools.c +++ b/lib_com/tools.c @@ -38,9 +38,8 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "wmc_auto.h" -#include "prot_fx1.h" /*------------------------------------------------------------------* * own_random() diff --git a/lib_com/tools_fx.c b/lib_com/tools_fx.c index c0f402d61523f77a1b928305ef59133bacd23d4d..919da71e3a743788c9a00a29d6d997f08e834049 100644 --- a/lib_com/tools_fx.c +++ b/lib_com/tools_fx.c @@ -45,8 +45,7 @@ #include "stl.h" #include #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "basop32.h" #include "wmc_auto.h" diff --git a/lib_com/trans_direct_fx.c b/lib_com/trans_direct_fx.c index 32d94aa4941d06496d57bd69ac2f03e615bd2de9..82e2c981c7d80f4f60d45183e7a58ab5240b7fb2 100644 --- a/lib_com/trans_direct_fx.c +++ b/lib_com/trans_direct_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common FX constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common FX constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Function prototypes */ /*------------------------------------------------------------------- * direct_transform() diff --git a/lib_com/trans_inv_fx.c b/lib_com/trans_inv_fx.c index 70746dba9196e5e2f26a9f06a239f1c5d2856732..f79443862199a7cacad0a6d5ae65e7108b9cc579 100644 --- a/lib_com/trans_inv_fx.c +++ b/lib_com/trans_inv_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Function prototypes */ #include "rom_dec.h" diff --git a/lib_com/vlpc_2st_com_fx.c b/lib_com/vlpc_2st_com_fx.c index f25e8bbf048244fbeae7fbbafd5af961fb882225..c54e5632f07a3861ef9b52211c3c6cd69ac719ce 100644 --- a/lib_com/vlpc_2st_com_fx.c +++ b/lib_com/vlpc_2st_com_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "control.h" #include "basop_util.h" diff --git a/lib_com/weight_a_fx.c b/lib_com/weight_a_fx.c index 61f453a2008fb0c3582ee0f01461d11c276763e3..99b621fa57c95f4d79abd591a675deeb03639141 100644 --- a/lib_com/weight_a_fx.c +++ b/lib_com/weight_a_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include /*------------------------------------------------------------------ diff --git a/lib_com/weight_fx.c b/lib_com/weight_fx.c index 5b5005fafd94af10259b225ef5e0ae8867a74612..6c123cbf2f14822ffe53631b3646ab11f26edea0 100644 --- a/lib_com/weight_fx.c +++ b/lib_com/weight_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*--------------------------------------------------------------------------* * sfm2mqb_fx() diff --git a/lib_com/wi_fx.c b/lib_com/wi_fx.c index 391f6d9e5fc063d5d453ebc02ec777439fa3cbe9..233a2f6ba4ae518d937c1e5625a8a76466068bda 100644 --- a/lib_com/wi_fx.c +++ b/lib_com/wi_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "log2.h" diff --git a/lib_com/window_fx.c b/lib_com/window_fx.c index 6ef8081fd70a16d3d9622e058df47aad78157693..97443e3b594aadfa39b35e1efaf58a0cdfd67e73 100644 --- a/lib_com/window_fx.c +++ b/lib_com/window_fx.c @@ -7,7 +7,6 @@ #include "options.h" #include #include "basop_util.h" -#include "prot_fx1.h" #define PI_HALF_0Q15 51472 /* ~=round(pi/2*2^15) */ #define PI2_15Q16 0x0006487F /* ~=round(2*PI*2^16) */ @@ -19,7 +18,7 @@ #define P92_0Q15 30147 /* ~=round(0.92*2^15) */ #include "options.h" #include "rom_basop_util.h" -#include "prot_fx2.h" +#include "prot_fx.h" void ham_cos_window( diff --git a/lib_com/window_ola_fx.c b/lib_com/window_ola_fx.c index ac7e63d8aebee9a5464c872774cd10479aba8c0c..40c31f8fd9d7d4eeee81b0e24a634b2e8cd0cbf8 100644 --- a/lib_com/window_ola_fx.c +++ b/lib_com/window_ola_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Function prototypes */ #include "stl.h" void sinq_fx( diff --git a/lib_com/wtda.c b/lib_com/wtda.c index 868cd7057cb818c76993916acc12ffeaff0221ef..f1b47ee6c06df5a4f7e40ab03fc49588644e515b 100644 --- a/lib_com/wtda.c +++ b/lib_com/wtda.c @@ -42,7 +42,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED /*--------------------------------------------------------------------------* diff --git a/lib_com/wtda_fx.c b/lib_com/wtda_fx.c index 07699e4087563d903e0e1a22c0fa7c89282d2f0f..b20771f8cec8d7bb6f612290256471ea1d07161e 100644 --- a/lib_com/wtda_fx.c +++ b/lib_com/wtda_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* required by wmc_tool */ -#include "prot_fx2.h" /* required by wmc_tool */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* required by wmc_tool */ #include "stat_com.h" /*--------------------------------------------------------------------------* * mvr2r_inv() diff --git a/lib_dec/ACcontextMapping_dec_fx.c b/lib_dec/ACcontextMapping_dec_fx.c index 01298f6ddb2f3eb99d434673f8fc6b3af43f862e..92dddd54fa1de4e115fddb27348f923624e3fe52 100644 --- a/lib_dec/ACcontextMapping_dec_fx.c +++ b/lib_dec/ACcontextMapping_dec_fx.c @@ -9,8 +9,7 @@ #include "rom_dec.h" #include "basop_util.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_rom_com.h" diff --git a/lib_dec/FEC_HQ_core.c b/lib_dec/FEC_HQ_core.c index f87cc884f1525119815b33eb104d93e246bc0204..5dd3351aace8647f9f7e9a86153354ef4d89727d 100644 --- a/lib_dec/FEC_HQ_core.c +++ b/lib_dec/FEC_HQ_core.c @@ -43,8 +43,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif #ifndef IVAS_FLOAT_FIXED diff --git a/lib_dec/FEC_HQ_core_fx.c b/lib_dec/FEC_HQ_core_fx.c index 2a375498e27a83f7a4cf0b78a49c630e67401caa..3a5b71cff6db35db2eefd5992aafa17ee8581395 100644 --- a/lib_dec/FEC_HQ_core_fx.c +++ b/lib_dec/FEC_HQ_core_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_dec/FEC_HQ_phase_ecu_fx.c b/lib_dec/FEC_HQ_phase_ecu_fx.c index 7d75f0029e5deca8e1b070c487aa12ade6225207..972e7f4f8a0bad887d749ebe2f44bed7eb4b27d5 100644 --- a/lib_dec/FEC_HQ_phase_ecu_fx.c +++ b/lib_dec/FEC_HQ_phase_ecu_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "rom_dec.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_dec/FEC_adapt_codebook_fx.c b/lib_dec/FEC_adapt_codebook_fx.c index 63c5559c055275cea9a579ceae4c14e6e716b477..71717bd4101e6ffc190b183032561a3a9af9cd7d 100644 --- a/lib_dec/FEC_adapt_codebook_fx.c +++ b/lib_dec/FEC_adapt_codebook_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_dec.h" /* Decoder static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_dec.h" /* Decoder static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_dec/FEC_clas_estim_fx.c b/lib_dec/FEC_clas_estim_fx.c index 9591807b7559a4f48a47878fe845663dc16d00b8..0c668df55ed762c801f29b4473adc0b24dde0e97 100644 --- a/lib_dec/FEC_clas_estim_fx.c +++ b/lib_dec/FEC_clas_estim_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/FEC_fx.c b/lib_dec/FEC_fx.c index a029f1dfd771fb32e053bcceef31cdf482391749..7353f8f83b03b8a852ab8800343b0a060b26ec17 100644 --- a/lib_dec/FEC_fx.c +++ b/lib_dec/FEC_fx.c @@ -3,12 +3,11 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Common static table prototypes */ -#include "rom_dec.h" /* Decoder static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Common static table prototypes */ +#include "rom_dec.h" /* Decoder static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* diff --git a/lib_dec/FEC_lsf_estim_fx.c b/lib_dec/FEC_lsf_estim_fx.c index 21efc90e7cc38a906e3bb821e2441909ea3c7243..d79d90c8512625ce85c5a9e3e8664736befcb40e 100644 --- a/lib_dec/FEC_lsf_estim_fx.c +++ b/lib_dec/FEC_lsf_estim_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_dec/FEC_pitch_estim_fx.c b/lib_dec/FEC_pitch_estim_fx.c index 1305f1373009e57add9801f6b852ac504bf96b79..d12c4b30ac591fc9af7de282ee0ebbe9cfbf5a53 100644 --- a/lib_dec/FEC_pitch_estim_fx.c +++ b/lib_dec/FEC_pitch_estim_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_dec/FEC_scale_syn_fx.c b/lib_dec/FEC_scale_syn_fx.c index 9a8da8454af1eedae4e9333ef1368cb17bd50c69..8448695c1fc517838e124cb175bcefee213d3d2e 100644 --- a/lib_dec/FEC_scale_syn_fx.c +++ b/lib_dec/FEC_scale_syn_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* * Local constants diff --git a/lib_dec/LD_music_post_filter_fx.c b/lib_dec/LD_music_post_filter_fx.c index 454e59ddd3d4d1c9e089575bad50bb03dd558381..02f6293176830b9018a5289d75d72703444ea0aa 100644 --- a/lib_dec/LD_music_post_filter_fx.c +++ b/lib_dec/LD_music_post_filter_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_dec/TonalComponentDetection_fx.c b/lib_dec/TonalComponentDetection_fx.c index c3224a0998d1adb968a05a4bf0b4a5c22ef40f15..6ef4f65da364e4cd6b7a4f479fb62d64efcb53af 100644 --- a/lib_dec/TonalComponentDetection_fx.c +++ b/lib_dec/TonalComponentDetection_fx.c @@ -7,16 +7,12 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "cnst.h" #include "rom_basop_util.h" #include "rom_com.h" #include "basop_util.h" -#ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" -#endif /*---------------------------------------------------------------------* diff --git a/lib_dec/acelp_core_dec.c b/lib_dec/acelp_core_dec.c index c0267b47f93660e6582e0dafb32b07ec19550508..61ff0b8c3856dc5dad6a054f944424502b9e4c1a 100644 --- a/lib_dec/acelp_core_dec.c +++ b/lib_dec/acelp_core_dec.c @@ -42,8 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "ivas_prot.h" #include "ivas_rom_com.h" diff --git a/lib_dec/acelp_core_dec_fx.c b/lib_dec/acelp_core_dec_fx.c index c3cf9be3b05ec2c1dd87855be901d29e1bff9399..4f21a81a882d7fcff40bcd5afaa38f8be61703ca 100644 --- a/lib_dec/acelp_core_dec_fx.c +++ b/lib_dec/acelp_core_dec_fx.c @@ -4,10 +4,9 @@ #include #include -#include "options.h" /* Compilation switches */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "ivas_prot_fx.h" #include "ivas_cnst.h" /* Common constants */ #include "cnst.h" /* Common constants */ diff --git a/lib_dec/acelp_core_dec_ivas_fx.c b/lib_dec/acelp_core_dec_ivas_fx.c index 8e84bc1ed8140eaaec0f173da812523c2f14e85d..d724b48ae95dee6aa904ab7c11e0381bc92e68b8 100644 --- a/lib_dec/acelp_core_dec_ivas_fx.c +++ b/lib_dec/acelp_core_dec_ivas_fx.c @@ -40,8 +40,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "ivas_prot.h" #include "ivas_rom_com.h" diff --git a/lib_dec/acelp_core_switch_dec_fx.c b/lib_dec/acelp_core_switch_dec_fx.c index 76b8b8ed23a1cfca50c008502fd99089ae63321e..d2a81d11b760df8590371ea5a27218f04ebf8b12 100644 --- a/lib_dec/acelp_core_switch_dec_fx.c +++ b/lib_dec/acelp_core_switch_dec_fx.c @@ -3,12 +3,11 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "prot.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ +#include "prot.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_dec/amr_wb_dec.c b/lib_dec/amr_wb_dec.c index 895af08609696bfc74683c1b503a75dbc68dc0d8..29b2e5a265eb496118a239e4552a41477825b33a 100644 --- a/lib_dec/amr_wb_dec.c +++ b/lib_dec/amr_wb_dec.c @@ -43,7 +43,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif #ifndef IVAS_FLOAT_FIXED diff --git a/lib_dec/amr_wb_dec_fx.c b/lib_dec/amr_wb_dec_fx.c index 2ea166a707d15680bced5a824d1533edaddc73f0..b5d194c6dbcc4f4f127b833cfb7355eee9ac1167 100644 --- a/lib_dec/amr_wb_dec_fx.c +++ b/lib_dec/amr_wb_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* diff --git a/lib_dec/ari_dec.c b/lib_dec/ari_dec.c index 334e2419594e315e200da434ad9fd96059d08044..51badb5bce951cde503991e95db31e683f1b8b98 100644 --- a/lib_dec/ari_dec.c +++ b/lib_dec/ari_dec.c @@ -39,6 +39,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" +#include "prot_fx.h" #include "stat_com.h" #include "basop_util.h" #include "wmc_auto.h" diff --git a/lib_dec/ari_dec_fx.c b/lib_dec/ari_dec_fx.c index 78d7b799ce1814277729d1619bd2be5130ac69fb..8a310b8b882e2e8a723188748f5645337a0bc212 100644 --- a/lib_dec/ari_dec_fx.c +++ b/lib_dec/ari_dec_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------- * Ari decode 14 bits routines diff --git a/lib_dec/ari_hm_dec.c b/lib_dec/ari_hm_dec.c index fc45166c11ef11a1272a29ac59d1c4dcc29364e8..fbd863d6fc2d4592f125665a97613d1890bb9053 100644 --- a/lib_dec/ari_hm_dec.c +++ b/lib_dec/ari_hm_dec.c @@ -43,7 +43,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifndef IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* * DecodeIndex() diff --git a/lib_dec/arith_coder_dec.c b/lib_dec/arith_coder_dec.c index 507a8d2e0c32000844e8bcf92610e66f638f13b7..1d23d827d4d34cec79faa7706e2cca1f9699f447 100644 --- a/lib_dec/arith_coder_dec.c +++ b/lib_dec/arith_coder_dec.c @@ -43,8 +43,7 @@ #include "basop_util.h" #include "basop_proto_func.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------* * tcx_arith_decode() diff --git a/lib_dec/arith_coder_dec_fx.c b/lib_dec/arith_coder_dec_fx.c index ddd4ac4782aeeab90815a458478ef8c376662a62..61bb24b663c8ef8b2e7c0740b4b687290926c4e9 100644 --- a/lib_dec/arith_coder_dec_fx.c +++ b/lib_dec/arith_coder_dec_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /* Returns: number of bits consumed */ #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/avq_dec_fx.c b/lib_dec/avq_dec_fx.c index d4351b1a541d81e562b443c7620f8ebb94704573..e739484b698d4f8af9cab22fb7572f8119ed88c5 100644 --- a/lib_dec/avq_dec_fx.c +++ b/lib_dec/avq_dec_fx.c @@ -4,12 +4,11 @@ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* * Local prototypes diff --git a/lib_dec/bass_psfilter.c b/lib_dec/bass_psfilter.c index 13c822522a7f4d82c0e9ff392e167f696ce5ab5b..c33edf96c6f4aee536b678176959b4ff41a32f70 100644 --- a/lib_dec/bass_psfilter.c +++ b/lib_dec/bass_psfilter.c @@ -38,8 +38,7 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "cnst.h" #include "stat_dec.h" diff --git a/lib_dec/bass_psfilter_fx.c b/lib_dec/bass_psfilter_fx.c index d3984a7e477c078c1cf7ab0cc329afd52455e601..3620495a89021918f149668011f652e7f828e026 100644 --- a/lib_dec/bass_psfilter_fx.c +++ b/lib_dec/bass_psfilter_fx.c @@ -4,12 +4,11 @@ #include #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "rom_dec.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "rom_dec.h" /* Static table prototypes */ #include "basop_util.h" /*---------------------------------------------------------------------* diff --git a/lib_dec/cng_dec.c b/lib_dec/cng_dec.c index cb202f38b0bfbf68b4e37dbfc060551dfc9ce49e..83854f3aed83cd0b758347800f8cb9d2ffbe4b98 100644 --- a/lib_dec/cng_dec.c +++ b/lib_dec/cng_dec.c @@ -39,7 +39,6 @@ #include #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" #include "rom_com.h" #include "wmc_auto.h" diff --git a/lib_dec/cng_dec_fx.c b/lib_dec/cng_dec_fx.c index ab41059c5352f6d6462113dab6949167dea89e4c..b612638f95efb0bd592ab0ed810074e75140817b 100644 --- a/lib_dec/cng_dec_fx.c +++ b/lib_dec/cng_dec_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" /*Temporary location to be move in prot* when merge is done*/ diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c index d8c00803e354bee1203f80f1c33751fa38228da4..2ae22c470d57756f157b5c5d56346953ea860f51 100644 --- a/lib_dec/core_dec_init.c +++ b/lib_dec/core_dec_init.c @@ -41,7 +41,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------* * open_decoder_LPD() * diff --git a/lib_dec/core_dec_init_fx.c b/lib_dec/core_dec_init_fx.c index 684b21fb2271a8426e56d81e7dba23e0de9b6607..960ef827d928e779f6a4cc90ba941acd834e2d4d 100644 --- a/lib_dec/core_dec_init_fx.c +++ b/lib_dec/core_dec_init_fx.c @@ -7,9 +7,8 @@ #include #include #include "options.h" -#include "prot_fx1.h" #include "prot.h" //Can be removed later -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" #include "cnst.h" /* for MIN_CNG_LEV */ diff --git a/lib_dec/core_dec_reconf.c b/lib_dec/core_dec_reconf.c index 13aa708dc4a76c26a3fbcdf0cd7f358ca3b36178..2599303f315b8e5562b5c9759096cbbfa1e67466 100644 --- a/lib_dec/core_dec_reconf.c +++ b/lib_dec/core_dec_reconf.c @@ -40,7 +40,7 @@ #include "rom_com.h" #include "rom_dec.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifndef IVAS_FLOAT_FIXED /*---------------------------------------------------------------------* * reconfig_decoder_LPD_ivas() diff --git a/lib_dec/core_dec_reconf_fx.c b/lib_dec/core_dec_reconf_fx.c index c347fbe8df726bfab3721c805b7706c755853a53..13ddbe6f23606e918cc97fb9194f1ddf86c9930e 100644 --- a/lib_dec/core_dec_reconf_fx.c +++ b/lib_dec/core_dec_reconf_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" diff --git a/lib_dec/core_dec_switch_fx.c b/lib_dec/core_dec_switch_fx.c index 6aaad23ef40e7fd098f9a8c1a0c0b34eba56d021..835b930979f92a40ba5b5da56854fe5a7c981c80 100644 --- a/lib_dec/core_dec_switch_fx.c +++ b/lib_dec/core_dec_switch_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" // Temporarily added diff --git a/lib_dec/core_switching_dec.c b/lib_dec/core_switching_dec.c index 7e7bfbd6c5bdca8b817f8b010584d70e548dc9c9..43431ba309c92bce579a28ec6e655b7fd55592ae 100644 --- a/lib_dec/core_switching_dec.c +++ b/lib_dec/core_switching_dec.c @@ -40,8 +40,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "wmc_auto.h" diff --git a/lib_dec/core_switching_dec_fx.c b/lib_dec/core_switching_dec_fx.c index 4f8854d7c540e86310c66fa7fec1b595eeda032f..b6f6f7276f13fb2068e6199e348b9a2ed88af1ad 100644 --- a/lib_dec/core_switching_dec_fx.c +++ b/lib_dec/core_switching_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" diff --git a/lib_dec/d_gain2p_fx.c b/lib_dec/d_gain2p_fx.c index 1507c284e17fd7f66622d8184ca817d33fb91da0..63eff5413795ce52a79bc6208eaf96deb046e82f 100644 --- a/lib_dec/d_gain2p_fx.c +++ b/lib_dec/d_gain2p_fx.c @@ -4,8 +4,7 @@ #include #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "stl.h" #include "rom_com.h" diff --git a/lib_dec/dec2t32_fx.c b/lib_dec/dec2t32_fx.c index e62814cc65f6fa7da9dcd60bf55b999986de4b70..b6e1c2053e62f1a9bb51bc4028d4b7a895048572 100644 --- a/lib_dec/dec2t32_fx.c +++ b/lib_dec/dec2t32_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ /*==========================================================================*/ diff --git a/lib_dec/dec4t64_fx.c b/lib_dec/dec4t64_fx.c index 10e9b5b13a0918b7c12ab8f75bfa3039c45eace8..47c481dc493142f075c5908e7b35ca459ab9ee9c 100644 --- a/lib_dec/dec4t64_fx.c +++ b/lib_dec/dec4t64_fx.c @@ -2,12 +2,11 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ -#include "assert.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ +#include "assert.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* * Local functions diff --git a/lib_dec/dec_LPD.c b/lib_dec/dec_LPD.c index 746e18e38bae66c088e3d10069d0821390bf81d7..e45e44b471c4835c7c2ac3f3ea6e92c8c032efeb 100644 --- a/lib_dec/dec_LPD.c +++ b/lib_dec/dec_LPD.c @@ -44,7 +44,7 @@ #include "basop_proto_func.h" #include "stat_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/dec_LPD_fx.c b/lib_dec/dec_LPD_fx.c index 11afd0184baebf196ddbaa1a6ca8ec74306e5d4c..3b840fc5e735bcf6509e29a36cc11bbdb577ded8 100644 --- a/lib_dec/dec_LPD_fx.c +++ b/lib_dec/dec_LPD_fx.c @@ -6,8 +6,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/dec_ace_fx.c b/lib_dec/dec_ace_fx.c index 8764b1d2a139c04a8fbba1a2a15d8a1de7bade44..7c3de901a83a4eacd7d7b6d651bbba86ee3a4308 100644 --- a/lib_dec/dec_ace_fx.c +++ b/lib_dec/dec_ace_fx.c @@ -8,8 +8,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "stl.h" #include "rom_com.h" diff --git a/lib_dec/dec_acelp_fx.c b/lib_dec/dec_acelp_fx.c index b560f7beae8300edbcfb724f8f1a361fa8db28ea..b05086d9fc61e0d4c4b36f77b5c023ca97500028 100644 --- a/lib_dec/dec_acelp_fx.c +++ b/lib_dec/dec_acelp_fx.c @@ -7,8 +7,7 @@ #include #include "options.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "rom_basop_util.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/dec_acelp_tcx_main_fx.c b/lib_dec/dec_acelp_tcx_main_fx.c index 93eb4605f15c77fd86f593bc1688f205ec902e4e..ad7117763bc403b7c06164a2ec87687ed92e5c78 100644 --- a/lib_dec/dec_acelp_tcx_main_fx.c +++ b/lib_dec/dec_acelp_tcx_main_fx.c @@ -8,8 +8,7 @@ #include "options.h" #include "rom_com.h" #include "stat_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED static void decode_frame_type_fx( Decoder_State *st diff --git a/lib_dec/dec_amr_wb_fx.c b/lib_dec/dec_amr_wb_fx.c index 9682b152b87ab07c0971313aa315129ce5f9b257..03ae965aabbbe968eff0187734c4b68253de0e5a 100644 --- a/lib_dec/dec_amr_wb_fx.c +++ b/lib_dec/dec_amr_wb_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*---------------------------------------------------------------------* diff --git a/lib_dec/dec_gen_voic_fx.c b/lib_dec/dec_gen_voic_fx.c index e48c4aae2a5f0fa37770df2237606def8de629fd..597cfea19e0f902101761e944803f8bceb692b6c 100644 --- a/lib_dec/dec_gen_voic_fx.c +++ b/lib_dec/dec_gen_voic_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/dec_higher_acelp.c b/lib_dec/dec_higher_acelp.c index 304884e714e1f54d084e74f97bbbfe7fbdfc1227..962bbc686747e3968b608b719ea5981b07f176eb 100644 --- a/lib_dec/dec_higher_acelp.c +++ b/lib_dec/dec_higher_acelp.c @@ -42,7 +42,7 @@ #include "rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED /*-----------------------------------------------------------------* diff --git a/lib_dec/dec_higher_acelp_fx.c b/lib_dec/dec_higher_acelp_fx.c index 0bc9665d804906bacd705e9f9ef1f94e1afa90a3..eea2c8a62c346981f10e4292efb1d7728b630576 100644 --- a/lib_dec/dec_higher_acelp_fx.c +++ b/lib_dec/dec_higher_acelp_fx.c @@ -4,10 +4,9 @@ #include #include "options.h" /* Compilation switches */ #include -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ #define IVAS_CODE #define IVAS_CODE_AVQ diff --git a/lib_dec/dec_nelp_fx.c b/lib_dec/dec_nelp_fx.c index 9732ce9f1a5c88d5606fc7a85bab5a3e3cbce770..7083919c455c76ab46d32ad1489d3669eb8d42c8 100644 --- a/lib_dec/dec_nelp_fx.c +++ b/lib_dec/dec_nelp_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*======================================================================*/ /* FUNCTION : decod_nelp_fx() */ diff --git a/lib_dec/dec_pit_exc_fx.c b/lib_dec/dec_pit_exc_fx.c index 0197fe36de056d778542695c619accd913c1092b..27abc3ddfeeea1d1bceb3bad297a15a4c9330904 100644 --- a/lib_dec/dec_pit_exc_fx.c +++ b/lib_dec/dec_pit_exc_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*==========================================================================*/ diff --git a/lib_dec/dec_post_fx.c b/lib_dec/dec_post_fx.c index 2552a15ec37180c6986db410547cd13b75fbd45c..a8580c8ce001282d59201985c57c58a938dc661c 100644 --- a/lib_dec/dec_post_fx.c +++ b/lib_dec/dec_post_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_dec.h" #include "rom_com.h" diff --git a/lib_dec/dec_ppp_fx.c b/lib_dec/dec_ppp_fx.c index cd4d6462f6be21a92c0ecdb8806199ef5b5b7777..d37efa4c7d80b2ca92d6f92813f7b6185644999e 100644 --- a/lib_dec/dec_ppp_fx.c +++ b/lib_dec/dec_ppp_fx.c @@ -4,9 +4,8 @@ #include #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*===================================================================*/ /* FUNCTION : void decod_ppp_fx () */ diff --git a/lib_dec/dec_prm.c b/lib_dec/dec_prm.c index c10b3f587295bcf8e77e5885aa93cc0a5c3d6e4d..b6a2b7d82af34b2cebb9486865b511d699f3264c 100644 --- a/lib_dec/dec_prm.c +++ b/lib_dec/dec_prm.c @@ -41,7 +41,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * getTCXMode_ivas() diff --git a/lib_dec/dec_prm_fx.c b/lib_dec/dec_prm_fx.c index f238f3e3a5136bc1c12fef6dd9acd44db1c54e9a..22b0c7047f309b1617fa0edf47e745cc218b1f3c 100644 --- a/lib_dec/dec_prm_fx.c +++ b/lib_dec/dec_prm_fx.c @@ -9,8 +9,7 @@ #include #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* diff --git a/lib_dec/dec_tcx.c b/lib_dec/dec_tcx.c index 06c9bc5ba28b812dedabedc296ea5705dacb9320..ab45587913294d18ec7ba70e4afa9910d387da44 100644 --- a/lib_dec/dec_tcx.c +++ b/lib_dec/dec_tcx.c @@ -37,7 +37,7 @@ #include #include "prot.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include #include "options.h" #include @@ -45,8 +45,6 @@ #include "cnst.h" #include "wmc_auto.h" #include "ivas_rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_prot_fx.h" #ifndef IVAS_FLOAT_FIXED_UNIT_TESTING #include "debug.h" diff --git a/lib_dec/dec_tcx_fx.c b/lib_dec/dec_tcx_fx.c index 96fcfb25db8faa7b441d4f69edb6bcc92af6a612..064ae2849006c55c012a2c8e177d129f4b3b270b 100644 --- a/lib_dec/dec_tcx_fx.c +++ b/lib_dec/dec_tcx_fx.c @@ -5,8 +5,7 @@ #include #include #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "stl.h" #include "options.h" diff --git a/lib_dec/dec_tran_fx.c b/lib_dec/dec_tran_fx.c index 95c0fb1cef2904f8971621dddbbe9adbdace9510..9d2e808a70e3bd37402f5b74ffc002b51cb85998 100644 --- a/lib_dec/dec_tran_fx.c +++ b/lib_dec/dec_tran_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED /*======================================================================*/ /* FUNCTION : decod_tran_fx() */ diff --git a/lib_dec/dec_uv_fx.c b/lib_dec/dec_uv_fx.c index 1b6c4b424f936e18c37bca96e6ac84f3a9f23008..182c89ef767d708bc7dcf7cae0b06afe8a189144 100644 --- a/lib_dec/dec_uv_fx.c +++ b/lib_dec/dec_uv_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED static void gain_dec_gacelp_uv_fx( Word16 index, /* i : Quantization index vector Q0 */ diff --git a/lib_dec/decision_matrix_dec_fx.c b/lib_dec/decision_matrix_dec_fx.c index 8c9a12b69c14b8dc511450251fb3a5951bd2adcf..7362cb20b68fe64f9512ae7ee2b662f836904d42 100644 --- a/lib_dec/decision_matrix_dec_fx.c +++ b/lib_dec/decision_matrix_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stat_dec.h" #include "rom_com.h" #include "stl.h" diff --git a/lib_dec/dlpc_avq_fx.c b/lib_dec/dlpc_avq_fx.c index 07f20ce6a3c00742ba4f434a879eefa7dd0c5359..1cb91e22f84a98734ccc9e1ab180c378bee6faab 100644 --- a/lib_dec/dlpc_avq_fx.c +++ b/lib_dec/dlpc_avq_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED /* Constants */ diff --git a/lib_dec/dlpc_stoch_fx.c b/lib_dec/dlpc_stoch_fx.c index 742f76dd3ea3438763f1a96dc0a31eeb336c83c9..f42d7d45708c5ea53faeedc570f7d10bac02fb0a 100644 --- a/lib_dec/dlpc_stoch_fx.c +++ b/lib_dec/dlpc_stoch_fx.c @@ -8,8 +8,7 @@ #include #include "options.h" #include "basop_util.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED /* Constants */ #define M 16 diff --git a/lib_dec/er_dec_acelp_fx.c b/lib_dec/er_dec_acelp_fx.c index ca23584a1b1098c75bd9a05a7af29bab79f97d68..3a8a3de62bc5e9a0cb93a9569798e54f1035b696 100644 --- a/lib_dec/er_dec_acelp_fx.c +++ b/lib_dec/er_dec_acelp_fx.c @@ -8,8 +8,7 @@ #include #include "options.h" #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_dec.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/er_dec_tcx_fx.c b/lib_dec/er_dec_tcx_fx.c index c3cf2f0ab1b2548d0987c13735d11606db323ad4..a4102230e7be1e006315c74dd87f465123ab815d 100644 --- a/lib_dec/er_dec_tcx_fx.c +++ b/lib_dec/er_dec_tcx_fx.c @@ -6,8 +6,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_dec.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/er_scale_syn_fx.c b/lib_dec/er_scale_syn_fx.c index ed78d88429c32c52dc3f04be491cf32ef849460a..652041e6717b2572ef49833799c2ba03ccb0c3ac 100644 --- a/lib_dec/er_scale_syn_fx.c +++ b/lib_dec/er_scale_syn_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "cnst.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/er_sync_exc_fx.c b/lib_dec/er_sync_exc_fx.c index f4535152f3647126423204922d08166cf95fa9f1..48f811e71d26c990432a3e27605e4d9582d6d445 100644 --- a/lib_dec/er_sync_exc_fx.c +++ b/lib_dec/er_sync_exc_fx.c @@ -8,8 +8,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop32.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/er_util_fx.c b/lib_dec/er_util_fx.c index ee0c52b8ea09c1d2a3a991d8033d80bc23e03949..93ccaed26d8be53dd3e2740f13cd14c6fcfe8c5a 100644 --- a/lib_dec/er_util_fx.c +++ b/lib_dec/er_util_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/evs_dec.c b/lib_dec/evs_dec.c index 96c3b57928b31659d1f135f695bc94e022e15328..d5498c622a1f4988018a0e8ae59ef80b3abd4338 100644 --- a/lib_dec/evs_dec.c +++ b/lib_dec/evs_dec.c @@ -42,8 +42,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif #ifndef IVAS_FLOAT_FIXED diff --git a/lib_dec/evs_dec_fx.c b/lib_dec/evs_dec_fx.c index e258c68e9af358a69e3dadfd9f231b199ec720f8..ee9bc103ce190190f4066605488d3b88e88a00d9 100644 --- a/lib_dec/evs_dec_fx.c +++ b/lib_dec/evs_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/fd_cng_dec.c b/lib_dec/fd_cng_dec.c index e4bab0bf9f559024fc20abf355037b8524cc117a..e5a7bb6669b7e1ae51972aba6c9b21cd0f065a20 100644 --- a/lib_dec/fd_cng_dec.c +++ b/lib_dec/fd_cng_dec.c @@ -45,8 +45,7 @@ #include "ivas_prot.h" #include "ivas_rom_dec.h" #include "ivas_rom_com_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_dec/fd_cng_dec_fx.c b/lib_dec/fd_cng_dec_fx.c index a97ac38098626fd42fea460b6ff5584337f28470..0984c76989385331603c79f49e54598ab1182d3e 100644 --- a/lib_dec/fd_cng_dec_fx.c +++ b/lib_dec/fd_cng_dec_fx.c @@ -9,8 +9,7 @@ #include "options.h" #include "rom_com.h" #include "stat_dec.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_dec/gain_dec_fx.c b/lib_dec/gain_dec_fx.c index ae4a959667837ec519160792ec3afe7b32ef415e..ab561a354e5cc78c7a5cd117709aeaf898df1124 100644 --- a/lib_dec/gain_dec_fx.c +++ b/lib_dec/gain_dec_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*===========================================================================*/ diff --git a/lib_dec/gaus_dec_fx.c b/lib_dec/gaus_dec_fx.c index 516dfc4985d67ebf648a2f8fd912b80673545c09..9cd2214bc92228b3b0d252401c515be4834d6914 100644 --- a/lib_dec/gaus_dec_fx.c +++ b/lib_dec/gaus_dec_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_dec/gs_dec_amr_wb_fx.c b/lib_dec/gs_dec_amr_wb_fx.c index 4ad733294b40f95c2d6449e7e7fcf1c068c0420c..5864c697cc2caae3420577ab2bcdaee58a45d50a 100644 --- a/lib_dec/gs_dec_amr_wb_fx.c +++ b/lib_dec/gs_dec_amr_wb_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_dec/gs_dec_fx.c b/lib_dec/gs_dec_fx.c index bd5f9b7f84fb74e7f634bd8e02e3643cb036b081..9bd541bc95d48403b87bf7e63ae254af94a68c8f 100644 --- a/lib_dec/gs_dec_fx.c +++ b/lib_dec/gs_dec_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #ifdef IVAS_FLOAT_FIXED /*=========================================================================*/ diff --git a/lib_dec/hdecnrm_fx.c b/lib_dec/hdecnrm_fx.c index 4894ee0e86d7fd53aba25d7cd2260a97f3749a10..c97344274270556c5beb67c7efebbb026810afba 100644 --- a/lib_dec/hdecnrm_fx.c +++ b/lib_dec/hdecnrm_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_dec.h" /*--------------------------------------------------------------------------*/ diff --git a/lib_dec/hf_synth.c b/lib_dec/hf_synth.c index 38aaab11ffe715db0edd2c8805e101619e797728..b2589a9bc600874872e006f9bb64e9a4cc5fe309 100644 --- a/lib_dec/hf_synth.c +++ b/lib_dec/hf_synth.c @@ -42,8 +42,7 @@ #include "rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "basop32.h" #endif diff --git a/lib_dec/hf_synth_fx.c b/lib_dec/hf_synth_fx.c index a40ae1a3045c7f5deb2223dffdb2676875a9a639..cee42b0ca04ff1a1117570370a21b384a6eefc1d 100644 --- a/lib_dec/hf_synth_fx.c +++ b/lib_dec/hf_synth_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ #include "basop32.h" #include "prot.h" diff --git a/lib_dec/hq_classifier_dec_fx.c b/lib_dec/hq_classifier_dec_fx.c index 3a2d3f511590da1ab414f1e8d745c735cb96a8fb..430c27cd7dc910d1df6a68f49790721ec19d37d3 100644 --- a/lib_dec/hq_classifier_dec_fx.c +++ b/lib_dec/hq_classifier_dec_fx.c @@ -2,9 +2,8 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/hq_conf_fec_fx.c b/lib_dec/hq_conf_fec_fx.c index dacd23a76b6e7260b16ad05d0f6e5db86d485ee2..dfc19c542dae9ad137e032b0afd4ae1a6cd7ed1f 100644 --- a/lib_dec/hq_conf_fec_fx.c +++ b/lib_dec/hq_conf_fec_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" diff --git a/lib_dec/hq_core_dec_fx.c b/lib_dec/hq_core_dec_fx.c index fb0f5f02471dbb37fe336e69a09bdd48115ffd5c..d629365f3231c8eb79900ca3bff2c6f4563fadd5 100644 --- a/lib_dec/hq_core_dec_fx.c +++ b/lib_dec/hq_core_dec_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED #include "prot.h" #include "ivas_prot_fx.h" diff --git a/lib_dec/hq_env_dec_fx.c b/lib_dec/hq_env_dec_fx.c index 0226c32f3d65f6538e2d87b2954c4e2b9a804e45..df1635e37bf97fce7b9352dd7ed6ee0bdf4c7f3e 100644 --- a/lib_dec/hq_env_dec_fx.c +++ b/lib_dec/hq_env_dec_fx.c @@ -3,10 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED /*------------------------------------------------------------------------* diff --git a/lib_dec/hq_hr_dec_fx.c b/lib_dec/hq_hr_dec_fx.c index d42acd11bde6ea877da0fbd31892f66f2eadb654..4814b86e528eacc20ffe2d52de337f38e7fc6bdb 100644 --- a/lib_dec/hq_hr_dec_fx.c +++ b/lib_dec/hq_hr_dec_fx.c @@ -2,10 +2,9 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/hq_lr_dec_fx.c b/lib_dec/hq_lr_dec_fx.c index a454af97a75ac6ebe558732edffe0c895853dbaa..a954f98aa5fe94342c3bc7857ed0d782926bb006 100644 --- a/lib_dec/hq_lr_dec_fx.c +++ b/lib_dec/hq_lr_dec_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" #include "rom_dec.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /*--------------------------------------------------------------------------* diff --git a/lib_dec/igf_dec.c b/lib_dec/igf_dec.c index c6d72f5d8370a2dbc070f5f9186e347e148c4163..451b7e29b4efbef64de34d96fa653d7b4af8dc7e 100644 --- a/lib_dec/igf_dec.c +++ b/lib_dec/igf_dec.c @@ -44,7 +44,7 @@ #include "ivas_prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_dec/igf_dec_fx.c b/lib_dec/igf_dec_fx.c index cdcdfab1fdf57e279687f11d55683d01b3339bee..c2acb5be50c1ba5aff843b9c2404cd32e3e0f08e 100644 --- a/lib_dec/igf_dec_fx.c +++ b/lib_dec/igf_dec_fx.c @@ -11,8 +11,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "stat_dec.h" #include "basop_util.h" diff --git a/lib_dec/igf_scf_dec_fx.c b/lib_dec/igf_scf_dec_fx.c index b9af11db158cb9d6c6b54ac4ac8f25b90962933e..221b9b7a4981e17944331cf6875eafc25a4bd080 100644 --- a/lib_dec/igf_scf_dec_fx.c +++ b/lib_dec/igf_scf_dec_fx.c @@ -8,8 +8,7 @@ #include #include "options.h" #include "stl.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stat_dec.h" #include "basop_util.h" diff --git a/lib_dec/init_dec.c b/lib_dec/init_dec.c index 3a56b99e54f42c4d30e836e57b91e706890c602e..908738df38be464283726ae416d55ca9a586924e 100644 --- a/lib_dec/init_dec.c +++ b/lib_dec/init_dec.c @@ -40,12 +40,9 @@ #include "ivas_cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/init_dec_fx.c b/lib_dec/init_dec_fx.c index ba95b6933bb73c2db66eaaaee5f4ae21f4104ac6..05cda5a462822b22c9dfaac3233946b827832b4e 100644 --- a/lib_dec/init_dec_fx.c +++ b/lib_dec/init_dec_fx.c @@ -3,8 +3,7 @@ ====================================================================================*/ #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ #include "stl.h" /* required for wmc_tool */ diff --git a/lib_dec/inov_dec.c b/lib_dec/inov_dec.c index ad5df5d4abeb3af4c0e97ea076c7895c633c2a7d..03831b28c66bf4eb251d370c71328bafb4d3a8a3 100644 --- a/lib_dec/inov_dec.c +++ b/lib_dec/inov_dec.c @@ -38,7 +38,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "rom_com.h" #include "wmc_auto.h" diff --git a/lib_dec/inov_dec_fx.c b/lib_dec/inov_dec_fx.c index 24c82e20ae7ad543f189a81c92c62b648bae2ca5..b917241253b12533b67ac9dd63d4aa4d43df4f4c 100644 --- a/lib_dec/inov_dec_fx.c +++ b/lib_dec/inov_dec_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED /*======================================================================*/ /* FUNCTION : inov_decode_fx() */ diff --git a/lib_dec/ivas_agc_dec_fx.c b/lib_dec/ivas_agc_dec_fx.c index 2bf3ad9ca4c121a92fcf8237d012f7bdd187bc24..26aad59c178910ac2b7c85a4cf5935e7690e59ce 100644 --- a/lib_dec/ivas_agc_dec_fx.c +++ b/lib_dec/ivas_agc_dec_fx.c @@ -35,7 +35,7 @@ #ifdef IVAS_FLOAT_FIXED #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 0f92acf2d646b5745ec95ebf22170e1dc2bffd0e..191bea1c1f3ea81f26707ade0e327fb09f84b58d 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -44,8 +44,7 @@ #include "ivas_rom_binauralRenderer.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com_fx.h" #include "debug.h" #endif diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c index 1ef2e9d41b01c59c18f734d194a1e244ae714e88..9d2aa6d7e64a0294a02fa4ac858b3d60a5a62580 100644 --- a/lib_dec/ivas_core_dec.c +++ b/lib_dec/ivas_core_dec.c @@ -42,8 +42,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig.c index ccb39cadf82506a8dc582450739dc44dadeb7c58..a66795dcad96ef72f5c90c980f12fa6671f273e2 100644 --- a/lib_dec/ivas_corecoder_dec_reconfig.c +++ b/lib_dec/ivas_corecoder_dec_reconfig.c @@ -35,8 +35,7 @@ #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED #include "prot.h" #include diff --git a/lib_dec/ivas_cpe_dec.c b/lib_dec/ivas_cpe_dec.c index 4faab3eb7afb2021d00e358d8f3fcfe0aaf80e87..f0e4bfeceee5d2622d72aad2f5a6a3f2dcd5f41e 100644 --- a/lib_dec/ivas_cpe_dec.c +++ b/lib_dec/ivas_cpe_dec.c @@ -38,7 +38,7 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com.h" #include "wmc_auto.h" #include diff --git a/lib_dec/ivas_cpe_dec_fx.c b/lib_dec/ivas_cpe_dec_fx.c index 1a97e84b55d1499a5e742520544b7e6d5b679109..a246eb92fa387b757772c8e0959faf6fb6a4551b 100644 --- a/lib_dec/ivas_cpe_dec_fx.c +++ b/lib_dec/ivas_cpe_dec_fx.c @@ -40,8 +40,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com.h" #include "wmc_auto.h" #include diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c index ae75fcf2f8f3742fb83ff8a74cc246e896e208e2..2d84e7604b3c3039f867316da6c2aa557b3cbe2a 100644 --- a/lib_dec/ivas_dirac_dec.c +++ b/lib_dec/ivas_dirac_dec.c @@ -36,8 +36,6 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_cnst.h" @@ -46,8 +44,7 @@ #include "ivas_rom_rend.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "ivas_rom_com_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/ivas_dirac_output_synthesis_cov.c b/lib_dec/ivas_dirac_output_synthesis_cov.c index c11dda7ccb99db4414f70fc1982705e6e8030985..10660be2da70d3f5c6291bb9fc9bc4cb8b4c20ad 100644 --- a/lib_dec/ivas_dirac_output_synthesis_cov.c +++ b/lib_dec/ivas_dirac_output_synthesis_cov.c @@ -49,8 +49,7 @@ #include "wmc_auto.h" #include "rom_dec.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 6119dde7d693c9cf41ab4aefc65f9c78ae850f58..1933244149a047f08339d249e83200043c5b79e2 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -42,8 +42,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec.c index 5a62afa9e8fc96123b51f112835a69cc694ffbdb..71a9514d80f817532a53f20685f92ae3b9945d1c 100644 --- a/lib_dec/ivas_ism_dec.c +++ b/lib_dec/ivas_ism_dec.c @@ -39,7 +39,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED #define IVAS_FLOAT_FIXED_TO_BE_REMOVED diff --git a/lib_dec/ivas_ism_dtx_dec.c b/lib_dec/ivas_ism_dtx_dec.c index d891ccfca096e34bf057139b00a8e8fb4fa22439..7a14947649abfb8232e30f4215723c0ef850f471 100644 --- a/lib_dec/ivas_ism_dtx_dec.c +++ b/lib_dec/ivas_ism_dtx_dec.c @@ -39,7 +39,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*-------------------------------------------------------------------* diff --git a/lib_dec/ivas_ism_metadata_dec.c b/lib_dec/ivas_ism_metadata_dec.c index 2c2e61b706c47d04bfd75267703a698c86ed39dc..e28a1214aef41047542358984d574657b9bec2ac 100644 --- a/lib_dec/ivas_ism_metadata_dec.c +++ b/lib_dec/ivas_ism_metadata_dec.c @@ -38,8 +38,7 @@ #include "ivas_rom_com.h" #include "ivas_rom_com_fx.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_stat_enc.h" #include #include "wmc_auto.h" diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec.c index 5aad9690891f0cf79279c00a0935fbc8d1747c98..3f1cfbd1fffb171c46f7b880c415b0378330d5b0 100644 --- a/lib_dec/ivas_ism_param_dec.c +++ b/lib_dec/ivas_ism_param_dec.c @@ -41,8 +41,7 @@ #include "ivas_rom_dec.h" #include "wmc_auto.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_dec/ivas_ism_renderer.c b/lib_dec/ivas_ism_renderer.c index 11fd356f45bf05d2bd6c20793b86f5652a1dedf3..7950e6db5d308a27e3753be85c1c5daa211cd8ef 100644 --- a/lib_dec/ivas_ism_renderer.c +++ b/lib_dec/ivas_ism_renderer.c @@ -34,8 +34,7 @@ #include "options.h" #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_prot_rend.h" diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 85963d37179ce3936ae6831a66ec1c2ad73d20bf..42605102d49f808fde851cef2c99daa509b75f85 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -46,8 +46,7 @@ #ifdef DUMPS_ENABLED #include "debug.h" #endif // DUMPS_ENABLED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define float_to_fixed( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fixed_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_dec/ivas_lfe_dec_fx.c b/lib_dec/ivas_lfe_dec_fx.c index f615bbd1ea4f1b8c5e8b8c3d52dfae635b6dc4b4..775535614d42349a64ab1695f074b4d5400e257a 100644 --- a/lib_dec/ivas_lfe_dec_fx.c +++ b/lib_dec/ivas_lfe_dec_fx.c @@ -34,8 +34,7 @@ #include "options.h" #ifdef IVAS_FLOAT_FIXED #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_rom_com.h" diff --git a/lib_dec/ivas_lfe_plc_fx.c b/lib_dec/ivas_lfe_plc_fx.c index f878ecf160870d1d3e5b1e52714542574fb13590..6a65839b8cfcaa72b7c3eec8e7e5de5376025641 100644 --- a/lib_dec/ivas_lfe_plc_fx.c +++ b/lib_dec/ivas_lfe_plc_fx.c @@ -33,8 +33,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include diff --git a/lib_dec/ivas_ls_custom_dec.c b/lib_dec/ivas_ls_custom_dec.c index 86414d84aa5a00f78af2850cba6cc9e7b208c1e8..f87889e277889811a5936e0953f3e3f8fc96e11a 100644 --- a/lib_dec/ivas_ls_custom_dec.c +++ b/lib_dec/ivas_ls_custom_dec.c @@ -36,7 +36,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" +#include "prot_fx.h" #endif diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c index 9dff654ad4a07533fe3a8cf8f0f419f2d65373ce..78aa9867bd6e2a2ce5200ce43373c70c391be0cc 100644 --- a/lib_dec/ivas_masa_dec.c +++ b/lib_dec/ivas_masa_dec.c @@ -39,12 +39,9 @@ #include "ivas_rom_com.h" #include "ivas_stat_dec.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_prot_fx.h" #include "ivas_rom_com_fx.h" diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec.c index 4887ffa129dc46b1b7ac49c67f3eaa7af8158990..57210b2cb4941678de107bcc821879bfb7ea3235 100644 --- a/lib_dec/ivas_mc_param_dec.c +++ b/lib_dec/ivas_mc_param_dec.c @@ -46,8 +46,7 @@ #include "wmc_auto.h" #include "rom_dec.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED #endif diff --git a/lib_dec/ivas_mc_paramupmix_dec.c b/lib_dec/ivas_mc_paramupmix_dec.c index 9b35fb7c9265eac624fb4bc1ad3bfd828f990fb5..246e81643a1061e6ab5aa54461d3c597afd10eb2 100644 --- a/lib_dec/ivas_mc_paramupmix_dec.c +++ b/lib_dec/ivas_mc_paramupmix_dec.c @@ -35,10 +35,8 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif #include "ivas_prot.h" diff --git a/lib_dec/ivas_mct_core_dec.c b/lib_dec/ivas_mct_core_dec.c index 7bd948ad61cab35a479d5e6fee8bb08eb28ac0b7..cc014dd76ebd112cfa75b0eb5c741ffe1e460f99 100644 --- a/lib_dec/ivas_mct_core_dec.c +++ b/lib_dec/ivas_mct_core_dec.c @@ -43,8 +43,7 @@ #include "ivas_stat_dec.h" #include "ivas_stat_com.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c index d83e28576745ebc078c32d1a3f3dde2ce1092ce3..34ab57de5becca1d57cec2ab3f71f2e26cb74f00 100644 --- a/lib_dec/ivas_mct_dec.c +++ b/lib_dec/ivas_mct_dec.c @@ -37,14 +37,13 @@ #include "cnst.h" #include "ivas_cnst.h" #include "rom_com.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_mct_dec_mct_fx.c b/lib_dec/ivas_mct_dec_mct_fx.c index 83c66b62e8284cda2b9309aadfaa25ec397a8f8a..29685d898c85cf9c9c892823571a64189ed0b5af 100644 --- a/lib_dec/ivas_mct_dec_mct_fx.c +++ b/lib_dec/ivas_mct_dec_mct_fx.c @@ -39,8 +39,7 @@ #include #include "stat_enc.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" /*----------------------------------------------------------* diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index 4cb343648d9810b9ab781bb0dad857351d47a0ce..36c68e3cf4507ca86365653cea5ea4e3844df257 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -45,10 +45,8 @@ #include "ivas_stat_com.h" #include #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_mono_dmx_renderer.c b/lib_dec/ivas_mono_dmx_renderer.c index 892298f1c8c9164f55a6a0cfd1ab241faccff4e5..fabd897f50f26fb2238b9deecbc18ad7d80e39ae 100644 --- a/lib_dec/ivas_mono_dmx_renderer.c +++ b/lib_dec/ivas_mono_dmx_renderer.c @@ -35,8 +35,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_cnst.h" diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c index 51cf795b303fa6f2ffc22221f33c24c7be52f648..d6f965c8fc206980724099fb5392bc21c76983b9 100644 --- a/lib_dec/ivas_objectRenderer_internal.c +++ b/lib_dec/ivas_objectRenderer_internal.c @@ -40,8 +40,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #endif diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c index f376e8d7e1e6e27f4ac2b0b2937efe19a2cb1474..bc136eb1a8586a8be89073c19a800161ba8355da 100644 --- a/lib_dec/ivas_omasa_dec.c +++ b/lib_dec/ivas_omasa_dec.c @@ -40,7 +40,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "math.h" // temporary (for fabs) #endif diff --git a/lib_dec/ivas_osba_dec.c b/lib_dec/ivas_osba_dec.c index 47d3ee5ecc40b43dcf532124695eb249b1b6ce39..4b9951065695502679ba43dc60d7b6628c75e4ac 100644 --- a/lib_dec/ivas_osba_dec.c +++ b/lib_dec/ivas_osba_dec.c @@ -40,8 +40,7 @@ #include "wmc_auto.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_out_setup_conversion.c b/lib_dec/ivas_out_setup_conversion.c index 60f3f81580c673743f0dc80c52e491de03e3a666..505b6797f5fe9751570e6a4cedc6aad462b119df 100644 --- a/lib_dec/ivas_out_setup_conversion.c +++ b/lib_dec/ivas_out_setup_conversion.c @@ -41,8 +41,7 @@ #include "ivas_rom_rend.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/ivas_pca_dec_fx.c b/lib_dec/ivas_pca_dec_fx.c index 40052469b6fd0d01719718c35de10cfc0c8f8fb7..7dd2e334c09251ae4c900102458e07e262057dd4 100644 --- a/lib_dec/ivas_pca_dec_fx.c +++ b/lib_dec/ivas_pca_dec_fx.c @@ -38,7 +38,7 @@ #include #include "ivas_cnst.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "math.h" /*-----------------------------------------------------------------------* diff --git a/lib_dec/ivas_post_proc.c b/lib_dec/ivas_post_proc.c index 694bc53201e4d7faee0fa1d3ddf552b1f9e94375..c2decb8c5bbee17c0a16a746efa079ee5bc85af2 100644 --- a/lib_dec/ivas_post_proc.c +++ b/lib_dec/ivas_post_proc.c @@ -36,8 +36,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_cnst.h" diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c index 7332f26f16b6c4f76311d2960c8b87d0d122c3aa..c80e1dbfb4f1d40c4d7866d55cf5b06784bf927d 100644 --- a/lib_dec/ivas_qmetadata_dec.c +++ b/lib_dec/ivas_qmetadata_dec.c @@ -41,8 +41,7 @@ #include "wmc_auto.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index 336155665d291ee8fddbc381d233f51ad34acc46..5bc296fbc0de476a673de5cef56cda0408153fc1 100644 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -43,7 +43,7 @@ #include #include "wmc_auto.h" #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * ivas_sba_set_cna_cng_flag() * diff --git a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c index 2ad1c081be820629d4cf4f70e67a010578aaf974..16e93aeb6856b6e6a466d8d268302b9eb8f7cb7d 100644 --- a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c +++ b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c @@ -34,8 +34,7 @@ #include "options.h" #include "cnst.h" #include "ivas_cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_rom_com.h" diff --git a/lib_dec/ivas_sba_rendering_internal.c b/lib_dec/ivas_sba_rendering_internal.c index 19113a09ae1141b8d11189c980271e7e7c825090..5a2ee5c77466665375c43b5d612f2b87b8d6ad0c 100644 --- a/lib_dec/ivas_sba_rendering_internal.c +++ b/lib_dec/ivas_sba_rendering_internal.c @@ -41,7 +41,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED #ifdef DUMPS_ENABLED #include "debug.h" diff --git a/lib_dec/ivas_sce_dec.c b/lib_dec/ivas_sce_dec.c index 7c30d30328c77caebe7c29333fbffaa7935ccb1d..8c2ee04ba43e3e3ce1b7f2faace2505513451799 100644 --- a/lib_dec/ivas_sce_dec.c +++ b/lib_dec/ivas_sce_dec.c @@ -37,8 +37,7 @@ #include "ivas_cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include "wmc_auto.h" diff --git a/lib_dec/ivas_sce_dec_fx.c b/lib_dec/ivas_sce_dec_fx.c index 5976c81a3a88482b52a6676d923bb420de5889a0..8e1b5d1403e04fddcf4ca94196ae8688709f2d04 100644 --- a/lib_dec/ivas_sce_dec_fx.c +++ b/lib_dec/ivas_sce_dec_fx.c @@ -38,8 +38,7 @@ #include "ivas_cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_rom_com.h" diff --git a/lib_dec/ivas_sns_dec_fx.c b/lib_dec/ivas_sns_dec_fx.c index f240029b3e17df8949b83c1379a700dee9283459..ff96b6c0611fd85938f3069d9f47b21a1d8f9c2c 100644 --- a/lib_dec/ivas_sns_dec_fx.c +++ b/lib_dec/ivas_sns_dec_fx.c @@ -40,8 +40,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" #endif diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c index 416ac4f73a399e0d174eb5e407273d5c7e6f61ad..00707479602cdf84254759f4343e31c3ffca1f33 100644 --- a/lib_dec/ivas_spar_decoder.c +++ b/lib_dec/ivas_spar_decoder.c @@ -34,7 +34,6 @@ #include "options.h" #include "ivas_stat_dec.h" #include "prot.h" -#include "prot_fx2.h" #include "string.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" @@ -46,8 +45,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED #ifdef DUMPS_ENABLED diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c index 1a894ce10b51e9a99a1136680712b875ddadc2f1..bf72059f0588df7492ce4c3ca519334c7a89acd6 100644 --- a/lib_dec/ivas_spar_md_dec.c +++ b/lib_dec/ivas_spar_md_dec.c @@ -34,15 +34,13 @@ #include "options.h" #include "math.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include #include "wmc_auto.h" #include "ivas_stat_dec.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_stereo_cng_dec.c b/lib_dec/ivas_stereo_cng_dec.c index eef15da050f8a7f79d22764727a218738abb08b4..50603a381ef164ff9137ea5bf36fae8bcd2213be 100644 --- a/lib_dec/ivas_stereo_cng_dec.c +++ b/lib_dec/ivas_stereo_cng_dec.c @@ -41,8 +41,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_dec/ivas_stereo_dft_dec.c b/lib_dec/ivas_stereo_dft_dec.c index c9bf60ddf43750024ea1abaaddb49327fd9b5d14..09fc9f2fd95b16876554ac6c29924ceeeb83b250 100644 --- a/lib_dec/ivas_stereo_dft_dec.c +++ b/lib_dec/ivas_stereo_dft_dec.c @@ -38,7 +38,7 @@ #include "rom_com.h" #include "rom_dec.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" diff --git a/lib_dec/ivas_stereo_dft_dec_dmx.c b/lib_dec/ivas_stereo_dft_dec_dmx.c index 7250baa6b8fedfb20fe93dbf2b596a554cc0da55..bacc5a0abdaba8f318a3fafcb150bb3a67cf0e35 100644 --- a/lib_dec/ivas_stereo_dft_dec_dmx.c +++ b/lib_dec/ivas_stereo_dft_dec_dmx.c @@ -44,8 +44,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #endif diff --git a/lib_dec/ivas_stereo_dft_dec_fx.c b/lib_dec/ivas_stereo_dft_dec_fx.c index 52fc6e26c5664cc876eae827c3cf06ce65159c88..ea5f56998f8a86861153efe1993b69a1c6b4e234 100644 --- a/lib_dec/ivas_stereo_dft_dec_fx.c +++ b/lib_dec/ivas_stereo_dft_dec_fx.c @@ -38,7 +38,7 @@ #include "rom_com.h" #include "rom_dec.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_cnst.h" @@ -49,7 +49,6 @@ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #include "basop_util.h" -#include "prot_fx1.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_dec/ivas_stereo_dft_plc_fx.c b/lib_dec/ivas_stereo_dft_plc_fx.c index 5abf182fe903c9abefabe8efe7ed1641836ac2d7..e0cd69ef6f5d22cc03908bec7b40616ea8130326 100644 --- a/lib_dec/ivas_stereo_dft_plc_fx.c +++ b/lib_dec/ivas_stereo_dft_plc_fx.c @@ -34,8 +34,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" diff --git a/lib_dec/ivas_stereo_ica_dec.c b/lib_dec/ivas_stereo_ica_dec.c index 62bbbcdda0c06825f3d650ac32da86ab0e3e05fc..e96f22c03dee22d9fbeec2842ad8a3de81c12cc3 100644 --- a/lib_dec/ivas_stereo_ica_dec.c +++ b/lib_dec/ivas_stereo_ica_dec.c @@ -41,7 +41,7 @@ #include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "basop32.h" #include "ivas_stat_dec.h" diff --git a/lib_dec/ivas_stereo_icbwe_dec.c b/lib_dec/ivas_stereo_icbwe_dec.c index ca3159f3e576f1456bb7ba9781a9a6b805b8d28c..95d43ad4816d120ba38d701f8ccdd8e2df75ecee 100644 --- a/lib_dec/ivas_stereo_icbwe_dec.c +++ b/lib_dec/ivas_stereo_icbwe_dec.c @@ -37,8 +37,7 @@ #include "cnst.h" #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "wmc_auto.h" diff --git a/lib_dec/ivas_stereo_mdct_core_dec.c b/lib_dec/ivas_stereo_mdct_core_dec.c index de1bb794dd505d605881f6a9e68037a83fe7d69b..6a3638bfc9707b2acaee4b2245c912ea57add13f 100644 --- a/lib_dec/ivas_stereo_mdct_core_dec.c +++ b/lib_dec/ivas_stereo_mdct_core_dec.c @@ -41,7 +41,7 @@ #include "ivas_stat_dec.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_stereo_mdct_core_dec_fx.c b/lib_dec/ivas_stereo_mdct_core_dec_fx.c index 88b25b872c2d102c3f5cba574d55ec96fe382443..078c8957dac78eb0d8cfc1d02456b57d676bef75 100644 --- a/lib_dec/ivas_stereo_mdct_core_dec_fx.c +++ b/lib_dec/ivas_stereo_mdct_core_dec_fx.c @@ -41,8 +41,7 @@ #include "ivas_prot.h" #include "ivas_stat_dec.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" /*------------------------------------------------------------------------- diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c index d88e311983b3e558895942f6a8f93f3fedce3bb1..9177bf69ca1653f7e7aa2b9923d5744a05cb8e0c 100644 --- a/lib_dec/ivas_stereo_mdct_stereo_dec.c +++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c @@ -39,8 +39,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/ivas_stereo_switching_dec.c b/lib_dec/ivas_stereo_switching_dec.c index c1c049cbd04921d9827f46745f024c0d4ac788fd..774c1a8e0e87cad6166faba54992555acb7acdf9 100644 --- a/lib_dec/ivas_stereo_switching_dec.c +++ b/lib_dec/ivas_stereo_switching_dec.c @@ -35,17 +35,15 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_rom_com.h" #include "assert.h" #include "wmc_auto.h" #include -#include "prot_fx2.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED +#include "prot_fx.h" #include "ivas_rom_com_fx.h" #endif diff --git a/lib_dec/ivas_stereo_td_dec.c b/lib_dec/ivas_stereo_td_dec.c index 83b6d67a4c76ec863b09bab8bc2f53f55653f900..79eac072c051164d0c788e9aec19d4adf75011b4 100644 --- a/lib_dec/ivas_stereo_td_dec.c +++ b/lib_dec/ivas_stereo_td_dec.c @@ -36,8 +36,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include "ivas_cnst.h" diff --git a/lib_dec/ivas_svd_dec.c b/lib_dec/ivas_svd_dec.c index 5d5ccedb474d46e4e97279b77ee682e79610d745..9156aa7180b1b50b99c907d55a22652226c227b9 100644 --- a/lib_dec/ivas_svd_dec.c +++ b/lib_dec/ivas_svd_dec.c @@ -38,8 +38,7 @@ #include "ivas_cnst.h" #include #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------* diff --git a/lib_dec/ivas_tcx_core_dec.c b/lib_dec/ivas_tcx_core_dec.c index d51543302e0a607c2c57c0e22047e2d42f8510bf..922f6e3694a411ae92e9be5d4ab0ffa6d934f555 100644 --- a/lib_dec/ivas_tcx_core_dec.c +++ b/lib_dec/ivas_tcx_core_dec.c @@ -35,14 +35,13 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx1.h" #include "rom_com.h" #include "stat_dec.h" #include "wmc_auto.h" #include "basop_proto_func.h" #include "stat_com.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" /*-------------------------------------------------------------* diff --git a/lib_dec/ivas_td_low_rate_dec.c b/lib_dec/ivas_td_low_rate_dec.c index bdaa26ebca3b5bf947c76d849c72fd90a446e73d..e1eaca3d3256429b99fcf3f9ac68f86add0fb6c2 100644 --- a/lib_dec/ivas_td_low_rate_dec.c +++ b/lib_dec/ivas_td_low_rate_dec.c @@ -38,8 +38,7 @@ #include "ivas_rom_com.h" #include "ivas_cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "wmc_auto.h" #ifndef IVAS_FLOAT_FIXED diff --git a/lib_dec/jbm_jb4sb.c b/lib_dec/jbm_jb4sb.c index 095868940e00d996e48074206d998467f79ce11e..394452fb8bbd5b8b5d1d6f5836fc0cbb3e018d5e 100644 --- a/lib_dec/jbm_jb4sb.c +++ b/lib_dec/jbm_jb4sb.c @@ -49,7 +49,7 @@ #include "jbm_jb4_jmf.h" #include "jbm_jb4sb.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define WMC_TOOL_SKIP #define INV_500_Q31 4294967 /*1/500 IN Q_31*/ diff --git a/lib_dec/jbm_pcmdsp_apa.c b/lib_dec/jbm_pcmdsp_apa.c index 72e57c5b5bb1094b96a7275a7c3609870826063d..9e11f8085aa8b436e9e9da6a671a3e72dd197e26 100644 --- a/lib_dec/jbm_pcmdsp_apa.c +++ b/lib_dec/jbm_pcmdsp_apa.c @@ -54,7 +54,7 @@ #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #define INV_100_Q15 328 #define INV_400_Q15 82 #define INV_80_Q15 410 diff --git a/lib_dec/lead_deindexing_fx.c b/lib_dec/lead_deindexing_fx.c index 2e9ea383f9e968291a44d88b8e2e04c663d1aded..80508277f5bf2e0d84c14e7856d75dfa056cdd85 100644 --- a/lib_dec/lead_deindexing_fx.c +++ b/lib_dec/lead_deindexing_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" #include "rom_com.h" #include "rom_dec.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * Local function prototype diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 2b66b10845fe6656680aae962027b4444a0b7d2a..44e0c0770c93204b79fbb9041e1cb69385f3cdcf 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -36,8 +36,7 @@ #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "jbm_jb4sb.h" #include "jbm_pcmdsp_apa.h" #include "jbm_pcmdsp_fifo.h" diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c index 900aa4d5413fdb8c1594eb79a795485eae8d0d3f..c2b52ecd1fd68db8f6e4207c3ef580c54f8bc020 100644 --- a/lib_dec/lib_dec_fx.c +++ b/lib_dec/lib_dec_fx.c @@ -36,8 +36,7 @@ #include "ivas_prot_rend.h" #include "prot.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "jbm_jb4sb.h" #include "jbm_pcmdsp_apa.h" #include "jbm_pcmdsp_fifo.h" diff --git a/lib_dec/lp_exc_d_fx.c b/lib_dec/lp_exc_d_fx.c index 40318b376206ce1c9ff0a02eee4e89cb701247fa..76d4b4676e0577a8424a7f8232076b5a02c41a89 100644 --- a/lib_dec/lp_exc_d_fx.c +++ b/lib_dec/lp_exc_d_fx.c @@ -3,10 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ /*======================================================================*/ /* FUNCTION : lp_filt_exc_dec_fx() */ diff --git a/lib_dec/lsf_dec.c b/lib_dec/lsf_dec.c index 2fb00b693aa48b4b70326384d4a4736bb07a91db..0628ccd33da84a4ccb9aa00ee1fffd99ba07e3a1 100644 --- a/lib_dec/lsf_dec.c +++ b/lib_dec/lsf_dec.c @@ -39,7 +39,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_proto_func.h" #include "ivas_prot.h" #include "ivas_rom_com.h" diff --git a/lib_dec/lsf_dec_fx.c b/lib_dec/lsf_dec_fx.c index 4ac20d1e60a4b6f09f230eed09c36a0aef51ea54..5db4869995bff9c3f434939cd3c46f4e6ba42435 100644 --- a/lib_dec/lsf_dec_fx.c +++ b/lib_dec/lsf_dec_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #if defined LSF_RE_USE_SECONDARY_CHANNEL || defined FIX_798_LSF_SECONDARY_CH_MISSING_CODE #include "ivas_prot.h" //#include "ivas_rom_com.h" diff --git a/lib_dec/lsf_msvq_ma_dec_fx.c b/lib_dec/lsf_msvq_ma_dec_fx.c index a8fb91fe3f082956c035f87ef579552ba4fe666e..3fc69d5884f1afe86b4e685e25e226274d678606 100644 --- a/lib_dec/lsf_msvq_ma_dec_fx.c +++ b/lib_dec/lsf_msvq_ma_dec_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_dec/nelp_dec_fx.c b/lib_dec/nelp_dec_fx.c index 418e74bcb324270c19ba0f227ea82e6f4f37b405..6943e0b82a35fbf7dad72d7a1972c2fbbe0b3fb6 100644 --- a/lib_dec/nelp_dec_fx.c +++ b/lib_dec/nelp_dec_fx.c @@ -3,9 +3,8 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /*===================================================================*/ diff --git a/lib_dec/peak_vq_dec_fx.c b/lib_dec/peak_vq_dec_fx.c index 356592067242d58d2c2e93425e99c7a755d66082..a23ff76b41accf67bbd4fed1e4cc0c9924a78f3c 100644 --- a/lib_dec/peak_vq_dec_fx.c +++ b/lib_dec/peak_vq_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "enh64.h" diff --git a/lib_dec/pit_dec_fx.c b/lib_dec/pit_dec_fx.c index faa3cb2d3e52c9a4ed18c86c925bc3305556cdb6..f99c8ac16fba3786da924733a214432c14a7d29f 100644 --- a/lib_dec/pit_dec_fx.c +++ b/lib_dec/pit_dec_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #define inv_T0_res InvIntTable diff --git a/lib_dec/pitch_extr_fx.c b/lib_dec/pitch_extr_fx.c index 2e327938e63039f54bb599d6d2953ffcd91c527c..9b42a9b576a2a44e7dc711d03f8f249bed584d4f 100644 --- a/lib_dec/pitch_extr_fx.c +++ b/lib_dec/pitch_extr_fx.c @@ -7,8 +7,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" diff --git a/lib_dec/post_dec_fx.c b/lib_dec/post_dec_fx.c index e6e4fffa4f166ad3f3b665a757377cb87505a0a9..071bc51886135681fde867ec44e9a3095d6a600e 100644 --- a/lib_dec/post_dec_fx.c +++ b/lib_dec/post_dec_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_dec/ppp_dec_fx.c b/lib_dec/ppp_dec_fx.c index 1f0f485df99333152f2fe11ebfedc6b86e402da9..275229e36d0cfe308e8d0b866f8b6e4c68909b56 100644 --- a/lib_dec/ppp_dec_fx.c +++ b/lib_dec/ppp_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /*===================================================================*/ diff --git a/lib_dec/pvq_core_dec_fx.c b/lib_dec/pvq_core_dec_fx.c index 65f94c31742942cdea1ffa76a2a713a1fc5bdabd..cf904fac67d7c8b4920f6946e7b860d9a2a23c0c 100644 --- a/lib_dec/pvq_core_dec_fx.c +++ b/lib_dec/pvq_core_dec_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_dec/pvq_decode_fx.c b/lib_dec/pvq_decode_fx.c index 1ae7b0988433d98d4cd1b43a63709103b0fc5d9d..24aa0cfac335eadccd4b666f93925e8481083323 100644 --- a/lib_dec/pvq_decode_fx.c +++ b/lib_dec/pvq_decode_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/range_dec_fx.c b/lib_dec/range_dec_fx.c index 440137a9595fdf8b0a330add1285fb992ccf5bdd..a516258921bce4ca826be375b0384e0074866ea8 100644 --- a/lib_dec/range_dec_fx.c +++ b/lib_dec/range_dec_fx.c @@ -3,11 +3,10 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_dec/re8_dec_fx.c b/lib_dec/re8_dec_fx.c index e1177d1ec19595a381976fe446d638ef100a1386..e6c35e29339fc8dc0f9080434b1ab8ed19f6f9e9 100644 --- a/lib_dec/re8_dec_fx.c +++ b/lib_dec/re8_dec_fx.c @@ -3,9 +3,8 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------------- * re8_dec_fx() diff --git a/lib_dec/rst_dec_fx.c b/lib_dec/rst_dec_fx.c index a4810115b23a880ded13935e3c241b43dffcae4a..50aa1b9068f66daeaafbc8cf25e9e16ecb29e42b 100644 --- a/lib_dec/rst_dec_fx.c +++ b/lib_dec/rst_dec_fx.c @@ -4,10 +4,9 @@ #include "options.h" /* Compilation switches */ #include "stl.h" -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*----------------------------------------------------------------------------------* * CNG_reset_dec() diff --git a/lib_dec/stat_noise_uv_dec_fx.c b/lib_dec/stat_noise_uv_dec_fx.c index b3c6998b6db95a0306842b792e7c758f0da3a28d..651fb179e169d46c5484ed3413496eef34f48c11 100644 --- a/lib_dec/stat_noise_uv_dec_fx.c +++ b/lib_dec/stat_noise_uv_dec_fx.c @@ -3,9 +3,8 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ /*---------------------------------------------------------* diff --git a/lib_dec/swb_bwe_dec.c b/lib_dec/swb_bwe_dec.c index f2b096d725929ed1ef77db77b70e52c5750b0b16..a1b61cdc6e464411339b146ddeaa6ca58d1e600d 100644 --- a/lib_dec/swb_bwe_dec.c +++ b/lib_dec/swb_bwe_dec.c @@ -39,14 +39,13 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "basop_util.h" #include "basop_proto_func.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" #endif // IVAS_FLOAT_FIXED #ifndef IVAS_FLOAT_FIXED diff --git a/lib_dec/swb_bwe_dec_fx.c b/lib_dec/swb_bwe_dec_fx.c index 742706db389313627d88c363c2b921208e470516..4b172de7bf8a7abe9b3931954172befa488118f3 100644 --- a/lib_dec/swb_bwe_dec_fx.c +++ b/lib_dec/swb_bwe_dec_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "rom_enc.h" #include "ivas_prot_fx.h" diff --git a/lib_dec/swb_bwe_dec_hr.c b/lib_dec/swb_bwe_dec_hr.c index 5d090e7088ccab3ec7ab946dd07d6e71eed2062c..1332bec6043bf51c1e74dd34ae23bc06ac862875 100644 --- a/lib_dec/swb_bwe_dec_hr.c +++ b/lib_dec/swb_bwe_dec_hr.c @@ -41,7 +41,7 @@ #include "rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED /*-------------------------------------------------------------------* diff --git a/lib_dec/swb_bwe_dec_hr_fx.c b/lib_dec/swb_bwe_dec_hr_fx.c index ed6ed4ae62d40f1cdbe3ffe83fb7ee70d19583b7..2ff8997052470a4cec24577d663fecfcc226d016 100644 --- a/lib_dec/swb_bwe_dec_hr_fx.c +++ b/lib_dec/swb_bwe_dec_hr_fx.c @@ -2,12 +2,11 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ -#include "rom_com.h" /* Static table prototypes */ -#include "rom_dec.h" /* Static table prototypes */ -#include "cnst.h" /* Static table prototypes */ +#include "options.h" /* Compilation switches */ +#include "prot_fx.h" /* Function prototypes */ +#include "rom_com.h" /* Static table prototypes */ +#include "rom_dec.h" /* Static table prototypes */ +#include "cnst.h" /* Static table prototypes */ #define Q_GUARD 1 #define Q_32_BITS 14 /* scaling of 't_audio32' */ diff --git a/lib_dec/swb_bwe_dec_lr_fx.c b/lib_dec/swb_bwe_dec_lr_fx.c index 52c200bc4a97369dfe70d856579e1dd16d1ec16c..485bbe6e2fafcd742a6315fd1bbf9d02765dd507 100644 --- a/lib_dec/swb_bwe_dec_lr_fx.c +++ b/lib_dec/swb_bwe_dec_lr_fx.c @@ -4,8 +4,7 @@ #include "options.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/swb_tbe_dec.c b/lib_dec/swb_tbe_dec.c index 613e82b3f007487001a7f8d04985c4bf01a662ec..0bd0bb8b79f287afeb4a78a83a9d58fcde5c1352 100644 --- a/lib_dec/swb_tbe_dec.c +++ b/lib_dec/swb_tbe_dec.c @@ -39,8 +39,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "rom_dec.h" #include "wmc_auto.h" diff --git a/lib_dec/swb_tbe_dec_fx.c b/lib_dec/swb_tbe_dec_fx.c index 333361cc8b0042ebf4805193b4188de398e17d6c..330156ce0ce4967963001e9d10015f6c368d02c4 100644 --- a/lib_dec/swb_tbe_dec_fx.c +++ b/lib_dec/swb_tbe_dec_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_dec.h" #include "stl.h" diff --git a/lib_dec/syn_outp_fx.c b/lib_dec/syn_outp_fx.c index 67399e2dd2e1b6c3ce32debe490a94eb52cd3d1e..0cdf219731e787f98811661b847a02f8d4bf9947 100644 --- a/lib_dec/syn_outp_fx.c +++ b/lib_dec/syn_outp_fx.c @@ -3,10 +3,9 @@ ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Debug prototypes */ -#include "prot_fx2.h" /* Debug prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Debug prototypes */ /*-------------------------------------------------------------------* * syn_output() diff --git a/lib_dec/tcq_core_dec_fx.c b/lib_dec/tcq_core_dec_fx.c index 0e3fa5f90340e3f81664983aa5e54bb454f94291..fcfe057ba00daec6e63e55f6845695eb5412d7b4 100644 --- a/lib_dec/tcq_core_dec_fx.c +++ b/lib_dec/tcq_core_dec_fx.c @@ -6,8 +6,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*---------------------------------------------------------------------* * tcq_core_LR_dec() * diff --git a/lib_dec/tcx_utils_dec_fx.c b/lib_dec/tcx_utils_dec_fx.c index 7eb2d7576d44539613040eadf397736733d8aa9d..e6a0dd26200f7157e421ae139e283f2fc27100e2 100644 --- a/lib_dec/tcx_utils_dec_fx.c +++ b/lib_dec/tcx_utils_dec_fx.c @@ -8,8 +8,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_basop_util.h" #include "basop_util.h" #include "rom_com.h" diff --git a/lib_dec/tns_base_dec_fx.c b/lib_dec/tns_base_dec_fx.c index 5ef1756b7df69ef604f2587dc1aa4b66b8b01c0c..0631dad11f99245ea847f9793ed79ebc5f338379 100644 --- a/lib_dec/tns_base_dec_fx.c +++ b/lib_dec/tns_base_dec_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include #include "rom_com.h" diff --git a/lib_dec/tonalMDCTconcealment.c b/lib_dec/tonalMDCTconcealment.c index 8e2097d74fffdc8677b5e7e65e3f44c744d7859f..f3456310ad5232b9c45b87ffca39f7c427f88262 100644 --- a/lib_dec/tonalMDCTconcealment.c +++ b/lib_dec/tonalMDCTconcealment.c @@ -45,8 +45,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_dec/tonalMDCTconcealment_fx.c b/lib_dec/tonalMDCTconcealment_fx.c index 9881d47ec9bd63fb1e6694006432e47ca012f5bf..bccb9ea3f902a59bfcf791feccd29cf8fcad0802 100644 --- a/lib_dec/tonalMDCTconcealment_fx.c +++ b/lib_dec/tonalMDCTconcealment_fx.c @@ -12,8 +12,7 @@ #include "options.h" #include "typedef.h" #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stat_com.h" #include "prot.h" #include "ivas_prot_fx.h" diff --git a/lib_dec/transition_dec_fx.c b/lib_dec/transition_dec_fx.c index 46bb39bf9974d5ae801ec7b5f787f468f3982031..edb86ffd4c1382a4569a3a926497566f0e12c2bd 100644 --- a/lib_dec/transition_dec_fx.c +++ b/lib_dec/transition_dec_fx.c @@ -2,11 +2,10 @@ EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0 ====================================================================================*/ #include -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "stl.h" /*----------------------------------------------------------------------* diff --git a/lib_dec/updt_dec_fx.c b/lib_dec/updt_dec_fx.c index a92130a62da642c24d702f1157b9c1a84bf18036..28de7cca5017ebd0bad10c640f58730424e5ef2a 100644 --- a/lib_dec/updt_dec_fx.c +++ b/lib_dec/updt_dec_fx.c @@ -5,10 +5,9 @@ #include #include #include "options.h" -#include "cnst.h" /* Common constants */ -#include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "cnst.h" /* Common constants */ +#include "rom_com.h" /* Static table prototypes */ +#include "prot_fx.h" /* Function prototypes */ /*-------------------------------------------------------------------* * updt_dec() diff --git a/lib_dec/vlpc_1st_dec_fx.c b/lib_dec/vlpc_1st_dec_fx.c index 5d89a7696b5eeb67746d965cc2fb50cbe2adce0f..1ba7a64d0f188dd92a9a52d528506ac041d2fb1a 100644 --- a/lib_dec/vlpc_1st_dec_fx.c +++ b/lib_dec/vlpc_1st_dec_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" diff --git a/lib_dec/vlpc_2st_dec_fx.c b/lib_dec/vlpc_2st_dec_fx.c index df4d8e53e3def8608ee562b012890035011ab6d3..3aa39e86aa543aa8b5302c1d328a7f3c02912800 100644 --- a/lib_dec/vlpc_2st_dec_fx.c +++ b/lib_dec/vlpc_2st_dec_fx.c @@ -5,8 +5,7 @@ #include #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" //#ifdef DEBUGGING to be removed #include //#endif diff --git a/lib_dec/voiced_dec_fx.c b/lib_dec/voiced_dec_fx.c index e31032d4c867dd8674df277ee930729e1d03254f..a52332fa07db6641a544a0236737a2b329b1dc8a 100644 --- a/lib_dec/voiced_dec_fx.c +++ b/lib_dec/voiced_dec_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "log2.h" diff --git a/lib_dec/waveadjust_fec_dec_fx.c b/lib_dec/waveadjust_fec_dec_fx.c index e7aadde27cd978e085693c2f13d4c2fe571e08f9..095a56bc9a4f980a2172a0e2af3bce3e30a8be1e 100644 --- a/lib_dec/waveadjust_fec_dec_fx.c +++ b/lib_dec/waveadjust_fec_dec_fx.c @@ -6,8 +6,7 @@ #include #include #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "stat_com.h" #include "rom_com.h" diff --git a/lib_enc/ACcontextMapping_enc_fx.c b/lib_enc/ACcontextMapping_enc_fx.c index 62516fe35a8fedda859820bdd7e11da43c2deb6e..11d60b85474b1ce6b8f1858a3168b1d2a863c6e3 100644 --- a/lib_enc/ACcontextMapping_enc_fx.c +++ b/lib_enc/ACcontextMapping_enc_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "basop_util.h" #include "cnst.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" //#include "prot_fx.h" #include "prot_fx_enc.h" diff --git a/lib_enc/FEC_enc_fx.c b/lib_enc/FEC_enc_fx.c index 8338409fb17823162cdde692407fcc0a406a885a..d35f18b61a9dcf5be4bf1727d91abeb852530913 100644 --- a/lib_enc/FEC_enc_fx.c +++ b/lib_enc/FEC_enc_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/SNR_calc_fx.c b/lib_enc/SNR_calc_fx.c index f39bc2b866ab546b5eda0a9cc6a4aa03e1a025be..674467cf4f6b249b5805f5a9865f11aeea324d88 100644 --- a/lib_enc/SNR_calc_fx.c +++ b/lib_enc/SNR_calc_fx.c @@ -6,8 +6,7 @@ #include "options.h" #include "basop_util.h" #include "vad_basop.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_enc.h" #include "rom_com.h" diff --git a/lib_enc/acelp_core_enc.c b/lib_enc/acelp_core_enc.c index d006fa1ea28b15be3fa575afd39cc0422ea3edb3..6b95f3abf0b271f5596519acb9867562a3157c0a 100644 --- a/lib_enc/acelp_core_enc.c +++ b/lib_enc/acelp_core_enc.c @@ -43,7 +43,7 @@ #include "prot.h" #include "ivas_cnst.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include "ivas_rom_com.h" #include "wmc_auto.h" diff --git a/lib_enc/acelp_core_enc_fx.c b/lib_enc/acelp_core_enc_fx.c index c7688e7df6da6e7a01e8d56a03ccf845179e77fa..fb993c10a51e739ace71688e322b774ede7f02e7 100644 --- a/lib_enc/acelp_core_enc_fx.c +++ b/lib_enc/acelp_core_enc_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stat_enc.h" #include "rom_com.h" #include "rom_enc.h" /* Encoder static table prototypes */ diff --git a/lib_enc/acelp_core_switch_enc_fx.c b/lib_enc/acelp_core_switch_enc_fx.c index bda7304c8b3f6179d7f87163cb71950f273d7431..994fe70a946b2db8374247d50cd6022d78c3b9c9 100644 --- a/lib_enc/acelp_core_switch_enc_fx.c +++ b/lib_enc/acelp_core_switch_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/acelp_enc_util_fx.c b/lib_enc/acelp_enc_util_fx.c index 8dde5a31946e9da10aa854ee06f07476adffe9c1..ffdf837c4ee090fe1ff596ceb0a61a9e3395b058 100644 --- a/lib_enc/acelp_enc_util_fx.c +++ b/lib_enc/acelp_enc_util_fx.c @@ -9,8 +9,7 @@ //#include "prot_fx.h" #include "basop_util.h" #include "cnst.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stat_enc.h" #include "rom_com.h" diff --git a/lib_enc/amr_wb_enc_fx.c b/lib_enc/amr_wb_enc_fx.c index 0fd37dd5d010c7ab8341d3931b98a1c3c5e6a72a..b4b011b354ed4bf72c3e811e6a0c5dde5f2658df 100644 --- a/lib_enc/amr_wb_enc_fx.c +++ b/lib_enc/amr_wb_enc_fx.c @@ -10,8 +10,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" diff --git a/lib_enc/analy_lp_fx.c b/lib_enc/analy_lp_fx.c index 51c40ec5ec11dc44f28d8084f864f7912341c2b8..b8582d2710cb861ce71d567486d957e0ce760af2 100644 --- a/lib_enc/analy_lp_fx.c +++ b/lib_enc/analy_lp_fx.c @@ -9,8 +9,7 @@ #include "rom_com.h" /* Static table prototypes */ #include "rom_enc.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/analy_sp_fx.c b/lib_enc/analy_sp_fx.c index fd96bfe4e7b43d590b3f46c4de6d1a8feaa2543c..e23c9b9a5eb4701391cfe37e7c43a7149f6ca0b5 100644 --- a/lib_enc/analy_sp_fx.c +++ b/lib_enc/analy_sp_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" #include "basop_util.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_enc.h" #include "rom_com.h" diff --git a/lib_enc/ari_enc.c b/lib_enc/ari_enc.c index 192479aa6f1f523178f6db9091535f3d9923f383..8481d6c94a0a7228fd23a8b30f264bc622c9d9c5 100644 --- a/lib_enc/ari_enc.c +++ b/lib_enc/ari_enc.c @@ -39,7 +39,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "stat_com.h" #include "basop_util.h" #include "wmc_auto.h" diff --git a/lib_enc/ari_enc_fx.c b/lib_enc/ari_enc_fx.c index 5e01f8f3589ecf0c65fb0db6787275f5cdbb73ed..54c21c9d1f6a29f2cfc3dbfaf3272d6139731def 100644 --- a/lib_enc/ari_enc_fx.c +++ b/lib_enc/ari_enc_fx.c @@ -9,8 +9,7 @@ #include "cnst.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------- diff --git a/lib_enc/ari_hm_enc_fx.c b/lib_enc/ari_hm_enc_fx.c index bc4c225df9676f7a97bf93c7df1617f49fcae932..8414c56daa0ef4f918647baca5fb7deb4d38b42c 100644 --- a/lib_enc/ari_hm_enc_fx.c +++ b/lib_enc/ari_hm_enc_fx.c @@ -12,8 +12,7 @@ #include "rom_enc.h" #include "prot.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/arith_coder_enc_fx.c b/lib_enc/arith_coder_enc_fx.c index 5c96532bea9756db06a95d8f9270ce0a65977a71..ce9f146d896b838c50eddc0d7d514ccd5363bcb2 100644 --- a/lib_enc/arith_coder_enc_fx.c +++ b/lib_enc/arith_coder_enc_fx.c @@ -6,8 +6,7 @@ #include #include "options.h" #include "cnst.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" #include "rom_com.h" diff --git a/lib_enc/avq_cod_fx.c b/lib_enc/avq_cod_fx.c index 5b1756bfdd8f1ae9331dc881e051a5d6a37421fe..ece84e4e95cd46448e961427e032bc582020773f 100644 --- a/lib_enc/avq_cod_fx.c +++ b/lib_enc/avq_cod_fx.c @@ -8,8 +8,7 @@ #include /* Compilation switches */ #include "prot.h" /* Function prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com.h" /* Static table prototypes */ diff --git a/lib_enc/bass_psfilter_enc_fx.c b/lib_enc/bass_psfilter_enc_fx.c index c8ea49bf33f8f48fc87718baf8b060875e12bca2..df52213c2bdc3d56ff7cbb9302ceaae8b3d78479 100644 --- a/lib_enc/bass_psfilter_enc_fx.c +++ b/lib_enc/bass_psfilter_enc_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/bw_detect_fx.c b/lib_enc/bw_detect_fx.c index 2496d54d36b4bec74ec0c2c7af06d83fc2730a6e..9660075e6116b6295d9693c0990741c3104ec64d 100644 --- a/lib_enc/bw_detect_fx.c +++ b/lib_enc/bw_detect_fx.c @@ -10,8 +10,7 @@ #include "rom_com.h" #include "basop_util.h" #include "ivas_cnst.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/cng_enc_fx.c b/lib_enc/cng_enc_fx.c index dc5ed20dfe2208845cd04197e8c7860a68e2cc3e..e94da2f7c565401d11853a307c95ea02fbffa48e 100644 --- a/lib_enc/cng_enc_fx.c +++ b/lib_enc/cng_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_enc.h" /* Encoder static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ //#include "basop_mpy.h" diff --git a/lib_enc/cod2t32_fx.c b/lib_enc/cod2t32_fx.c index afb4d7ff3575095a38e99b755f43273a2fe98ec5..06c4d31f0dcacd6f72b95dc16bb8afd8738254f4 100644 --- a/lib_enc/cod2t32_fx.c +++ b/lib_enc/cod2t32_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/cod4t64_fx.c b/lib_enc/cod4t64_fx.c index 43d1e643445718e753796ec1d5685e7f3991eb00..b20c94daf7d2157509a14463a5470d41ec60f68e 100644 --- a/lib_enc/cod4t64_fx.c +++ b/lib_enc/cod4t64_fx.c @@ -8,8 +8,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/cod_ace_fx.c b/lib_enc/cod_ace_fx.c index 667843880922ca8eda869918b337a2c5d68006f6..f816a7cd86ea0da1f9fbe7c5606a6028d33fc2e8 100644 --- a/lib_enc/cod_ace_fx.c +++ b/lib_enc/cod_ace_fx.c @@ -11,8 +11,7 @@ #include "options.h" #include "rom_basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/cod_tcx_fx.c b/lib_enc/cod_tcx_fx.c index 0c3f7d4df719ed2d98a149e99aeb6a8cdc08ecec..0b74d6de4a30a08c3b48d385122451bd51133451 100644 --- a/lib_enc/cod_tcx_fx.c +++ b/lib_enc/cod_tcx_fx.c @@ -9,8 +9,7 @@ #include "rom_com.h" #include "stat_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_util.h" #include "stl.h" //#include "basop_mpy.h" diff --git a/lib_enc/cod_uv_fx.c b/lib_enc/cod_uv_fx.c index bf20ecfd0d467de373c1764463f122307818071a..1af9e346388cb7ec4b3a2a0d65a4e4a65a65af32 100644 --- a/lib_enc/cod_uv_fx.c +++ b/lib_enc/cod_uv_fx.c @@ -7,8 +7,7 @@ #include //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/comvad_decision_fx.c b/lib_enc/comvad_decision_fx.c index 2fa8069f8a8215a57c4995cf91345d18fd63461a..98816e768d91e0666a6fade90f54a9201054fa04 100644 --- a/lib_enc/comvad_decision_fx.c +++ b/lib_enc/comvad_decision_fx.c @@ -11,8 +11,7 @@ //#include "prot_fx.h" #include "rom_enc.h" /* Encoder static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" diff --git a/lib_enc/cor_shif_fx.c b/lib_enc/cor_shif_fx.c index 6645155ef2a7ab2e1664561ce60af7669e61678c..1120235052e6863cee83f1794f0cc5697929428a 100644 --- a/lib_enc/cor_shif_fx.c +++ b/lib_enc/cor_shif_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_2div_fx.c b/lib_enc/core_enc_2div_fx.c index 37df43e37ab2174df9a189afa44b385fdf2a23bb..42236eaf893ecf838c537af3c431d93befe5fbd9 100644 --- a/lib_enc/core_enc_2div_fx.c +++ b/lib_enc/core_enc_2div_fx.c @@ -11,8 +11,7 @@ //#include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_init_fx.c b/lib_enc/core_enc_init_fx.c index 938997bd4b7a99bc9e3b5253adb4fb38ea477d2f..b3b305673e9ed981c316b1a79ad8b5a737cb8cf9 100644 --- a/lib_enc/core_enc_init_fx.c +++ b/lib_enc/core_enc_init_fx.c @@ -15,8 +15,7 @@ #include #include "rom_com.h" /* Common constants */ #include "prot.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_ol_fx.c b/lib_enc/core_enc_ol_fx.c index 4a7db5f6925bec3d5cfd7365e261052323d5ee81..781cfe1a5a83498adb7c8f1fe44d2921e2a671ba 100644 --- a/lib_enc/core_enc_ol_fx.c +++ b/lib_enc/core_enc_ol_fx.c @@ -10,8 +10,7 @@ #include "basop_util.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_reconf_fx.c b/lib_enc/core_enc_reconf_fx.c index 49631b17808cecb1a81945c1f1af753090493a29..b66703f88f1754eeefe8ff9b584bb61698cd289d 100644 --- a/lib_enc/core_enc_reconf_fx.c +++ b/lib_enc/core_enc_reconf_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" #include "rom_enc.h" /* Encoder static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_switch_fx.c b/lib_enc/core_enc_switch_fx.c index 0eede724a6cf61e01465ed7d318687c934694ae3..268bd58ac41688fb95ff719de1bd70fa71522808 100644 --- a/lib_enc/core_enc_switch_fx.c +++ b/lib_enc/core_enc_switch_fx.c @@ -11,8 +11,7 @@ #include "ivas_cnst.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_updt_fx.c b/lib_enc/core_enc_updt_fx.c index 9fa4f0ff3a53cb4d3d996d7b0215a182a88b7e48..bd6f5b5482e700c59c0be1cca2375df718a2e21f 100644 --- a/lib_enc/core_enc_updt_fx.c +++ b/lib_enc/core_enc_updt_fx.c @@ -8,8 +8,7 @@ #include "cnst.h" /* Common constants */ #include "basop_util.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/core_switching_enc_fx.c b/lib_enc/core_switching_enc_fx.c index 457d93bd8d40d96d8473bd82d01daf8e6acdcb47..4494f01040b1e5e76d240eba091d7aaf690a2cbe 100644 --- a/lib_enc/core_switching_enc_fx.c +++ b/lib_enc/core_switching_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/corr_xh_fx.c b/lib_enc/corr_xh_fx.c index 698d14830dd4af944d4aed8ad83cf73171eaa4bd..86ba92c7a7c28d0cd2e92e551d1b6d195ab784c7 100644 --- a/lib_enc/corr_xh_fx.c +++ b/lib_enc/corr_xh_fx.c @@ -5,8 +5,7 @@ #include "options.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/decision_matrix_enc_fx.c b/lib_enc/decision_matrix_enc_fx.c index 5f0eaf0cd43c927ccc9dd676356657bc4b9504d6..922883ffc4b46ffb89a5e85986cf8a4f489b95ae 100644 --- a/lib_enc/decision_matrix_enc_fx.c +++ b/lib_enc/decision_matrix_enc_fx.c @@ -10,8 +10,7 @@ #include "stat_enc.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/detect_transient_fx.c b/lib_enc/detect_transient_fx.c index 0d86e3aabecd436a0c3c62a8eb9614855d4af965..e21579cd0acce22f264bab94c352c0bb40480af5 100644 --- a/lib_enc/detect_transient_fx.c +++ b/lib_enc/detect_transient_fx.c @@ -37,8 +37,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------*/ diff --git a/lib_enc/diffcod_fx.c b/lib_enc/diffcod_fx.c index 5fd01046a8a462d16d2c4fd8ad2130cb72cf8aac..7ff48d81667335768cc737aa75033fd6b998d258 100644 --- a/lib_enc/diffcod_fx.c +++ b/lib_enc/diffcod_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Compilation switches */ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function Prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------*/ diff --git a/lib_enc/dtx_fx.c b/lib_enc/dtx_fx.c index aa3bd7fd691399094947cc9839cdb6fccdfcb4f8..afc6fbe38c21d881a7a4d2600fe2e4c1dc11e412 100644 --- a/lib_enc/dtx_fx.c +++ b/lib_enc/dtx_fx.c @@ -8,8 +8,7 @@ #include "rom_com.h" // #include "basop_mpy.h" #include -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "prot.h" diff --git a/lib_enc/enc_acelp_fx.c b/lib_enc/enc_acelp_fx.c index b8aacc9982b3cf6430fe9286c812bb16140bd6b9..a601728279d581792ef508ec6de55c86d601b63e 100644 --- a/lib_enc/enc_acelp_fx.c +++ b/lib_enc/enc_acelp_fx.c @@ -12,8 +12,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_acelp_tcx_main_fx.c b/lib_enc/enc_acelp_tcx_main_fx.c index 0688f731132085b7655f9c11539cf3d28fda72de..0ee3c51856af219d536d57f65af0ff536d9fa766 100644 --- a/lib_enc/enc_acelp_tcx_main_fx.c +++ b/lib_enc/enc_acelp_tcx_main_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_acelpx_fx.c b/lib_enc/enc_acelpx_fx.c index b24bcd066bf9250d5e6e8fa74da46e10d76f0e67..cac1c81edd1f42f47732c45a6ee66f5c2061200d 100644 --- a/lib_enc/enc_acelpx_fx.c +++ b/lib_enc/enc_acelpx_fx.c @@ -8,8 +8,7 @@ #include "basop_util.h" #include "options.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------------------* diff --git a/lib_enc/enc_amr_wb_fx.c b/lib_enc/enc_amr_wb_fx.c index 492dd620dec27b40671ed1f7642b6f70a24221b1..9e9bbfcc15cc085367e1f50cb711196bdfdebb76 100644 --- a/lib_enc/enc_amr_wb_fx.c +++ b/lib_enc/enc_amr_wb_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/enc_gain_fx.c b/lib_enc/enc_gain_fx.c index 8cd87ad1038660cd250d60c41abde351c4c2bba0..3bf3db1aa705c07972ac8d67bb437604ce668cdb 100644 --- a/lib_enc/enc_gain_fx.c +++ b/lib_enc/enc_gain_fx.c @@ -11,8 +11,7 @@ #include "rom_com.h" #include "rom_enc.h" #include "basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ void E_GAIN_norm_corr( Word16 exc[], Word16 xn[], Word16 h[], Word16 t_min, Word16 t_max, Word16 corr_norm[], Word16 L_subfr ); diff --git a/lib_enc/enc_gen_voic_fx.c b/lib_enc/enc_gen_voic_fx.c index 1b9823e7320deb8eae7c3df67adaf7a9ab5e6f6a..a9699855e42ad78da3a1c272841f54e89afe4fbb 100644 --- a/lib_enc/enc_gen_voic_fx.c +++ b/lib_enc/enc_gen_voic_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_gen_voic_rf.c b/lib_enc/enc_gen_voic_rf.c index ae4458960f4be4807d15335a2e319d749a3c707c..7c38a433dbf59f39d705f1fcd026970252dc57dc 100644 --- a/lib_enc/enc_gen_voic_rf.c +++ b/lib_enc/enc_gen_voic_rf.c @@ -40,7 +40,7 @@ #include "prot.h" #include "rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * reset_rf_indices() diff --git a/lib_enc/enc_gen_voic_rf_fx.c b/lib_enc/enc_gen_voic_rf_fx.c index c60767394e538c16d247d2fcfa6b12cc6d1daab7..a4d506291546539e6790ade2018ec2cacb862d50 100644 --- a/lib_enc/enc_gen_voic_rf_fx.c +++ b/lib_enc/enc_gen_voic_rf_fx.c @@ -11,8 +11,7 @@ #include "rom_basop_util.h" //#include "basop_mpy.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/enc_higher_acelp_fx.c b/lib_enc/enc_higher_acelp_fx.c index a67071533f4bb35a8ac16e624e864906431d4696..59e2a359e0009de2e98cb776d8c363d26fb43138 100644 --- a/lib_enc/enc_higher_acelp_fx.c +++ b/lib_enc/enc_higher_acelp_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" /*---------------------------------------------------------------------* diff --git a/lib_enc/enc_nelp_fx.c b/lib_enc/enc_nelp_fx.c index bca4d2a772d9ae6c34cc4f2c007a0f302c2e2e3a..4be45c7e9d7ca2dce71cc0f1ea4620d6df486c69 100644 --- a/lib_enc/enc_nelp_fx.c +++ b/lib_enc/enc_nelp_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/enc_pit_exc_fx.c b/lib_enc/enc_pit_exc_fx.c index f8d6eb8a4e0e08a6c488a398f508f44a20a8c018..ff8fe3c32b366582fff70c2b420ccc2f5b66e981 100644 --- a/lib_enc/enc_pit_exc_fx.c +++ b/lib_enc/enc_pit_exc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*======================================================================*/ diff --git a/lib_enc/enc_ppp_fx.c b/lib_enc/enc_ppp_fx.c index 31cdc0a5c993f09dbe5fb11fc9906d3bcc3edd60..d76ed191f83f8944c5cfbbfe33b63eb3beca5a2a 100644 --- a/lib_enc/enc_ppp_fx.c +++ b/lib_enc/enc_ppp_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/enc_prm_fx.c b/lib_enc/enc_prm_fx.c index b32c0f2ae8b4a2924674b8ebdf262ca172b0d21f..f59fdf08f3b96ee1a2136183fb6f6911e167d742 100644 --- a/lib_enc/enc_prm_fx.c +++ b/lib_enc/enc_prm_fx.c @@ -12,8 +12,7 @@ #include "rom_com.h" #include "stl.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_tran_fx.c b/lib_enc/enc_tran_fx.c index a0a9ff9021f03f4780bd59d0bdeb0f1da3c25a45..d3127ccda1e79619dae577f0381a8fff783ef81b 100644 --- a/lib_enc/enc_tran_fx.c +++ b/lib_enc/enc_tran_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*=================================================================================*/ diff --git a/lib_enc/enc_uv_fx.c b/lib_enc/enc_uv_fx.c index c67a5781e7cef9d19972fe81009a0171e68044d5..981d02a868bfe60a1a220de6e22de478ff260342 100644 --- a/lib_enc/enc_uv_fx.c +++ b/lib_enc/enc_uv_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/energy_fx.c b/lib_enc/energy_fx.c index f14e0b407ae8430d009ff205bf3abd344bb2e1b3..4bd16df2e21b8f85a1bf87ca66e6e568b0ef80fd 100644 --- a/lib_enc/energy_fx.c +++ b/lib_enc/energy_fx.c @@ -9,8 +9,7 @@ #include "rom_enc.h" #include "vad_basop.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* * est_energy_fx() diff --git a/lib_enc/eval_pit_contr_fx.c b/lib_enc/eval_pit_contr_fx.c index df76226531b1721abe6de633b41a5132fed6fc71..f1cc5460619b07d9c50026ef6388f2a21bcbb1a1 100644 --- a/lib_enc/eval_pit_contr_fx.c +++ b/lib_enc/eval_pit_contr_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/evs_enc_fx.c b/lib_enc/evs_enc_fx.c index 7cc08c96b81c3eb51ae93b424b89ee6b5d486b7e..f755475999ff6ba59f1d6ee1ef3aa6ce00bd81fb 100644 --- a/lib_enc/evs_enc_fx.c +++ b/lib_enc/evs_enc_fx.c @@ -7,8 +7,7 @@ #include "prot.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ #include "prot_fx_enc.h" diff --git a/lib_enc/ext_sig_ana_fx.c b/lib_enc/ext_sig_ana_fx.c index a24b15f881f3309eb25dcf99a7397e8b0767376b..bb830785012dcc2fbb56d6593663502257ee9355 100644 --- a/lib_enc/ext_sig_ana_fx.c +++ b/lib_enc/ext_sig_ana_fx.c @@ -9,8 +9,7 @@ //#include "prot_fx.h" #include "rom_com.h" #include "basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/fd_cng_enc.c b/lib_enc/fd_cng_enc.c index d54d787f2d7cbe82ec6c91f557f6a8241dbbab31..38803594fbbff31f413528e27f94f77be9fa3458 100644 --- a/lib_enc/fd_cng_enc.c +++ b/lib_enc/fd_cng_enc.c @@ -41,7 +41,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "stat_enc.h" diff --git a/lib_enc/fd_cng_enc_fx.c b/lib_enc/fd_cng_enc_fx.c index 410cec20268f1fd2f96e62991231942f8dc75e8b..33f693d4b0ea22a9d2ea1f7e1e3c71582d9a1afc 100644 --- a/lib_enc/fd_cng_enc_fx.c +++ b/lib_enc/fd_cng_enc_fx.c @@ -12,8 +12,7 @@ #include "rom_com.h" #include "rom_enc.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_enc/find_tar_fx.c b/lib_enc/find_tar_fx.c index 14de5fe44c22a797af3d524c23158649469ee925..1fb28ca9752e1f632da001ddde6abae13863cd33 100644 --- a/lib_enc/find_tar_fx.c +++ b/lib_enc/find_tar_fx.c @@ -4,8 +4,7 @@ #include #include "options.h" /* Compilation switches */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "cnst.h" /* Common constants */ #include "basop_util.h" diff --git a/lib_enc/find_tilt_fx.c b/lib_enc/find_tilt_fx.c index 11106323e07568151398a0b2c69e28ca00bc91ed..f0c39eee21dafe9fe30de6bee54dbdd2d4a6854c 100644 --- a/lib_enc/find_tilt_fx.c +++ b/lib_enc/find_tilt_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/find_uv_fx.c b/lib_enc/find_uv_fx.c index dbe7714c96f22fe2268938044bb2eea1b4cf5c7c..ec934ad9c5ee93bac3e3c267bf815d480831d0c6 100644 --- a/lib_enc/find_uv_fx.c +++ b/lib_enc/find_uv_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/find_wsp.c b/lib_enc/find_wsp.c index fb9efa29b99a2f63152a77443e44a2f8b40f13cb..97df5db897a0ec12625d376e68a48b5cd4fb4554 100644 --- a/lib_enc/find_wsp.c +++ b/lib_enc/find_wsp.c @@ -39,7 +39,7 @@ #include "cnst.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * find_wsp() * diff --git a/lib_enc/find_wsp_fx.c b/lib_enc/find_wsp_fx.c index 21be0073b0ab8b58cd9c9e819f7cb9cc82674491..de81f19214e626801376295422c993120a79672c 100644 --- a/lib_enc/find_wsp_fx.c +++ b/lib_enc/find_wsp_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/frame_spec_dif_cor_rate_fx.c b/lib_enc/frame_spec_dif_cor_rate_fx.c index fb0930579bec9e9de0543202c3904b17363e23e1..c7fa5eb1cab5d0ca8b4c15038cb232529d6ffc05 100644 --- a/lib_enc/frame_spec_dif_cor_rate_fx.c +++ b/lib_enc/frame_spec_dif_cor_rate_fx.c @@ -10,8 +10,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/gain_enc_fx.c b/lib_enc/gain_enc_fx.c index ad366278c3be1641c8fd0a5147debcb1c9dae785..abb66a8b899578dc0ad57e6b4db41bedec9d0e72 100644 --- a/lib_enc/gain_enc_fx.c +++ b/lib_enc/gain_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/gaus_enc_fx.c b/lib_enc/gaus_enc_fx.c index 56ac45f26aa4e9eb1f5ac9b00f35d1a6afab918b..57a336ec25f80eb161e363fbd6b232fe4ef512f7 100644 --- a/lib_enc/gaus_enc_fx.c +++ b/lib_enc/gaus_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com.h" /* Static table prototypes */ #include "rom_enc.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ //#include "basop_mpy.h" diff --git a/lib_enc/gp_clip_fx.c b/lib_enc/gp_clip_fx.c index 1a1f1debfec6e8d3a4f339094832cce889f6131b..73a5c35ea29ce16c5128b2b367ca005e69b75671 100644 --- a/lib_enc/gp_clip_fx.c +++ b/lib_enc/gp_clip_fx.c @@ -37,8 +37,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/gs_enc_fx.c b/lib_enc/gs_enc_fx.c index 615b09fd0450fb939026d76eebf80d0731312eb2..e2d1f4aa9233138ef1fddfc9d493a4d14466b89d 100644 --- a/lib_enc/gs_enc_fx.c +++ b/lib_enc/gs_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/guided_plc_enc_fx.c b/lib_enc/guided_plc_enc_fx.c index aebdfb748e773b68f5be71bb97180bf9e41c41a5..6470e0a3c88fa8bcf420af79d496ecb0f73d570b 100644 --- a/lib_enc/guided_plc_enc_fx.c +++ b/lib_enc/guided_plc_enc_fx.c @@ -7,8 +7,7 @@ #include "options.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stat_enc.h" #include "basop_util.h" diff --git a/lib_enc/hf_cod_amrwb_fx.c b/lib_enc/hf_cod_amrwb_fx.c index 0fa53be5155d81f61b1ec4cf268ffe646901caa7..7c2060fa8663df927207db78e0a59227df997424 100644 --- a/lib_enc/hf_cod_amrwb_fx.c +++ b/lib_enc/hf_cod_amrwb_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" #include "cnst.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/hq_classifier_enc_fx.c b/lib_enc/hq_classifier_enc_fx.c index ebf3855ee9c41c5ca56521ee82bdb792addb3648..842f2029ed253cfdb0bb3dc8c0444e292b5c69cd 100644 --- a/lib_enc/hq_classifier_enc_fx.c +++ b/lib_enc/hq_classifier_enc_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/hq_core_enc_fx.c b/lib_enc/hq_core_enc_fx.c index 132df11bb27c4fcd750d0c7829d5afaaba678265..55e37a3b55db153f6adb30bd2d56a16434d451ba 100644 --- a/lib_enc/hq_core_enc_fx.c +++ b/lib_enc/hq_core_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------------- diff --git a/lib_enc/hq_env_enc_fx.c b/lib_enc/hq_env_enc_fx.c index d64685ddabf1384cbbb4c978b770bd12c4cd873a..bfb9836412263025dc8ff7188884c53698fba089 100644 --- a/lib_enc/hq_env_enc_fx.c +++ b/lib_enc/hq_env_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------------------* diff --git a/lib_enc/hq_hr_enc_fx.c b/lib_enc/hq_hr_enc_fx.c index 3049e6c21c37a4dcf40999d6199579ff7d3dc478..ca7d941eecb1ed2e97a238e9382ab4e5cf993f99 100644 --- a/lib_enc/hq_hr_enc_fx.c +++ b/lib_enc/hq_hr_enc_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_enc/hq_lr_enc_fx.c b/lib_enc/hq_lr_enc_fx.c index d1f3520570e646758db955b49f76eaa71205192b..85827b9a1d619dfb291e469458548a84271758f1 100644 --- a/lib_enc/hq_lr_enc_fx.c +++ b/lib_enc/hq_lr_enc_fx.c @@ -9,8 +9,7 @@ #include "rom_enc.h" //#include "basop_mpy.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/hvq_enc_fx.c b/lib_enc/hvq_enc_fx.c index 107905ccbff764c39835817144fb89492be5432d..b2adfef24cd5adf5d658e1900c966b5bc79a4520 100644 --- a/lib_enc/hvq_enc_fx.c +++ b/lib_enc/hvq_enc_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define HVQ_ENC_NOISE_DELTA ( (Word16) 3277 ) /* 0.1 in Q15 */ diff --git a/lib_enc/igf_enc_fx.c b/lib_enc/igf_enc_fx.c index 1841bd93a809fe6189943dd6bdb7a149852d2c59..1bcb7698f2ac68a28229987a5b50203a14ae7d1e 100644 --- a/lib_enc/igf_enc_fx.c +++ b/lib_enc/igf_enc_fx.c @@ -9,8 +9,7 @@ #include "cnst.h" #include "stl.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stat_enc.h" #include "basop_util.h" diff --git a/lib_enc/igf_scf_enc_fx.c b/lib_enc/igf_scf_enc_fx.c index b5a74687ac5b33a8ad82fd3170b1500eff093647..58b8358037850a5a035f8b0c3d53a94c184be044 100644 --- a/lib_enc/igf_scf_enc_fx.c +++ b/lib_enc/igf_scf_enc_fx.c @@ -9,8 +9,7 @@ #include "stat_enc.h" #include "stat_com.h" #include "basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/init_enc.c b/lib_enc/init_enc.c index 44b398a8911843eb6452ea4f7da79c84efd7988f..56144429efad694bf8e4c65d85304bf5dddecbb8 100644 --- a/lib_enc/init_enc.c +++ b/lib_enc/init_enc.c @@ -41,7 +41,7 @@ #include "rom_enc.h" #include "prot.h" #include "ivas_prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_enc/init_enc_fx.c b/lib_enc/init_enc_fx.c index d740915c18208488af5968b4fc41d21f5d62dc01..a38e19b718083387bbfc2c0044b46fbcf851d6ff 100644 --- a/lib_enc/init_enc_fx.c +++ b/lib_enc/init_enc_fx.c @@ -10,8 +10,7 @@ #include "stl.h" #include "ivas_cnst.h" #include "ivas_error.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/inov_enc_fx.c b/lib_enc/inov_enc_fx.c index 3b21cb7e7b94d223cb72c74438d22eed1def261b..bb573b1c421e7674dbcaeb10e8f2eea1a7dddb00 100644 --- a/lib_enc/inov_enc_fx.c +++ b/lib_enc/inov_enc_fx.c @@ -8,8 +8,7 @@ #include "basop_util.h" #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/isf_enc_amr_wb_fx.c b/lib_enc/isf_enc_amr_wb_fx.c index 8d19855a4b1539b9f330f91d416b9ce8c4f2e649..505d3f2903eb9f1ea7156dc154357103dd07d8be 100644 --- a/lib_enc/isf_enc_amr_wb_fx.c +++ b/lib_enc/isf_enc_amr_wb_fx.c @@ -34,8 +34,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/ivas_agc_enc.c b/lib_enc/ivas_agc_enc.c index acfd266eb4c22725620dbc3a83902285169760bc..8e70554102ff12df891f3e86c392ddd1184a17e0 100644 --- a/lib_enc/ivas_agc_enc.c +++ b/lib_enc/ivas_agc_enc.c @@ -39,8 +39,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "basop_util.h" #endif diff --git a/lib_enc/ivas_core_pre_proc_front.c b/lib_enc/ivas_core_pre_proc_front.c index 616d5cc15975f4fb1a97e528003f8dcab4ab6636..239e57cfc3f805b8dcd83bf64e01b17193db6dc2 100644 --- a/lib_enc/ivas_core_pre_proc_front.c +++ b/lib_enc/ivas_core_pre_proc_front.c @@ -37,8 +37,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include "ivas_prot.h" #include "wmc_auto.h" diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c index cfd4348cb353a854321eb5e2560c1bed36f7de80..da80d795cdb1f24222740f402ecfd790a48e7d31 100644 --- a/lib_enc/ivas_cpe_enc.c +++ b/lib_enc/ivas_cpe_enc.c @@ -43,8 +43,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_enc/ivas_dirac_enc.c b/lib_enc/ivas_dirac_enc.c index bd7b63a4c24ff068cce870fa0c716dca88254ea2..61a8092ca67773bdba18e7689be0b88932ce8f3c 100644 --- a/lib_enc/ivas_dirac_enc.c +++ b/lib_enc/ivas_dirac_enc.c @@ -36,8 +36,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "ivas_cnst.h" diff --git a/lib_enc/ivas_enc.c b/lib_enc/ivas_enc.c index d7e2d24b27759d317f294b541896a58610b8dbad..821389abc036812cfb0161a315d60f77a485a1c2 100644 --- a/lib_enc/ivas_enc.c +++ b/lib_enc/ivas_enc.c @@ -41,8 +41,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler.c index 8044701899edd86376d07febf33fa80d744deee3..0265ac6d13ac3cedc5e5cd1d13d2b29d0925ae0d 100644 --- a/lib_enc/ivas_enc_cov_handler.c +++ b/lib_enc/ivas_enc_cov_handler.c @@ -37,7 +37,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*------------------------------------------------------------------------------------------* diff --git a/lib_enc/ivas_front_vad.c b/lib_enc/ivas_front_vad.c index be9a837de0b93b37cd6da928182f618b2b95568f..87ae69efe66e6194b423ebb0f83b03fec3de916c 100644 --- a/lib_enc/ivas_front_vad.c +++ b/lib_enc/ivas_front_vad.c @@ -39,13 +39,12 @@ #include "prot.h" #include "ivas_prot.h" #include "prot_fx_enc.h" -#include "prot_fx1.h" #include #include "wmc_auto.h" #include #ifdef IVAS_FLOAT_FIXED #include "prot_fx_enc.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*-----------------------------------------------------------------------------------------* diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index 5af37336dc9670a5b7484e8b7ecb95084ab6aee3..10fae03212f1cef0e55672acdee4cef3a557988d 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -42,7 +42,7 @@ #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #include "prot_fx_enc.h" -#include "prot_fx1.h" +#include "prot_fx.h" #endif diff --git a/lib_enc/ivas_ism_dtx_enc.c b/lib_enc/ivas_ism_dtx_enc.c index 157b81378cbad736e2a2570c87dfe32851baec1b..eea3314d86edb30c9d4bff7e3a5abcc61add93cc 100644 --- a/lib_enc/ivas_ism_dtx_enc.c +++ b/lib_enc/ivas_ism_dtx_enc.c @@ -38,8 +38,7 @@ #include "ivas_prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "prot_fx_enc.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED diff --git a/lib_enc/ivas_ism_enc.c b/lib_enc/ivas_ism_enc.c index 45e4f65341f5e3f9bab4cc04b106f739ec8c6b78..7e51c82bf83de8ddd0627c956dceaae138e03e32 100644 --- a/lib_enc/ivas_ism_enc.c +++ b/lib_enc/ivas_ism_enc.c @@ -39,8 +39,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c index dd90f07114fe2132cbd2c7140a55123108f27a5f..3bf1bb5c8899d52855a79c9785782bbac809a6d2 100644 --- a/lib_enc/ivas_ism_metadata_enc.c +++ b/lib_enc/ivas_ism_metadata_enc.c @@ -39,14 +39,11 @@ #include "ivas_prot_fx.h" #include "ivas_rom_com.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED +#include "prot_fx.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #include "ivas_rom_com_fx.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED #endif diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc.c index 49507f07835a3347a6dc2fec5d83b58db5c82221..eed03579efa702d021df487882f8fba2c50d8ea4 100644 --- a/lib_enc/ivas_ism_param_enc.c +++ b/lib_enc/ivas_ism_param_enc.c @@ -37,8 +37,7 @@ #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" diff --git a/lib_enc/ivas_lfe_enc.c b/lib_enc/ivas_lfe_enc.c index 6a011d23ce1281f6f4d50dfe1ffd99eae071ec5a..6719ae1d78008ed1021da9b76a8e3fe7e4058b58 100644 --- a/lib_enc/ivas_lfe_enc.c +++ b/lib_enc/ivas_lfe_enc.c @@ -40,8 +40,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc.c index 6ccf6af511bdcc4693b1ac919d84348d8c14741a..1684d34a143e64468438dbfc56e7cd18b596dac0 100644 --- a/lib_enc/ivas_masa_enc.c +++ b/lib_enc/ivas_masa_enc.c @@ -39,11 +39,8 @@ #include "ivas_stat_enc.h" #include "wmc_auto.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif #ifdef IVAS_FLOAT_FIXED diff --git a/lib_enc/ivas_mc_paramupmix_enc.c b/lib_enc/ivas_mc_paramupmix_enc.c index 9c3d0bfb1cf024c471415a89d26e87038e4798a2..a4ba849d48ad77e82f6d44eca336d5d10ca83b25 100644 --- a/lib_enc/ivas_mc_paramupmix_enc.c +++ b/lib_enc/ivas_mc_paramupmix_enc.c @@ -40,7 +40,7 @@ #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif #include "ivas_cnst.h" #include "ivas_rom_com.h" diff --git a/lib_enc/ivas_mcmasa_enc.c b/lib_enc/ivas_mcmasa_enc.c index 3748ef6a4ac31da3b66483f836aaf40b63755bf3..3a49e4aae9573acc0c63caa782918fa80a519610 100644 --- a/lib_enc/ivas_mcmasa_enc.c +++ b/lib_enc/ivas_mcmasa_enc.c @@ -39,8 +39,7 @@ #include "ivas_prot_fx.h" #include "options.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com.h" #include "ivas_rom_enc.h" #include "wmc_auto.h" diff --git a/lib_enc/ivas_mct_enc_mct.c b/lib_enc/ivas_mct_enc_mct.c index 4e4bdded50c51ff968fd9c302bd7a144f1d81407..d3628b7e14c1d52723cf341436c273a576936714 100644 --- a/lib_enc/ivas_mct_enc_mct.c +++ b/lib_enc/ivas_mct_enc_mct.c @@ -37,7 +37,7 @@ #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "wmc_auto.h" #include diff --git a/lib_enc/ivas_omasa_enc.c b/lib_enc/ivas_omasa_enc.c index 8f3d726a56b3e69b94e9ef6809212bb0b0ed0421..7d815d5d110aee4d3f6275b2a0f9fad014565a4c 100644 --- a/lib_enc/ivas_omasa_enc.c +++ b/lib_enc/ivas_omasa_enc.c @@ -38,8 +38,7 @@ #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com.h" #include "ivas_rom_enc.h" #include "wmc_auto.h" diff --git a/lib_enc/ivas_osba_enc.c b/lib_enc/ivas_osba_enc.c index 5a8fcfa78c19bf6602efbbb4aea5f9264473b4e2..8e65a938f329e1bde6181e07b7978eea2ab6c8da 100644 --- a/lib_enc/ivas_osba_enc.c +++ b/lib_enc/ivas_osba_enc.c @@ -42,8 +42,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c index 37d72eda5c4227ac71717502154aecd87e815aff..819a42d3eb1ca4ba68519dcc899cd412b7d92c7f 100644 --- a/lib_enc/ivas_qmetadata_enc.c +++ b/lib_enc/ivas_qmetadata_enc.c @@ -42,8 +42,7 @@ #include "wmc_auto.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc.c index 2ebcdba1ee2023736c2fde00c644cb4bb115afa6..5d77849e8da3783d78f2f7a1363c51d5e044b1a2 100644 --- a/lib_enc/ivas_sba_enc.c +++ b/lib_enc/ivas_sba_enc.c @@ -43,8 +43,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_enc/ivas_sce_enc.c b/lib_enc/ivas_sce_enc.c index c2b53d5f5fa912cafacb1d68cfa3eb3c443608b8..cbaf1faa3ce98f5d4c02bca15ac3760ded297b7c 100644 --- a/lib_enc/ivas_sce_enc.c +++ b/lib_enc/ivas_sce_enc.c @@ -37,7 +37,7 @@ #include "ivas_cnst.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include "ivas_prot.h" #include "ivas_rom_com.h" diff --git a/lib_enc/ivas_sns_enc.c b/lib_enc/ivas_sns_enc.c index 7b1a19313f52932f8ea7cf56b2715625aea90873..673df674ffbb6fb4fd7191b8d08d50ab2b1813c9 100644 --- a/lib_enc/ivas_sns_enc.c +++ b/lib_enc/ivas_sns_enc.c @@ -38,7 +38,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "rom_com.h" #include "ivas_rom_com.h" #include "ivas_cnst.h" diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index b1e9ad53a9f6f10713a422555d0b6b3a16594d2f..29ec47922c6fa543ef858cdb7070c6f3200852da 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -35,8 +35,7 @@ #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "options.h" #endif #include "ivas_rom_com.h" @@ -596,7 +595,6 @@ ivas_error ivas_spar_enc( /* write the number of objects in ISM_SBA format*/ push_indice( hMetaData, IND_ISM_NUM_OBJECTS, hEncoderConfig->nchan_ism - 1, NO_BITS_MASA_ISM_NO_OBJ ); } - /* front VAD */ if ( ( error = front_vad_spar( st_ivas->hSpar, data_f[0], hEncoderConfig, input_frame ) ) != IVAS_ERR_OK ) { diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index 00e6acb31f2a6148b7573fcdb1a1dcab8e9b62d1..22d07cf28cd8e2d2479d7299b1381b6e31f953a4 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -41,7 +41,7 @@ #include "ivas_rom_enc.h" #include "ivas_cnst.h" #include "wmc_auto.h" -#include "prot_fx1.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/ivas_stereo_cng_enc.c b/lib_enc/ivas_stereo_cng_enc.c index f8fa5aea49ca73455aaf637fe091c778784431c1..55247933e347cf31aa3362ec7eb1c0744d7868e6 100644 --- a/lib_enc/ivas_stereo_cng_enc.c +++ b/lib_enc/ivas_stereo_cng_enc.c @@ -41,7 +41,7 @@ #include "ivas_cnst.h" #include "ivas_rom_com.h" #include "wmc_auto.h" -#include "prot_fx1.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc.c index 27552f50bd1b07c4184928f48eee545edccea11a..46db4d6a55bdfcc7be0c5a7bab36e2f42ba33ce8 100644 --- a/lib_enc/ivas_stereo_dft_enc.c +++ b/lib_enc/ivas_stereo_dft_enc.c @@ -40,7 +40,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" #include "ivas_rom_com_fx.h" diff --git a/lib_enc/ivas_stereo_ica_enc.c b/lib_enc/ivas_stereo_ica_enc.c index dc9fdc3019d0549ddf5e6b248d4eb91c66c7171b..aadfd8d58e7a2807b9ad94b13239672a19f27f6e 100644 --- a/lib_enc/ivas_stereo_ica_enc.c +++ b/lib_enc/ivas_stereo_ica_enc.c @@ -41,8 +41,7 @@ #include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*--------------------------------------------------------------- * Local function prototypes diff --git a/lib_enc/ivas_stereo_icbwe_enc.c b/lib_enc/ivas_stereo_icbwe_enc.c index d762468aa0c5b295ccd859d929e8aeac8296ba26..f1f8371506d04da2ce573676af2d2340965030e5 100644 --- a/lib_enc/ivas_stereo_icbwe_enc.c +++ b/lib_enc/ivas_stereo_icbwe_enc.c @@ -40,7 +40,7 @@ #include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" -#include "prot_fx1.h" +#include "prot_fx.h" /*-------------------------------------------------------------------* * ic_bwe_enc_reset() diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc.c index db45ca3f9d1345f3adad69cc5542529a58dc12aa..86715a6ce1d6a1aebea463ff0d00c8d0e30d9f78 100644 --- a/lib_enc/ivas_stereo_mdct_core_enc.c +++ b/lib_enc/ivas_stereo_mdct_core_enc.c @@ -36,7 +36,7 @@ #include #include "cnst.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "rom_com.h" #include "wmc_auto.h" diff --git a/lib_enc/ivas_stereo_mdct_igf_enc.c b/lib_enc/ivas_stereo_mdct_igf_enc.c index 3294013434829ba3a4f10011e5c00b103d9078ad..51862db720205e511b5cac1e7d3ecab845fe449c 100644 --- a/lib_enc/ivas_stereo_mdct_igf_enc.c +++ b/lib_enc/ivas_stereo_mdct_igf_enc.c @@ -35,7 +35,7 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "cnst.h" #include "stat_enc.h" #include "ivas_stat_enc.h" diff --git a/lib_enc/ivas_stereo_mdct_stereo_enc.c b/lib_enc/ivas_stereo_mdct_stereo_enc.c index 54618a32a50c134218fde2f26c1a8d181c9b3b99..9528fa9cb52c44b0b2f7a238cc9a1acd419c2baf 100644 --- a/lib_enc/ivas_stereo_mdct_stereo_enc.c +++ b/lib_enc/ivas_stereo_mdct_stereo_enc.c @@ -37,9 +37,8 @@ #include "ivas_cnst.h" #include "ivas_prot.h" #include "ivas_prot_fx.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot.h" -#include "prot_fx1.h" #include "prot_fx_enc.h" #include "ivas_rom_com.h" #include "ivas_rom_com_fx.h" diff --git a/lib_enc/lead_indexing_fx.c b/lib_enc/lead_indexing_fx.c index b3ceeda43ec7348fab0c2fcca88a7d1a9fcd3089..ff29330140ca4071d8d975ac14ce545a57050c97 100644 --- a/lib_enc/lead_indexing_fx.c +++ b/lib_enc/lead_indexing_fx.c @@ -7,8 +7,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index b35609ce13cbe77b79e5cb1827c859f99d8de8f7..230c58c446cbc889bd4fb9e50476d00f2971b800 100644 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -34,7 +34,7 @@ #include "ivas_prot.h" #include "ivas_prot_fx.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include #include diff --git a/lib_enc/long_enr_fx.c b/lib_enc/long_enr_fx.c index 05ea4ee26b164104fe0a262afbb19d1a28e8df2c..cc6291cee38d879561b2e0febb1b3d32088be3c3 100644 --- a/lib_enc/long_enr_fx.c +++ b/lib_enc/long_enr_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/lp_exc_e_fx.c b/lib_enc/lp_exc_e_fx.c index a8a6abc3334023f03e091666bcfc0959815be444..9562eabf87f50d1b8a651bfcb05fa8e6aecb7974 100644 --- a/lib_enc/lp_exc_e_fx.c +++ b/lib_enc/lp_exc_e_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/lsf_enc.c b/lib_enc/lsf_enc.c index a9671520edc036c3ca885ac65cf541fd8081e59a..855f786671e3aaeef4b50ddd0f388672ec2b8787 100644 --- a/lib_enc/lsf_enc.c +++ b/lib_enc/lsf_enc.c @@ -40,7 +40,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "basop_proto_func.h" #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_enc/lsf_enc_fx.c b/lib_enc/lsf_enc_fx.c index 1009c2bccf4fee6017470cffa00f8d5c69dda7ee..3a463279761504ecc043ab936d18686a416c3456 100644 --- a/lib_enc/lsf_enc_fx.c +++ b/lib_enc/lsf_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "ivas_prot_fx.h" /* Function prototypes */ diff --git a/lib_enc/lsf_msvq_ma_enc_fx.c b/lib_enc/lsf_msvq_ma_enc_fx.c index bf58e50406522413a49ee7f45c9ea9a6f84a52d2..fdb1ab0fc1a1dca2f7340871ecfde7e7e9b78058 100644 --- a/lib_enc/lsf_msvq_ma_enc_fx.c +++ b/lib_enc/lsf_msvq_ma_enc_fx.c @@ -11,8 +11,7 @@ #include "rom_com.h" #include "rom_enc.h" #include "basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/ltd_stable_fx.c b/lib_enc/ltd_stable_fx.c index 797b21829ad66b1f5aa000114013e9ab11c7cbd7..5006202735a83f73d36e283c25e466b855296137 100644 --- a/lib_enc/ltd_stable_fx.c +++ b/lib_enc/ltd_stable_fx.c @@ -9,8 +9,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/mdct_classifier_fx.c b/lib_enc/mdct_classifier_fx.c index 63f9c78be3bb3abdec24b20256bb9648c6fea926..dc938766bd6c77053296139df471f7b27195394b 100644 --- a/lib_enc/mdct_classifier_fx.c +++ b/lib_enc/mdct_classifier_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_enc/mdct_selector_fx.c b/lib_enc/mdct_selector_fx.c index d2e0b980c484319e07e5ae952165e058fed4740f..bb9de2fb922fb6395e55364847e3d7d5a56139ca 100644 --- a/lib_enc/mdct_selector_fx.c +++ b/lib_enc/mdct_selector_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/mslvq_enc_fx.c b/lib_enc/mslvq_enc_fx.c index ea953ebd5582913d827cb0dc8514bd9b5d4c1f2b..c5a3e6bb753118c84a3f4e8bddd2e8086ba15877 100644 --- a/lib_enc/mslvq_enc_fx.c +++ b/lib_enc/mslvq_enc_fx.c @@ -9,8 +9,7 @@ #include "stl.h" #include "prot.h" /* Function prototypes */ #include "basop32.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/multi_harm_fx.c b/lib_enc/multi_harm_fx.c index cc3aef87c51249cf037214583eb0a9f37426ac12..2611fec4b542579be041c8e16f7afe2a64afe93d 100644 --- a/lib_enc/multi_harm_fx.c +++ b/lib_enc/multi_harm_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/nelp_enc_fx.c b/lib_enc/nelp_enc_fx.c index a0b228c1e5adad47f5c643f2bd70a8982d3d0b1c..576a9ea208e4f0276e6bfe0dd3e33334567305cc 100644 --- a/lib_enc/nelp_enc_fx.c +++ b/lib_enc/nelp_enc_fx.c @@ -32,10 +32,9 @@ #include #include "control.h" -#include "options.h" /* Compilation switches */ -#include "cnst.h" /* Common constants */ -#include "prot_fx1.h" -#include "prot_fx2.h" /* Function prototypes */ +#include "options.h" /* Compilation switches */ +#include "cnst.h" /* Common constants */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com.h" diff --git a/lib_enc/nois_est_fx.c b/lib_enc/nois_est_fx.c index b8ce1a186e44d765812544415405b068d131b9cd..bf463766664cfc1cff8fcddf8ee024d6344cb0df 100644 --- a/lib_enc/nois_est_fx.c +++ b/lib_enc/nois_est_fx.c @@ -8,8 +8,7 @@ #include "cnst.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/noise_adjust_fx.c b/lib_enc/noise_adjust_fx.c index 1e149ad14bf0da6fb8a8e3a1350cb9cdb1c89b4c..1a2e204aea8c14b96a983c05f1eb02cd3a29c09f 100644 --- a/lib_enc/noise_adjust_fx.c +++ b/lib_enc/noise_adjust_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------* diff --git a/lib_enc/normalizecoefs_fx.c b/lib_enc/normalizecoefs_fx.c index 816f8531d657d9ef21e43263241a30bb8d435270..f6f5eedee7a031fce359b4471da4a17cf0aa892c 100644 --- a/lib_enc/normalizecoefs_fx.c +++ b/lib_enc/normalizecoefs_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "basop_mpy.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/peak_vq_enc_fx.c b/lib_enc/peak_vq_enc_fx.c index 5b3848706aa58a3244beede7c4dd90877d81ea8c..5a1fe61d1eb9c8bc37f9608ec35906f144f99d81 100644 --- a/lib_enc/peak_vq_enc_fx.c +++ b/lib_enc/peak_vq_enc_fx.c @@ -10,8 +10,7 @@ #include "rom_enc.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------------- diff --git a/lib_enc/pit_enc_fx.c b/lib_enc/pit_enc_fx.c index 86343944b3329b42a453d1b6423017462d6e22f0..6bcf678a1dab815e60eeb7d424324c04c11cde48 100644 --- a/lib_enc/pit_enc_fx.c +++ b/lib_enc/pit_enc_fx.c @@ -10,8 +10,7 @@ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_basop_util.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define inv_T0_res InvIntTable diff --git a/lib_enc/pitch_ol2_fx.c b/lib_enc/pitch_ol2_fx.c index cdbdea7919af4bcf80dfb46ed89e6813e36e4d63..f5352b75b887d73e9dc5f08da662dc7c6366d897 100644 --- a/lib_enc/pitch_ol2_fx.c +++ b/lib_enc/pitch_ol2_fx.c @@ -9,8 +9,7 @@ #include "rom_com.h" /* Encoder static table prototypes */ #include "rom_dec.h" //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/pitch_ol_fx.c b/lib_enc/pitch_ol_fx.c index 692e06ad952ae75aade5d431a5910a4186f67fd5..a43bdd82f0f250dfa4cff99b35a7faf9918d9c28 100644 --- a/lib_enc/pitch_ol_fx.c +++ b/lib_enc/pitch_ol_fx.c @@ -10,8 +10,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* @@ -1048,6 +1047,7 @@ void pitch_ol_fx( find_mult_fx( &fac, pitchX[i][NSECT + 0], pitchX[i][NSECT + 1], pit_max[4], &scaledX[i][NSECT + 0], old_pitch, old_corr, DELTA0, STEP ); /* Multiples in 2nd section */ } } + fac = THRES0; move16(); /* the look-ahead */ find_mult_fx( &fac, pitchX[i][2], pitchX[i][3], pit_max[7], &scaledX[i][2], old_pitch, old_corr, 2, 2 ); /* Multiples in 3rd section */ @@ -1267,6 +1267,7 @@ void pitch_ol_fx( /*--------------------------------------------------------------* * Update old pitch, upsample pitch, *--------------------------------------------------------------*/ + *old_pitch = pitch[1]; move16(); diff --git a/lib_enc/plc_enc_ext_fx.c b/lib_enc/plc_enc_ext_fx.c index 5c6af38f33a4f0c8fdc9965e8bfb6c3cdf9f3106..56598be2f5ab0342173145bfc314929340d29f4e 100644 --- a/lib_enc/plc_enc_ext_fx.c +++ b/lib_enc/plc_enc_ext_fx.c @@ -9,8 +9,7 @@ #include "stat_enc.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/ppp_enc_fx.c b/lib_enc/ppp_enc_fx.c index 8353659eec7f735a3634cb9019bcdd34966b9ca6..bfe64e3432c46b8dff399238890096b44176aa27 100644 --- a/lib_enc/ppp_enc_fx.c +++ b/lib_enc/ppp_enc_fx.c @@ -8,8 +8,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/pre_proc_fx.c b/lib_enc/pre_proc_fx.c index 76a128110f47048fa94b0acef7138ef7e80b7d76..cfaea31139c644ae37d50a5bbcc311e2dfa7a7b2 100644 --- a/lib_enc/pre_proc_fx.c +++ b/lib_enc/pre_proc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" //#include "prot_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/pvq_core_enc_fx.c b/lib_enc/pvq_core_enc_fx.c index 994a513a98825a8719377d9fac7196a5075f3b51..e87ae006fd211b0f990222f7add781d08b249916 100644 --- a/lib_enc/pvq_core_enc_fx.c +++ b/lib_enc/pvq_core_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/pvq_encode_fx.c b/lib_enc/pvq_encode_fx.c index d5bd9ee48e7fcb665a1bfa095ee92b6c23a9b987..1cee445e0e4646822e64ab085e3cbbd62ccb7007 100644 --- a/lib_enc/pvq_encode_fx.c +++ b/lib_enc/pvq_encode_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com_fx.h" #include "rom_com.h" diff --git a/lib_enc/q_gain2p_fx.c b/lib_enc/q_gain2p_fx.c index 6c0110bc7a47b2266562c3dbdfb16cc29c8298ee..8bfdcb588048b0467f18e9ff8289c76d904d4955 100644 --- a/lib_enc/q_gain2p_fx.c +++ b/lib_enc/q_gain2p_fx.c @@ -10,8 +10,7 @@ #include "basop_util.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/qlpc_avq_fx.c b/lib_enc/qlpc_avq_fx.c index 892a25eba219b1d4c4d230da8d8644174f41ce87..2740eac14660bf2caf842cda217788a461723c5c 100644 --- a/lib_enc/qlpc_avq_fx.c +++ b/lib_enc/qlpc_avq_fx.c @@ -9,8 +9,7 @@ #include "cnst.h" //#include "prot_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/qlpc_stoch_fx.c b/lib_enc/qlpc_stoch_fx.c index 2576939280473d17e2f4c19a2643ce1df0c651b4..dab87e3b32c946701fff65c5e76c260a19cc3b8b 100644 --- a/lib_enc/qlpc_stoch_fx.c +++ b/lib_enc/qlpc_stoch_fx.c @@ -11,8 +11,7 @@ #include "rom_com_fx.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" #include "rom_basop_util.h" diff --git a/lib_enc/range_enc_fx.c b/lib_enc/range_enc_fx.c index 81fb7695232db1a83fbc073ae525e79a49bc1b51..b05b2cf99fbe8ede4f1bdacde5e637bf19e2a3ac 100644 --- a/lib_enc/range_enc_fx.c +++ b/lib_enc/range_enc_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/re8_cod_fx.c b/lib_enc/re8_cod_fx.c index 0b14385fecf180e19568567834ad0aea5b01f3e7..e035baf57ccfbd988bbb2596722035453751371f 100644 --- a/lib_enc/re8_cod_fx.c +++ b/lib_enc/re8_cod_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*------------------------------------------------------------------------ diff --git a/lib_enc/reordernorm_fx.c b/lib_enc/reordernorm_fx.c index df30c30846dd8c80d96ddf034f87752de7b603e4..40f12ffb8bec38ed8ecbc01a358e73bd0db34972 100644 --- a/lib_enc/reordernorm_fx.c +++ b/lib_enc/reordernorm_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" #include "rom_com.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------*/ diff --git a/lib_enc/rst_enc_fx.c b/lib_enc/rst_enc_fx.c index 009ba531a12cd147b3f37b1ca81542a4fc872c25..85821ef0b028b6e360b6a57d40979f86ecd85985 100644 --- a/lib_enc/rst_enc_fx.c +++ b/lib_enc/rst_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_enc/scale_enc_fx.c b/lib_enc/scale_enc_fx.c index dd4f88b00d61b64c0ddd4d0cbf39fbfb6ab6e291..cfb3568bb669ed9fa5279c0f59236dfc84d98689 100644 --- a/lib_enc/scale_enc_fx.c +++ b/lib_enc/scale_enc_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_enc/set_impulse_fx.c b/lib_enc/set_impulse_fx.c index a145e42d6ae9dd9c67932c296e12c37e77c52b8a..f9efcacca33312130d2350aa325c9be8ab158818 100644 --- a/lib_enc/set_impulse_fx.c +++ b/lib_enc/set_impulse_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/setmodeindex_fx.c b/lib_enc/setmodeindex_fx.c index 7920db3e2aeb948044a8e97f187a4a210ce92939..dff13ec8964ba2be52e6649edb3e78c08ff5fdfa 100644 --- a/lib_enc/setmodeindex_fx.c +++ b/lib_enc/setmodeindex_fx.c @@ -8,8 +8,7 @@ #include "cnst.h" #include "rom_com_fx.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*--------------------------------------------------------------------------- diff --git a/lib_enc/sig_clas_fx.c b/lib_enc/sig_clas_fx.c index 62f7329399f07327f454fc9c9c435da1adb8fc84..a0ef0caf4d110be61c5c21fcc9a3263a6ad5c530 100644 --- a/lib_enc/sig_clas_fx.c +++ b/lib_enc/sig_clas_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_enc/spec_center_fx.c b/lib_enc/spec_center_fx.c index a3fb197cb19ea30367fb9997120a51a55a956dd5..920da568d721927e05f5e795583fbd17c7efefc4 100644 --- a/lib_enc/spec_center_fx.c +++ b/lib_enc/spec_center_fx.c @@ -8,8 +8,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/spec_flatness_fx.c b/lib_enc/spec_flatness_fx.c index 918faa5e6889f8964655c2c7542701d619680184..271f7ba1b3ed974d0d1b8239c68c123e6386bf24 100644 --- a/lib_enc/spec_flatness_fx.c +++ b/lib_enc/spec_flatness_fx.c @@ -9,8 +9,7 @@ #include "basop_util.h" #include "vad_basop.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/speech_music_classif.c b/lib_enc/speech_music_classif.c index e41e50052810541fe574f13e9e9b744a244bcc42..8df503bd1bbb93e2d4353a585b9e066c8e9e85d1 100644 --- a/lib_enc/speech_music_classif.c +++ b/lib_enc/speech_music_classif.c @@ -45,7 +45,7 @@ #include "rom_com.h" /* Common static table prototypes */ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_enc/speech_music_classif_fx.c b/lib_enc/speech_music_classif_fx.c index 26170c4d2a437cb3a509acd0945766b28cf83942..1606ba3d7057cee7766bf17eb58f0765981e57ab 100644 --- a/lib_enc/speech_music_classif_fx.c +++ b/lib_enc/speech_music_classif_fx.c @@ -11,8 +11,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #ifdef IVAS_FLOAT_FIXED #include diff --git a/lib_enc/stat_noise_uv_enc_fx.c b/lib_enc/stat_noise_uv_enc_fx.c index b72ddf02fc7ab041b69a14d46fa1de3a2decb1c2..809f4e5b36359234c5c2e6b69e177474a796050b 100644 --- a/lib_enc/stat_noise_uv_enc_fx.c +++ b/lib_enc/stat_noise_uv_enc_fx.c @@ -8,8 +8,7 @@ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*======================================================================*/ diff --git a/lib_enc/subband_fft_fx.c b/lib_enc/subband_fft_fx.c index cee91f7ab086b0faf126dcb9ff866b94f1c9f410..e5ffd49a68742299bbe324dea1fbe168da2eed07 100644 --- a/lib_enc/subband_fft_fx.c +++ b/lib_enc/subband_fft_fx.c @@ -9,8 +9,7 @@ #include "vad_basop.h" //#include "prot_fx.h" #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_enc/swb_bwe_enc_fx.c b/lib_enc/swb_bwe_enc_fx.c index 02e122321d1af0e926ac7440b242638705a54013..9cd165b8db21f58a9572f39abbd1b453ad002e4f 100644 --- a/lib_enc/swb_bwe_enc_fx.c +++ b/lib_enc/swb_bwe_enc_fx.c @@ -10,8 +10,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*---------------------------------------------------------------------* diff --git a/lib_enc/swb_bwe_enc_hr_fx.c b/lib_enc/swb_bwe_enc_hr_fx.c index 006a6195b2543e296b5b816b14daa4a4cbc6f686..094ad37fa96e5d3e5371e3b7e55ff76d6cd87dc2 100644 --- a/lib_enc/swb_bwe_enc_hr_fx.c +++ b/lib_enc/swb_bwe_enc_hr_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/swb_bwe_enc_lr_fx.c b/lib_enc/swb_bwe_enc_lr_fx.c index 10df60015950a6a8b85db39512e3612c36e36d94..8cca1104c572060dae448b4996216403573ede4d 100644 --- a/lib_enc/swb_bwe_enc_lr_fx.c +++ b/lib_enc/swb_bwe_enc_lr_fx.c @@ -32,8 +32,7 @@ #include #include "options.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "rom_com.h" #include "enh32.h" diff --git a/lib_enc/swb_pre_proc_fx.c b/lib_enc/swb_pre_proc_fx.c index 1bcef70256c0e8f56de117edc150151e0a298dd7..463f0a96a02ff465af01fb44e7886ec2b30d02b4 100644 --- a/lib_enc/swb_pre_proc_fx.c +++ b/lib_enc/swb_pre_proc_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stl.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/swb_tbe_enc_fx.c b/lib_enc/swb_tbe_enc_fx.c index b4e93c1d32596cd3f267bc3637ed692bb3c1c060..c86d5c97c2eaa2bc7b3eda709e9417a1617676b4 100644 --- a/lib_enc/swb_tbe_enc_fx.c +++ b/lib_enc/swb_tbe_enc_fx.c @@ -9,8 +9,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "stl.h" diff --git a/lib_enc/tcq_core_enc_fx.c b/lib_enc/tcq_core_enc_fx.c index 6de4560d5f3e01fdf0e881afc5e2b05c01275244..29ea322b603be69b72ca8543d2d6b0ae7f0bb39e 100644 --- a/lib_enc/tcq_core_enc_fx.c +++ b/lib_enc/tcq_core_enc_fx.c @@ -8,8 +8,7 @@ //#include "prot_fx.h" #include "rom_com.h" #include "ivas_error.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ ivas_error tcq_core_LR_enc_fx( diff --git a/lib_enc/tcx_ltp_enc_fx.c b/lib_enc/tcx_ltp_enc_fx.c index f44fcd20373d2f3576f2f9b622b07d2f3c61f303..32e44d84ad3f7ece511bd302c3113f4fec47200d 100644 --- a/lib_enc/tcx_ltp_enc_fx.c +++ b/lib_enc/tcx_ltp_enc_fx.c @@ -10,8 +10,7 @@ #include "basop_util.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ static Word32 dot( const Word16 *X, const Word16 *Y, Word16 n ) diff --git a/lib_enc/tcx_utils_enc.c b/lib_enc/tcx_utils_enc.c index 609e03bf4c130e8dd0c13adad2f781e33c796c8b..4f14866c880122a7c9b399b2d532e8b726de7e4f 100644 --- a/lib_enc/tcx_utils_enc.c +++ b/lib_enc/tcx_utils_enc.c @@ -39,7 +39,7 @@ #include "options.h" #include #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "prot_fx_enc.h" #include "rom_com.h" #include "cnst.h" diff --git a/lib_enc/tcx_utils_enc_fx.c b/lib_enc/tcx_utils_enc_fx.c index bfcdd8fdf99e6f23cd9ea30e5db48e3f22a5e01f..1ef5f0463e5a5201fc12cb2a99d8ae2e83eb79a1 100644 --- a/lib_enc/tcx_utils_enc_fx.c +++ b/lib_enc/tcx_utils_enc_fx.c @@ -13,8 +13,7 @@ #include "rom_basop_util.h" #include "basop_util.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define inv_int InvIntTable diff --git a/lib_enc/tfa_enc_fx.c b/lib_enc/tfa_enc_fx.c index aa633912c45a6f753ea7704e99509e12a9574350..cfb48aaeca8a479efd03489958158bead7ccedbb 100644 --- a/lib_enc/tfa_enc_fx.c +++ b/lib_enc/tfa_enc_fx.c @@ -7,8 +7,7 @@ #include "basop_util.h" #include "cnst.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/tns_base_enc_fx.c b/lib_enc/tns_base_enc_fx.c index 4cb7cefdde89c4b15d0ffdc654953fbdfb1153ad..b371381d580c27ab670e4f1bcc535f4144e5b018 100644 --- a/lib_enc/tns_base_enc_fx.c +++ b/lib_enc/tns_base_enc_fx.c @@ -13,8 +13,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "prot.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define HLM_MIN_NRG ( 32768.0f * 2 * NORM_MDCT_FACTOR / ( 640 * 640 ) ) diff --git a/lib_enc/transient_detection_fx.c b/lib_enc/transient_detection_fx.c index 179e1150601a31d7141b9a4adeedf034cfc4a4a2..c57facc67907cbc0eacc8553e4302ab9cfb18e73 100644 --- a/lib_enc/transient_detection_fx.c +++ b/lib_enc/transient_detection_fx.c @@ -12,8 +12,7 @@ #include #include #include -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /* Exponent of attack threshold. Picked according to current threshold values. */ diff --git a/lib_enc/transition_enc.c b/lib_enc/transition_enc.c index 7afc32659bc8848af2511ae85fb407935e48d0db..c888269476595e5dc3aee07bad15b4a99f25a7c0 100644 --- a/lib_enc/transition_enc.c +++ b/lib_enc/transition_enc.c @@ -41,7 +41,7 @@ #include "rom_com.h" #include "prot.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/transition_enc_fx.c b/lib_enc/transition_enc_fx.c index 4e6b1f512b6fed29429d35a3d6c07abf4ef259eb..96b672985b08485a7fbd8a01bb3afe3c94eccee3 100644 --- a/lib_enc/transition_enc_fx.c +++ b/lib_enc/transition_enc_fx.c @@ -8,8 +8,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-----------------------------------------------------------------* diff --git a/lib_enc/update_decision_fx.c b/lib_enc/update_decision_fx.c index 935165d374b9f7ed8819fe3f2278c2df889f14bc..c161ac2563bbe1c976a7deccb8c1219d1b99374e 100644 --- a/lib_enc/update_decision_fx.c +++ b/lib_enc/update_decision_fx.c @@ -8,8 +8,7 @@ #include "basop_util.h" #include "vad_basop.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* * bg_music_decision_fx() diff --git a/lib_enc/updt_enc_fx.c b/lib_enc/updt_enc_fx.c index daa7d5d018d74c9cacf157017e14e94902fe2992..1b153f387b8ef296d413e285dc5ecc8e60e2e1ab 100644 --- a/lib_enc/updt_enc_fx.c +++ b/lib_enc/updt_enc_fx.c @@ -7,8 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/updt_tar_fx.c b/lib_enc/updt_tar_fx.c index 19d9cbb70daf867245d3f2d281a2d913d7c6f4c4..d62daff20038c9207323d924910626d50d587404 100644 --- a/lib_enc/updt_tar_fx.c +++ b/lib_enc/updt_tar_fx.c @@ -5,8 +5,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" //#include "prot_fx.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*----------------------------------------------------------------------------------* diff --git a/lib_enc/vad_basop_fx.c b/lib_enc/vad_basop_fx.c index 32f46ce169eb891d4673fc0acabd48bf6c824d42..f8f528c0e512c75cb9568d47512aae54374ed686 100644 --- a/lib_enc/vad_basop_fx.c +++ b/lib_enc/vad_basop_fx.c @@ -5,8 +5,7 @@ #include #include "options.h" //#include "prot_fx.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "vad_basop.h" #include "basop_util.h" diff --git a/lib_enc/vad_fx.c b/lib_enc/vad_fx.c index 56756588cee9ecdd68f9c840fb3c02b48b658a82..d0356f518e67567e254099f52c41e7fad7ee3de4 100644 --- a/lib_enc/vad_fx.c +++ b/lib_enc/vad_fx.c @@ -6,8 +6,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "rom_enc.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/vad_param_updt_fx.c b/lib_enc/vad_param_updt_fx.c index 3012600fad36092a8c2b82ed775825d7cf3b9e10..f1eb9b031b482e168f85f40abd3f4c91028f8780 100644 --- a/lib_enc/vad_param_updt_fx.c +++ b/lib_enc/vad_param_updt_fx.c @@ -7,8 +7,7 @@ #include "cnst.h" /* Common constants */ //#include "prot_fx.h" /* Function prototypes */ #include "ivas_stat_enc.h" /* Function prototypes */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/vad_proc_fx.c b/lib_enc/vad_proc_fx.c index add2243400d60f09ac36ac0c22d3429fe8ea5598..cf235d96df85522ef26ea0524d55c1dd6ce9c644 100644 --- a/lib_enc/vad_proc_fx.c +++ b/lib_enc/vad_proc_fx.c @@ -12,8 +12,7 @@ #include "stat_enc.h" #include "rom_enc.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/vbr_average_rate_fx.c b/lib_enc/vbr_average_rate_fx.c index 659eec5248eba3dcc2fa6b583c5bd8e9c78befd1..fe5766eea883fd5a3fd87d8ce8f7265d06b0c09b 100644 --- a/lib_enc/vbr_average_rate_fx.c +++ b/lib_enc/vbr_average_rate_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "stat_enc.h" /* Static table prototypes */ #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/vlpc_1st_cod_fx.c b/lib_enc/vlpc_1st_cod_fx.c index 561446aa5a55c67b2ac35d825f35138b42b98dc6..cc9592739dae011a0653a3dab05f70514937327c 100644 --- a/lib_enc/vlpc_1st_cod_fx.c +++ b/lib_enc/vlpc_1st_cod_fx.c @@ -9,8 +9,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #define ISF_ONE 3 /*1.0f*1.28f Q1*/ /*=1.0f in 14Q1*1.28*/ diff --git a/lib_enc/vlpc_2st_cod_fx.c b/lib_enc/vlpc_2st_cod_fx.c index e0b2c427afaaa1e636da79b359e96119242c1ce0..0785e9e6e14a161fc9d2c4c60a3e2944714b4e4e 100644 --- a/lib_enc/vlpc_2st_cod_fx.c +++ b/lib_enc/vlpc_2st_cod_fx.c @@ -8,8 +8,7 @@ #include "options.h" //#include "prot_fx.h" #include "control.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/voiced_enc_fx.c b/lib_enc/voiced_enc_fx.c index 2e9035743ef51c8625a990df63042eb62403cf7b..0e3d7b20b179eb4c401ba8ceb0ca018a30280761 100644 --- a/lib_enc/voiced_enc_fx.c +++ b/lib_enc/voiced_enc_fx.c @@ -8,8 +8,7 @@ //#include "prot_fx.h" #include "rom_com_fx.h" #include "rom_com.h" /* Common constants */ -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" /* Function prototypes */ diff --git a/lib_enc/waveadjust_fec_cod_fx.c b/lib_enc/waveadjust_fec_cod_fx.c index a42994223bc0c098d89d8705ccdc0a2f6ce3e30b..378898522fefbf0ed6ee27e78f76e00a9e7db40a 100644 --- a/lib_enc/waveadjust_fec_cod_fx.c +++ b/lib_enc/waveadjust_fec_cod_fx.c @@ -9,8 +9,7 @@ #include "rom_com_fx.h" #include "rom_com.h" #include "stat_com.h" -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c index 2d737022cb55b4b94312c4223512b81b87d69d7e..e9c76787dce8f4a91857d321661da83b65ad0b92 100644 --- a/lib_rend/ivas_crend.c +++ b/lib_rend/ivas_crend.c @@ -44,8 +44,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "control.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_rend/ivas_dirac_ana.c b/lib_rend/ivas_dirac_ana.c index 534f59551a1a96ee86b222177d2055ecd97382d5..f32414199175d85bf62abee2ed5410c7c95823b7 100644 --- a/lib_rend/ivas_dirac_ana.c +++ b/lib_rend/ivas_dirac_ana.c @@ -39,8 +39,7 @@ #include "ivas_stat_rend.h" #include "ivas_rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" #endif diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions.c index 4c52699c932bf806ffbca7083b417264a09b82fa..590704a992e663f2f15c0b28ca9c431d06ebe6cf 100644 --- a/lib_rend/ivas_dirac_dec_binaural_functions.c +++ b/lib_rend/ivas_dirac_dec_binaural_functions.c @@ -35,8 +35,7 @@ #include #include #include "prot.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_cnst.h" diff --git a/lib_rend/ivas_dirac_decorr_dec.c b/lib_rend/ivas_dirac_decorr_dec.c index de0253bb51f2cadfc24fe48c2b572380d34a5cd3..d1f758fe8df76c3f992573afb445899e5f86ba84 100644 --- a/lib_rend/ivas_dirac_decorr_dec.c +++ b/lib_rend/ivas_dirac_decorr_dec.c @@ -41,8 +41,7 @@ #include "ivas_cnst.h" #include "ivas_rom_rend.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*------------------------------------------------------------------------- * Local constants diff --git a/lib_rend/ivas_dirac_onsets_dec.c b/lib_rend/ivas_dirac_onsets_dec.c index 7e2a595911bd537136a7d16f2294d31ddc9a2d3f..c7e4a6ff6e09dccbc7564e9cc9809faf930016be 100644 --- a/lib_rend/ivas_dirac_onsets_dec.c +++ b/lib_rend/ivas_dirac_onsets_dec.c @@ -41,8 +41,7 @@ #include "ivas_rom_com.h" #include "ivas_rom_dec.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #ifdef IVAS_FLOAT_FIXED static Word16 BASOP_Util_Cmp_Mant32Exp_sat( Word32 a_m, Word16 a_e, Word32 b_m, Word16 b_e ); diff --git a/lib_rend/ivas_dirac_output_synthesis_dec.c b/lib_rend/ivas_dirac_output_synthesis_dec.c index 78ebf30097e1f232a5f21b594f55e45a22b4af2c..36b13ed584b0e4f8347a262ce83f476594b130e7 100644 --- a/lib_rend/ivas_dirac_output_synthesis_dec.c +++ b/lib_rend/ivas_dirac_output_synthesis_dec.c @@ -44,8 +44,7 @@ #include "ivas_rom_dec.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" /* Function prototypes */ -#include "prot_fx2.h" /* Function prototypes */ +#include "prot_fx.h" /* Function prototypes */ #endif #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" diff --git a/lib_rend/ivas_dirac_rend.c b/lib_rend/ivas_dirac_rend.c index e96aec922f7a9a475bb57d6f4b5ae8f9f7d7e61b..cc3f78a2d3b6cec34a55f52b5572bc3a80cdc91a 100644 --- a/lib_rend/ivas_dirac_rend.c +++ b/lib_rend/ivas_dirac_rend.c @@ -41,8 +41,7 @@ #include "ivas_cnst.h" #include "ivas_rom_rend.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "ivas_rom_binaural_crend_head.h" diff --git a/lib_rend/ivas_efap.c b/lib_rend/ivas_efap.c index fb6abd9411b8e1a9017498d645c508ccd4866b9b..5229164dd2813f48856912851b47f0d643f6ff1a 100644 --- a/lib_rend/ivas_efap.c +++ b/lib_rend/ivas_efap.c @@ -36,7 +36,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_stat_dec.h" diff --git a/lib_rend/ivas_masa_merge.c b/lib_rend/ivas_masa_merge.c index f1e93e22486542a627b737e070603bf3c597be42..8652e2c71b5a5904cd23192cc32b46f0c80f82cd 100644 --- a/lib_rend/ivas_masa_merge.c +++ b/lib_rend/ivas_masa_merge.c @@ -39,7 +39,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_rend/ivas_mcmasa_ana.c b/lib_rend/ivas_mcmasa_ana.c index 531ab686e09c3140f36d4911afeba585cf492d8a..8149ee639555d43ad3bfdcc2ff598c7cac97ccc5 100644 --- a/lib_rend/ivas_mcmasa_ana.c +++ b/lib_rend/ivas_mcmasa_ana.c @@ -43,8 +43,7 @@ #include "wmc_auto.h" #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_rom_com_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_rend/ivas_objectRenderer.c b/lib_rend/ivas_objectRenderer.c index b2ebebb87b8c8dd787ee9de5f8d4db77a03f7b7d..0a12e65b3c982c1e3a9f8ec93088613808da408c 100644 --- a/lib_rend/ivas_objectRenderer.c +++ b/lib_rend/ivas_objectRenderer.c @@ -41,8 +41,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #include "ivas_rom_com_fx.h" #define float_to_fixed( n, factor ) ( round( n * ( 1 << factor ) ) ) diff --git a/lib_rend/ivas_objectRenderer_hrFilt.c b/lib_rend/ivas_objectRenderer_hrFilt.c index c2fe6a26264b311296c35d9203ddab89d9bb48f0..8568da9eb6b18b2f74b126746df731bbf216d70b 100644 --- a/lib_rend/ivas_objectRenderer_hrFilt.c +++ b/lib_rend/ivas_objectRenderer_hrFilt.c @@ -39,8 +39,7 @@ #include "ivas_rom_rend.h" #include "ivas_cnst.h" #include "wmc_auto.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_rend/ivas_objectRenderer_mix.c b/lib_rend/ivas_objectRenderer_mix.c index 06a645622c6d0c8b7e187dc3fd9a6a3fdcbe4846..997477c5d20727c2dedb67786fb68fbf238f0663 100644 --- a/lib_rend/ivas_objectRenderer_mix.c +++ b/lib_rend/ivas_objectRenderer_mix.c @@ -41,7 +41,7 @@ #include "ivas_prot_fx.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED #define IVAS_FLOAT_FIXED_TO_BE_REMOVED diff --git a/lib_rend/ivas_objectRenderer_sfx.c b/lib_rend/ivas_objectRenderer_sfx.c index 6bb4b0c4409eb87b912ce00b1fee1833e8a30af8..382632999717eea9f85914ec0b72ae776088c8da 100644 --- a/lib_rend/ivas_objectRenderer_sfx.c +++ b/lib_rend/ivas_objectRenderer_sfx.c @@ -38,7 +38,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_rend/ivas_objectRenderer_sources.c b/lib_rend/ivas_objectRenderer_sources.c index 15159cacfc42f3033e1178aa8abc26da784588ff..6fa37e77f0d649bf2fbf58562df9d485ea140e35 100644 --- a/lib_rend/ivas_objectRenderer_sources.c +++ b/lib_rend/ivas_objectRenderer_sources.c @@ -38,8 +38,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include "ivas_prot_fx.h" -#include "prot_fx2.h" -#include "prot_fx1.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED diff --git a/lib_rend/ivas_objectRenderer_vec.c b/lib_rend/ivas_objectRenderer_vec.c index 714fdb2992193fda93c3c96d7d496c623541f99d..f24edf8bd86261e22dc081914ece1c143845c61f 100644 --- a/lib_rend/ivas_objectRenderer_vec.c +++ b/lib_rend/ivas_objectRenderer_vec.c @@ -36,8 +36,7 @@ #include "prot.h" #include "ivas_prot_rend.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" diff --git a/lib_rend/ivas_omasa_ana.c b/lib_rend/ivas_omasa_ana.c index cbf60f70f65f63adf7221e19b60b24bd70e71bbb..476cbbe3e38f8a0a8e24ed2fc614e4772b5309b2 100644 --- a/lib_rend/ivas_omasa_ana.c +++ b/lib_rend/ivas_omasa_ana.c @@ -41,7 +41,7 @@ #include "ivas_stat_rend.h" #include "ivas_rom_com.h" #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" #define IVAS_FLOAT_FIXED_TO_BE_REMOVED diff --git a/lib_rend/ivas_orient_trk.c b/lib_rend/ivas_orient_trk.c index edea2f0494d63d93a834577aadeb06f50174a1d0..6f308742c4ac7f605cdf6f61b5b5cd637bdb21bb 100644 --- a/lib_rend/ivas_orient_trk.c +++ b/lib_rend/ivas_orient_trk.c @@ -40,8 +40,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif /*------------------------------------------------------------------------------------------* diff --git a/lib_rend/ivas_reflections.c b/lib_rend/ivas_reflections.c index ea4b114184d01da34f44d23d3d3611333b590693..c684c29c4eb8e200fc79849185398d392461e0bb 100644 --- a/lib_rend/ivas_reflections.c +++ b/lib_rend/ivas_reflections.c @@ -43,8 +43,7 @@ #include "ivas_rom_com.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_rend/ivas_render_config.c b/lib_rend/ivas_render_config.c index 65525868cda2a86d8b92cb0e44390c5a6f28f5da..c7161061b9496018382d84ff361dec075a1e6173 100644 --- a/lib_rend/ivas_render_config.c +++ b/lib_rend/ivas_render_config.c @@ -37,7 +37,7 @@ #include "ivas_rom_rend.h" #include "ivas_rom_TdBinauralRenderer.h" #include "wmc_auto.h" -#include "prot_fx1.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------* * Local constants diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb.c index 127dd83268ce80e5a91a1c1e71e948b7991173b5..557105d4385313c25aa835dbeabd8bd52abc2247 100644 --- a/lib_rend/ivas_reverb.c +++ b/lib_rend/ivas_reverb.c @@ -40,8 +40,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define float_to_fixQ31( n ) ( round( n * 0x7fffffff ) ) diff --git a/lib_rend/ivas_reverb_delay_line.c b/lib_rend/ivas_reverb_delay_line.c index d24bbe1ec3233e9fbbdd526863dd555d5176e831..0de9e386c8688d30808ef1e784c2321ea60e4279 100644 --- a/lib_rend/ivas_reverb_delay_line.c +++ b/lib_rend/ivas_reverb_delay_line.c @@ -37,8 +37,7 @@ #include "prot.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_rend/ivas_reverb_fft_filter.c b/lib_rend/ivas_reverb_fft_filter.c index 62ab464da4838c13afa711e1ec6da6b571ffd2d4..1889974cd8925f868db96dbb3275c9322f2399a6 100644 --- a/lib_rend/ivas_reverb_fft_filter.c +++ b/lib_rend/ivas_reverb_fft_filter.c @@ -37,8 +37,7 @@ #include #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_rend/ivas_reverb_filter_design.c b/lib_rend/ivas_reverb_filter_design.c index b293d6e22b8e4d898d7bacf8a6406b42cba932f7..ba6c43a09a761863e73f990617103479cbae5dc6 100644 --- a/lib_rend/ivas_reverb_filter_design.c +++ b/lib_rend/ivas_reverb_filter_design.c @@ -33,7 +33,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_rend.h" #include #include diff --git a/lib_rend/ivas_reverb_iir_filter.c b/lib_rend/ivas_reverb_iir_filter.c index 1f1508b5e84674aced11df0a0d58a35fa33b934f..51404ad5ab9ed0a5d148c88dbefb417651c42b61 100644 --- a/lib_rend/ivas_reverb_iir_filter.c +++ b/lib_rend/ivas_reverb_iir_filter.c @@ -36,8 +36,7 @@ #include "ivas_prot_rend.h" #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_rend/ivas_reverb_utils.c b/lib_rend/ivas_reverb_utils.c index 7f4af770372e983224af0e798dbaadbd4668593b..c382c034a43dde17bbb5c2419a1289fb615dfc3d 100644 --- a/lib_rend/ivas_reverb_utils.c +++ b/lib_rend/ivas_reverb_utils.c @@ -37,7 +37,7 @@ #include "ivas_rom_rend.h" #include #include "wmc_auto.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------------------------* * Local constants diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation.c index 5290f0abb38914574207467677248cee7e2eab60..3e9261af1e8e2696f99001a854b0a43b25ebbbb0 100644 --- a/lib_rend/ivas_rotation.c +++ b/lib_rend/ivas_rotation.c @@ -42,8 +42,7 @@ #include "wmc_auto.h" #ifdef IVAS_FLOAT_FIXED #include -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #include "debug.h" #include "ivas_rom_binaural_crend_head.h" diff --git a/lib_rend/ivas_sba_rendering.c b/lib_rend/ivas_sba_rendering.c index c2aeaef5d038b8b674d78bd6260ef2c2b4468244..9c95a2d8cfd8db7982bec7209dd36664df56179b 100644 --- a/lib_rend/ivas_sba_rendering.c +++ b/lib_rend/ivas_sba_rendering.c @@ -33,8 +33,7 @@ #include #include "options.h" #include "prot.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_stat_dec.h" diff --git a/lib_rend/ivas_td_decorr.c b/lib_rend/ivas_td_decorr.c index 2e14388f82ec9d1c0af40b9054be643dbf4ed0b6..e3e224c9afb829c034137f186464570b597574bc 100644 --- a/lib_rend/ivas_td_decorr.c +++ b/lib_rend/ivas_td_decorr.c @@ -34,8 +34,7 @@ #include "options.h" #include "prot.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #endif #include "ivas_prot.h" #ifdef IVAS_FLOAT_FIXED diff --git a/lib_rend/ivas_vbap.c b/lib_rend/ivas_vbap.c index bc8090c7a71161984abb0d3f17774527db58d9e4..c6524aeed35ec344c1a99dc53fc6df24e28ce31b 100644 --- a/lib_rend/ivas_vbap.c +++ b/lib_rend/ivas_vbap.c @@ -35,13 +35,11 @@ #include #include #include "prot.h" -#include "prot_fx2.h" #include "ivas_prot.h" #include "ivas_prot_rend.h" #include "ivas_stat_dec.h" #include "wmc_auto.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" /*-----------------------------------------------------------------------* * Local constants diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index bd7ebe21d73c8db2c96093b9b2aa392017aa69f1..3db18bcf109220387d08afbdbed9bde22fc78381 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -47,8 +47,7 @@ #ifdef IVAS_FLOAT_FIXED #include "ivas_rom_com_fx.h" #include "ivas_prot_fx.h" -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "debug.h" #define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) ) #define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) ) diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c index a4994e544b0f554c5f8ee9b7de50208c5695186c..e8bbe3653bccd9541d4ad1225e01e6934a6d0f2a 100644 --- a/lib_util/hrtf_file_reader.c +++ b/lib_util/hrtf_file_reader.c @@ -34,7 +34,7 @@ #include #include "prot.h" #include "ivas_prot_rend.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot.h" /*---------------------------------------------------------------------* diff --git a/lib_util/ism_file_reader.c b/lib_util/ism_file_reader.c index 9127fe84758be7e3e33d6f8a737332781d7ae6a8..ae35e6d463de7d6f9a188dab4dcf9fe393721f09 100644 --- a/lib_util/ism_file_reader.c +++ b/lib_util/ism_file_reader.c @@ -35,7 +35,7 @@ #include #include #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif // IVAS_FLOAT_FIXED #define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */ diff --git a/lib_util/rotation_file_reader.c b/lib_util/rotation_file_reader.c index f5a815377b6aabec172d38302acc3c465fa5e7e3..47ba31fb8775a2f2916fc321acccb7ccceac77cb 100644 --- a/lib_util/rotation_file_reader.c +++ b/lib_util/rotation_file_reader.c @@ -36,7 +36,7 @@ #include #include "prot.h" #ifdef IVAS_FLOAT_FIXED -#include "prot_fx2.h" +#include "prot_fx.h" #endif diff --git a/lib_util/vector3_pair_file_reader.c b/lib_util/vector3_pair_file_reader.c index 00c23a497da35bb2e23f94e9e01435d2910e859e..aa828b0eef5911f63a7d40075ce76e6049385f7e 100644 --- a/lib_util/vector3_pair_file_reader.c +++ b/lib_util/vector3_pair_file_reader.c @@ -38,8 +38,7 @@ #include "prot.h" #include "options.h" /* only included to get access to the feature-defines */ #ifdef IVAS_FLOAT_FIXED -#include "prot_fx1.h" -#include "prot_fx2.h" +#include "prot_fx.h" #include "ivas_prot_fx.h" #endif