merge main back to 907 (c86bdfca) · Commits · SA4 / Audio / IVAS BASOP

lib_com/cldfb.c

+44 −0

Original line number	Diff line number	Diff line
		@@ -2808,6 +2808,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = NULL;
		hs->rot_vec_syn_delay_im = NULL;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = NULL;
		hs->rot_vec_ana_delay_im_fx = NULL;
		hs->rot_vec_syn_delay_re_fx = NULL;
		hs->rot_vec_syn_delay_im_fx = NULL;
		hs->p_filter_sf = (Word16) 17036;
		hs->scale = cldfb_scale_2_5ms[0];
		hs->p_filter = CLDFB80_10_fx;
		@@ -2824,6 +2828,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = rot_vec_delay_re_LDQMF;
		hs->rot_vec_syn_delay_im = rot_vec_delay_im_LDQMF;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = rot_vec_delay_re_LDQMF_fx;
		hs->rot_vec_ana_delay_im_fx = rot_vec_delay_im_LDQMF_fx;
		hs->rot_vec_syn_delay_re_fx = rot_vec_delay_re_LDQMF_fx;
		hs->rot_vec_syn_delay_im_fx = rot_vec_delay_im_LDQMF_fx;
		hs->p_filter_sf = (Word16) 15388;
		hs->p_filter = LDQMF_10_fx;
		hs->scale = cldfb_scale_5_0ms[0];
		@@ -2859,6 +2867,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = NULL;
		hs->rot_vec_syn_delay_im = NULL;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = NULL;
		hs->rot_vec_ana_delay_im_fx = NULL;
		hs->rot_vec_syn_delay_re_fx = NULL;
		hs->rot_vec_syn_delay_im_fx = NULL;
		hs->p_filter_sf = (Word16) 17051;
		hs->p_filter = CLDFB80_16_fx;
		hs->scale = cldfb_scale_2_5ms[1];
		@@ -2875,6 +2887,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = rot_vec_delay_re_LDQMF;
		hs->rot_vec_syn_delay_im = rot_vec_delay_im_LDQMF;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = rot_vec_delay_re_LDQMF_fx;
		hs->rot_vec_ana_delay_im_fx = rot_vec_delay_im_LDQMF_fx;
		hs->rot_vec_syn_delay_re_fx = rot_vec_delay_re_LDQMF_fx;
		hs->rot_vec_syn_delay_im_fx = rot_vec_delay_im_LDQMF_fx;
		hs->p_filter_sf = (Word16) 15388;
		hs->p_filter = LDQMF_16_fx;
		hs->scale = cldfb_scale_5_0ms[1];
		@@ -2916,6 +2932,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = NULL;
		hs->rot_vec_syn_delay_im = NULL;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = NULL;
		hs->rot_vec_ana_delay_im_fx = NULL;
		hs->rot_vec_syn_delay_re_fx = NULL;
		hs->rot_vec_syn_delay_im_fx = NULL;
		hs->p_filter_sf = (Word16) 17050;
		hs->p_filter = CLDFB80_20_fx;
		hs->scale = cldfb_scale_2_5ms[2];
		@@ -2932,6 +2952,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = rot_vec_delay_re_LDQMF;
		hs->rot_vec_syn_delay_im = rot_vec_delay_im_LDQMF;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = rot_vec_delay_re_LDQMF_fx;
		hs->rot_vec_ana_delay_im_fx = rot_vec_delay_im_LDQMF_fx;
		hs->rot_vec_syn_delay_re_fx = rot_vec_delay_re_LDQMF_fx;
		hs->rot_vec_syn_delay_im_fx = rot_vec_delay_im_LDQMF_fx;
		hs->p_filter_sf = (Word16) 15390;
		hs->p_filter = LDQMF_20_fx;
		hs->scale = cldfb_scale_5_0ms[2];
		@@ -2973,6 +2997,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = NULL;
		hs->rot_vec_syn_delay_im = NULL;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = NULL;
		hs->rot_vec_ana_delay_im_fx = NULL;
		hs->rot_vec_syn_delay_re_fx = NULL;
		hs->rot_vec_syn_delay_im_fx = NULL;
		hs->p_filter_sf = (Word16) 17051;
		hs->scale = cldfb_scale_2_5ms[6];
		hs->p_filter = CLDFB80_30_fx;
		@@ -2989,6 +3017,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = rot_vec_delay_re_LDQMF;
		hs->rot_vec_syn_delay_im = rot_vec_delay_im_LDQMF;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = rot_vec_delay_re_LDQMF_fx;
		hs->rot_vec_ana_delay_im_fx = rot_vec_delay_im_LDQMF_fx;
		hs->rot_vec_syn_delay_re_fx = rot_vec_delay_re_LDQMF_fx;
		hs->rot_vec_syn_delay_im_fx = rot_vec_delay_im_LDQMF_fx;
		hs->p_filter_sf = (Word16) 15388;
		hs->scale = cldfb_scale_5_0ms[6];
		hs->p_filter = LDQMF_30_fx;
		@@ -3024,6 +3056,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = NULL;
		hs->rot_vec_syn_delay_im = NULL;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = NULL;
		hs->rot_vec_ana_delay_im_fx = NULL;
		hs->rot_vec_syn_delay_re_fx = NULL;
		hs->rot_vec_syn_delay_im_fx = NULL;
		hs->p_filter_sf = (Word16) 17050;
		hs->p_filter = CLDFB80_32_fx;
		hs->scale = cldfb_scale_2_5ms[3];
		@@ -3040,6 +3076,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = rot_vec_delay_re_LDQMF;
		hs->rot_vec_syn_delay_im = rot_vec_delay_im_LDQMF;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = rot_vec_delay_re_LDQMF_fx;
		hs->rot_vec_ana_delay_im_fx = rot_vec_delay_im_LDQMF_fx;
		hs->rot_vec_syn_delay_re_fx = rot_vec_delay_re_LDQMF_fx;
		hs->rot_vec_syn_delay_im_fx = rot_vec_delay_im_LDQMF_fx;
		hs->p_filter_sf = (Word16) 15392;
		hs->scale = cldfb_scale_5_0ms[3];
		hs->p_filter = LDQMF_32_fx;
		@@ -3081,6 +3121,10 @@ static void cldfb_init_proto_and_twiddles_enc(
		hs->rot_vec_syn_delay_re = NULL;
		hs->rot_vec_syn_delay_im = NULL;
		#ifdef IVAS_FLOAT_FIXED
		hs->rot_vec_ana_delay_re_fx = NULL;
		hs->rot_vec_ana_delay_im_fx = NULL;
		hs->rot_vec_syn_delay_re_fx = NULL;
		hs->rot_vec_syn_delay_im_fx = NULL;
		hs->p_filter_sf = (Word16) 17051;
		hs->q_scale = norm_s( (Word16) CLDFB80_40_SCALE );
		hs->scale = cldfb_scale_2_5ms[4];

lib_com/cng_exc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@
		#define A2 0.2f
		#define GAIN_VAR 0.000011f

		#ifndef IVAS_FLOAT_FIXED
		/-------------------------------------------------------
		* CNG_exc()
		*
		@@ -469,6 +470,7 @@ void cng_params_postupd(

		return;
		}
		#endif


		/-------------------------------------------------------

lib_com/guided_plc_util.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -40,13 +40,12 @@
		#include "rom_com.h"
		#include "wmc_auto.h"

		#ifndef IVAS_FLOAT_FIXED
		/-------------------------------------------------------------------
		* Local function prototypes
		-------------------------------------------------------------------/

		#ifndef IVAS_FLOAT_FIXED
		static void reorder_lsfs_flt( float *lsf, float min_dist, const int16_t n, const int32_t sr_core );
		#endif


		/-------------------------------------------------------------------
		@@ -141,7 +140,7 @@ void getConcealedLP_flt(
		*
		*
		-------------------------------------------------------------------/
		#ifndef IVAS_FLOAT_FIXED

		void RecLpcSpecPowDiffuseLc_flt(
		float *lspq,
		float *lsp_old,
		@@ -184,7 +183,6 @@ void RecLpcSpecPowDiffuseLc_flt(

		return;
		}
		#endif

		/-------------------------------------------------------------------
		* modify_lsf_flt()
		@@ -238,7 +236,6 @@ void modify_lsf_flt(
		*
		-------------------------------------------------------------------/

		#ifndef IVAS_FLOAT_FIXED
		static void reorder_lsfs_flt(
		float lsf, / i/o: vector of lsfs in the frequency domain (0..0.5)*/
		float min_dist, /* i : minimum required distance */

lib_com/ivas_cnst.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1550,9 +1550,11 @@ typedef enum
		#define PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC (15.0f)
		#define PARAM_MC_NUM_ATTACK_ILD_THRESH (3)
		#define PARAM_MC_LFE_ON_THRESH (8000.0f)
		#define PARAM_MC_LFE_ON_THRESH_FX 8000 //Q0
		#define PARAM_MC_BAND_TO_MDCT_BAND_RATIO 16 /* Ratio of resolution of CLDFB Bands to MDCT Bands */
		#define PARAM_MC_SLOT_ENC_NS 2500000L
		#define PARAM_MC_MDFT_NO_SLOTS 8
		#define INV_PARAM_MC_MDFT_NO_SLOTS_FX 4096 //Q15
		#define PARAM_MC_CLDFB_TO_MDFT_FAC 2

		/----------------------------------------------------------------------------------

lib_com/ivas_mc_param_com.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,9 @@ void ivas_param_mc_metadata_open(
		hMetadataPMC->icc_mapping_conf = ivas_param_mc_conf[config_index].icc_mapping_conf;
		hMetadataPMC->ild_mapping_conf = ivas_param_mc_conf[config_index].ild_mapping_conf;
		hMetadataPMC->ild_factors = ivas_param_mc_conf[config_index].ild_factors;
		#ifdef IVAS_FLOAT_FIXED
		hMetadataPMC->ild_factors_fx = ivas_param_mc_conf[config_index].ild_factors_fx; /Q15/
		#endif

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		/* set default ICC maps */