Merge branch 'jbm_dec_tc_flt_cleanup_MC_param_updates' into 'main' (9ce98266) · Commits · SA4 / Audio / IVAS BASOP

lib_com/calc_st_com.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -95,14 +95,14 @@ static void calc_rc0_h(


		/*----------------------------------------------------------------------------
		* calc_st_filt()
		* calc_st_filt_fx()
		*
		* computes impulse response of A(gamma2) / A(gamma1)
		* controls gain : computation of energy impulse response as
		* SUMn (abs (h[n])) and computes parcor0
		---------------------------------------------------------------------------- /

		void calc_st_filt(
		void calc_st_filt_fx(
		const float apond2, / i : coefficients of numerator */
		const float apond1, / i : coefficients of denominator */
		float parcor0, / o : 1st parcor calcul. on composed filter */

lib_com/ivas_rom_com.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2784,7 +2784,7 @@ const float ivas_param_mc_quant_ild_5d1_48[PARAM_MC_SZ_ILD_QUANTIZER_4BITS] =
		};

		#ifdef IVAS_FLOAT_FIXED
		//Q7
		//Q8
		const Word16 ivas_param_mc_quant_ild_5d1_48_fx[PARAM_MC_SZ_ILD_QUANTIZER_4BITS] =
		{
		-25600 ,-5120 ,-3328 ,-2560 ,-2048 ,-1408 ,-896 ,-384 ,0 ,384 ,896 ,1408 ,2048 ,2560 ,3328 ,5120 ,
		@@ -2798,10 +2798,10 @@ const float ivas_param_mc_quant_icc[PARAM_MC_SZ_ICC_QUANTIZER] =
		};

		#ifdef IVAS_FLOAT_FIXED
		//Q14
		//Q15
		const Word16 ivas_param_mc_quant_icc_fx[PARAM_MC_SZ_ICC_QUANTIZER] =
		{
		-16220 ,-9650 ,0 ,6023 ,9845 ,13782 ,15352 ,16384 ,
		-32440,-19300,0,12046,19690,27563,30703,32767
		};
		#endif

lib_com/prot.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -2530,6 +2530,17 @@ void calc_st_filt(
		const int16_t extl /* i : extension layer info */
		);

		void calc_st_filt_fx(
		const float apond2, / i : coefficients of numerator */
		const float apond1, / i : coefficients of denominator */
		float parcor0, / o : 1st parcor calcul. on composed filter */
		float sig_ltp_ptr, / i/o: input of 1/A(gamma1) : scaled by 1/g0 */
		float mem_zero, / i/o: All zero memory */
		const int16_t L_subfr, /* i : the length of subframe */
		const int16_t extl /* i : extension layer info */

		);

		void scale_st_ivas(
		const float sig_in, / i : postfilter input signal */
		float sig_out, / i/o: postfilter output signal */

lib_com/prot_fx2.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -6162,12 +6162,12 @@ void TonalMDCTConceal_Apply(
		);

		//dec_post_fx
		void Init_post_filter(
		void Init_post_filter_fx(
		PFSTAT_HANDLE hPFstat /* i : core decoder parameters */
		); /* (i) : core decoder parameters */


		void nb_post_filt(
		void nb_post_filt_fx(
		const Word16 L_frame, /* i : frame length */
		PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */
		Word16* psf_lp_noise, /* i : Long term noise Q8 */
		@@ -6180,7 +6180,7 @@ void TonalMDCTConceal_Apply(
		const Word16 disable_hpf /* i : flag to diabled HPF */
		);

		void formant_post_filt(
		void formant_post_filt_fx(
		PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */
		Word16 synth_in, / i : 12k8 synthesis */
		Word16 Aq, / i : LP filter coefficient */
		@@ -6192,7 +6192,7 @@ void TonalMDCTConceal_Apply(
		);

		#ifdef IVAS_FLOAT_FIXED
		void formant_post_filt_fx(
		void formant_post_filt_ivas_fx(
		PFSTAT_HANDLE hPFstat, /* i : core decoder parameters */
		Word16 synth_in, / i : 12k8 synthesis */
		Word16 Aq, / i : LP filter coefficient */
		@@ -6203,7 +6203,7 @@ void TonalMDCTConceal_Apply(
		const Word16 off_flag /* i : off flag */
		);
		#endif
		void Filt_mu(
		void Filt_mu_fx(
		Word16 * sig_in, /* i : signal (beginning at sample -1) */
		Word16 * sig_out, /* o : signal with tilt */
		Word16 parcor0, /* i : parcor0 (mu = parcor0 * gamma3) */
		@@ -6211,7 +6211,7 @@ void TonalMDCTConceal_Apply(
		);

		#ifdef IVAS_FLOAT_FIXED
		void Filt_mu_fx(
		void Filt_mu_ivas_fx(
		Word16 * sig_in, /* i : signal (beginning at sample -1) */
		Word16 * sig_out, /* o : signal with tilt */
		Word16 parcor0, /* i : parcor0 (mu = parcor0 * gamma3) */
		@@ -6219,14 +6219,14 @@ void TonalMDCTConceal_Apply(
		const Word16 extl
		);
		#endif
		void scale_st(
		void scale_st_fx(
		const Word16 * sig_in, /* i : postfilter i signal */
		Word16 * sig_out, /* i/o: postfilter o signal */
		Word16 * gain_prec, /* i/o: last value of gain for subframe */
		Word16 L_subfr
		);

		void blend_subfr2(
		void blend_subfr2_fx(
		Word16 sigIn1, / i : i signal for fade-out */
		Word16 sigIn2, / i : i signal for fade-in */
		Word16 sigOut / o : output signal */

lib_com/swb_tbe_com.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -743,7 +743,7 @@ void PostShortTerm(
		sig_ltp[0] = *ptr_mem_stp;

		/* Control short term pst filter gain and compute parcor0 */
		calc_st_filt( apond2, apond1, &parcor0, sig_ltp + 1, mem_zero, L_SUBFR16k, SWB_TBE );
		calc_st_filt_fx( apond2, apond1, &parcor0, sig_ltp + 1, mem_zero, L_SUBFR16k, SWB_TBE );

		/* 1/A(gamma1) filtering, mem_stp is updated */
		syn_filt( apond1, LPC_SHB_ORDER, sig_ltp + 1, sig_ltp + 1, L_SUBFR16k, mem_stp, 1 );