Merge branch 'float_dependencies_cleanup_7' into 'main' (5732e5a2) · 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_fx()
		* calc_st_filt()
		*
		* 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_fx(
		void calc_st_filt(
		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_ism_com.c

+19 −7

Original line number	Diff line number	Diff line
		@@ -787,6 +787,16 @@ void ivas_ism_reset_metadata_enc(

		return;
		}

		void ivas_ism_reset_metadata_API(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		)
		{
		ivas_ism_reset_metadata_enc(hIsmMeta);

		return;
		}

		#else
		void ivas_ism_reset_metadata(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		@@ -802,6 +812,15 @@ void ivas_ism_reset_metadata(

		return;
		}

		void ivas_ism_reset_metadata_API(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		)
		{
		ivas_ism_reset_metadata(hIsmMeta);

		return;
		}
		#endif

		/-------------------------------------------------------------------
		@@ -810,14 +829,7 @@ void ivas_ism_reset_metadata(
		* Reset ISM metadata parameters
		-------------------------------------------------------------------/

		void ivas_ism_reset_metadata_API(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		)
		{
		ivas_ism_reset_metadata_enc( hIsmMeta );

		return;
		}


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

lib_com/ivas_prot.h

+17 −4

Original line number	Diff line number	Diff line
		@@ -503,7 +503,7 @@ ivas_error ivas_core_enc(
		const int16_t ivas_format, /* i : IVAS format */
		const int16_t flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */
		);

		#ifdef IVAS_FLOAT_FIXED
		ivas_error ivas_core_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		SCE_DEC_HANDLE hSCE, /* i/o: SCE decoder structure */
		@@ -515,6 +515,20 @@ ivas_error ivas_core_dec(
		Word32 DFT_fx[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
		const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
		);
		#else
		ivas_error ivas_core_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		SCE_DEC_HANDLE hSCE, /* i/o: SCE decoder structure */
		CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
		MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
		const int16_t n_channels, /* i : number of channels to be decoded */
		float output[], / o : output synthesis signal */
		float outputHB[][L_FRAME48k], /* o : output HB synthesis signal */
		float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
		const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
		);
		#endif


		void encod_gen_2sbfr(
		Encoder_State st, / i/o: state structure */
		@@ -1095,11 +1109,10 @@ void bitbudget_to_brate(
		void ivas_ism_reset_metadata(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handles */
		);
		#ifdef IVAS_FLOAT_FIXED //to be removed when converting encoder

		void ivas_ism_reset_metadata_enc(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		);
		#endif
		void ivas_ism_reset_metadata_API(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handles */
		);
		@@ -4982,7 +4995,7 @@ void FdCngEncodeDiracMDCTStereoSID(
		CPE_ENC_HANDLE hCPE /* i/o: CPE encoder state structure */
		);

		void FdCngDecodeDiracMDCTStereoSID_fx(
		void FdCngDecodeDiracMDCTStereoSID(
		CPE_DEC_HANDLE hCPE /* i/o: CPE decoder state structure */
		);

lib_com/prot.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -2530,16 +2530,6 @@ 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 */

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_fx( apond2, apond1, &parcor0, sig_ltp + 1, mem_zero, L_SUBFR16k, SWB_TBE );
		calc_st_filt( 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 );