commit 1 (6ca52229) · 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_rom_com_fx.c

+29 −0

Original line number	Diff line number	Diff line
		@@ -1531,6 +1531,26 @@ const Word32 delta_theta_masa_fx[NO_SPHERICAL_GRIDS - 2] = {
		188743680, 188743680, 150994944, 106954752, 83886080, 62914560, 45214596, 28101836, 20971520
		};

		// q = 14
		const Word16 coherence_cb0_masa_Q14[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH] = {
		783, 4173, 9036, 16163, 22238, 27587, 32234, 0,
		1984, 6755, 11464, 16636, 23260, 29444, 0, 0,
		2644, 9296, 15906, 22444, 28438, 0, 0, 0,
		3849, 11970, 19744, 27111, 0, 0, 0, 0,
		3901, 11772, 19264, 26763, 0, 0, 0, 0,
		3932, 11513, 18689, 26613, 0, 0, 0, 0,
		5764, 15398, 26958, 0, 0, 0, 0, 0,
		16384, 0, 0, 0, 0, 0, 0, 0,
		2367, 5623, 8767, 12327, 16540, 21643, 28507, 0,
		3280, 7286, 11254, 15717, 21447, 27900, 0, 0,
		4288, 9103, 14164, 19964, 26298, 0, 0, 0,
		5436, 11158, 17113, 24101, 0, 0, 0, 0,
		5446, 10794, 16351, 23206, 0, 0, 0, 0,
		5535, 10908, 16399, 23378, 0, 0, 0, 0,
		6531, 13507, 22161, 0, 0, 0, 0, 0,
		16384, 0, 0, 0, 0, 0, 0, 0
		};

		// q = 21
		const Word32 coherence_cb0_masa_fx[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH] = {
		100243, 534144, 1156579, 2068840, 2846464, 3531184, 4125936, 0, 253965, 864655, 1467377,
		@@ -1544,6 +1564,15 @@ const Word32 coherence_cb0_masa_fx[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH] =
		1728892, 2836607, 0, 0, 0, 0, 0, 2097152, 0, 0, 0, 0, 0, 0, 0
		};

		// q = 15
		const Word16 coherence_cb1_masa_Q15[MASA_NO_CV_COH1 * MASA_MAXIMUM_CODING_SUBBANDS] = {
		-62, 8510, -8834, 20542, -20627,
		-180, 8461, -9123, 21211, -21424,
		-95, 8212, -8618, 21293, -21430,
		-13, 8343, -8451, 22449, -22095,
		56, 8261, -8123, 23649, -23452
		};

		// q = 21
		const Word32 coherence_cb1_masa_fx[MASA_NO_CV_COH1 * MASA_MAXIMUM_CODING_SUBBANDS] = {
		-3984, 544630, -565392, 1314704, -1320157, -11534, 541484, -583847, 1357486, -1371118,

lib_com/ivas_rom_com_fx.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -166,7 +166,9 @@ extern const Word16 ivas_param_mc_quant_icc_fx[PARAM_MC_SZ_ICC_QUANTIZER];
		extern const Word32 no_phi_masa_inv_fx[NO_SPHERICAL_GRIDS][MAX_NO_THETA];
		extern const Word32 azimuth_cb_fx[8];
		extern const Word32 delta_theta_masa_fx[NO_SPHERICAL_GRIDS - 2];
		extern const Word16 coherence_cb0_masa_Q14[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH];
		extern const Word32 coherence_cb0_masa_fx[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH];
		extern const Word16 coherence_cb1_masa_Q15[MASA_NO_CV_COH1 * MASA_MAXIMUM_CODING_SUBBANDS]; /* 25 */
		extern const Word32 coherence_cb1_masa_fx[MASA_NO_CV_COH1 * MASA_MAXIMUM_CODING_SUBBANDS]; /* 25 */

		/* Multi-channel input and output setups */