[cleanup] accept HARM_LSF_ENC (0c540960) · Commits · SA4 / Audio / IVAS BASOP

lib_com/int_lsp_fx.c

+0 −84

Original line number	Diff line number	Diff line
		@@ -132,12 +132,10 @@ void int_lsp4_fx(
		{
		pt_int_coeffs = interpol_frac_mid_relaxprev_pred_12k8_fx; /Q15/
		}
		#ifdef HARM_LSF_ENC
		ELSE IF( EQ_16( relax_prev_lsf_interp, -2 ) )
		{
		pt_int_coeffs = interpol_frac2_mid_fx; /Q15/
		}
		#endif
		ELSE
		{
		pt_int_coeffs = interpol_frac_mid_fx; /Q15/
		@@ -183,85 +181,3 @@ void int_lsp4_fx(

		return;
		}
		#ifndef HARM_LSF_ENC

		void int_lsp4_ivas_fx(
		const Word16 L_frame, /* i : length of the frame */
		const Word16 lsp_old[], /* i : LSPs from past frame Q15*/
		const Word16 lsp_mid[], /* i : LSPs from mid-frame Q15*/
		const Word16 lsp_new[], /* i : LSPs from present frame Q15*/
		Word16 Aq, / o : LP coefficients in both subframes Q12*/
		const Word16 m, /* i : order of LP filter */
		Word16 relax_prev_lsf_interp /* i : relax prev frame lsf interp after erasure */
		)
		{
		Word16 lsp[M16k];
		Word16 i, j, k;
		Word32 L_tmp;
		const Word16 *pt_int_coeffs;

		IF( EQ_16( L_frame, L_FRAME ) )
		{
		IF( EQ_16( relax_prev_lsf_interp, 1 ) )
		{
		pt_int_coeffs = interpol_frac_mid_relaxprev_12k8_fx; /Q15/
		}
		ELSE IF( EQ_16( relax_prev_lsf_interp, 2 ) )
		{
		pt_int_coeffs = interpol_frac_mid_FEC_fx; /Q15/
		}
		ELSE IF( EQ_16( relax_prev_lsf_interp, -1 ) )
		{
		pt_int_coeffs = interpol_frac_mid_relaxprev_pred_12k8_fx; /Q15/
		}
		ELSE IF( EQ_16( relax_prev_lsf_interp, -2 ) )
		{
		// This condition not present in int_lsp4_fx
		pt_int_coeffs = interpol_frac2_mid_fx; /Q15/
		}
		ELSE
		{
		pt_int_coeffs = interpol_frac_mid_fx; /Q15/
		}
		}
		ELSE /* L_frame == L_FRAME16k */
		{
		IF( EQ_16( relax_prev_lsf_interp, 1 ) )
		{
		pt_int_coeffs = interpol_frac_mid_relaxprev_16k_fx; /Q15/
		}
		ELSE IF( EQ_16( relax_prev_lsf_interp, 2 ) )
		{
		pt_int_coeffs = interpol_frac_mid_16k_FEC_fx; /Q15/
		}
		ELSE IF( EQ_16( relax_prev_lsf_interp, -1 ) )
		{
		pt_int_coeffs = interpol_frac_mid_relaxprev_pred_16k_fx; /Q15/
		}
		ELSE
		{
		pt_int_coeffs = interpol_frac_mid_16k_fx; /Q15/
		}
		}
		k = sub( shr( L_frame, 6 ), 1 );
		FOR( j = 0; j < k; j++ )
		{
		FOR( i = 0; i < m; i++ )
		{
		L_tmp = L_mult( lsp_old[i], pt_int_coeffs ); /Q31 */
		L_tmp = L_mac( L_tmp, lsp_mid[i], ( pt_int_coeffs + 1 ) ); /Q31 */
		lsp[i] = mac_r( L_tmp, lsp_new[i], *( pt_int_coeffs + 2 ) );
		move16();
		}
		pt_int_coeffs += 3;

		E_LPC_f_lsp_a_conversion( lsp, Aq, m );
		Aq += add( m, 1 );
		}

		/* Last subframe */
		E_LPC_f_lsp_a_conversion( lsp_new, Aq, m );

		return;
		}
		#endif

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,6 @@
		#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */
		#define FIX_1904_HARM_GSC_ENC /* VA: #1904 Harmonization of EVS and IVAS GSC code */
		#define FIX_1478_UNINIT_ON_BFI /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */
		#define HARM_LSF_ENC /* VA: basop issue 2301: Remove duplicated code in LSF quantizer */
		#define CLEANUP_HQ_CORE /* VA: basop issue 2300: Remove unused code in core-coder: HQ core */
		#define REMOVE_UNUSED_CODE_IVAS_DEC /* VA: remove unused code in ivas_jbm_dec_tc_fx() */
		#define FIX_2294_CLANG_18_WARNINGS_ENC /* VA: Fix some encoder clang-18 warnings, desc. in 2294 */

lib_com/prot_fx.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -1644,17 +1644,6 @@ void int_lsp4_fx(
		Word16 relax_prev_lsf_interp /* i : relax prev frame lsf interp after erasure */
		);

		#ifndef HARM_LSF_ENC
		void int_lsp4_ivas_fx(
		const Word16 L_frame, /* i : length of the frame */
		const Word16 lsp_old[], /* i : LSPs from past frame Q15*/
		const Word16 lsp_mid[], /* i : LSPs from mid-frame Q15*/
		const Word16 lsp_new[], /* i : LSPs from present frame Q15*/
		Word16 Aq, / o : LP coefficients in both subframes Q12*/
		const Word16 m, /* i : order of LP filter */
		Word16 relax_prev_lsf_interp /* i : relax prev frame lsf interp after erasure */
		);
		#endif
		void de_interleave_spectrum_fx(
		Word32 coefs, / i/o: i and output coefficients Q? */
		const Word16 length /* i : length of spectrum Q0 */

lib_com/stat_noise_uv_mod_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -614,11 +614,7 @@ void stat_noise_uv_mod_ivas_fx(
		mult( sub( 32767, beta ), lspnew_s[i] ) );
		}

		#ifdef HARM_LSF_ENC
		int_lsp4_fx( L_FRAME, oldlsp_mix, midlsp_mix, newlsp_mix, Aq, M, 0 );
		#else
		int_lsp4_ivas_fx( L_FRAME, oldlsp_mix, midlsp_mix, newlsp_mix, Aq, M, 0 );
		#endif
		Copy( lspnew_s, lspold_s, M );
		}
		ELSE /* (unvoiced_vad != 0) */

lib_dec/acelp_core_dec_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1035,11 +1035,7 @@ ivas_error acelp_core_dec_fx(
		test();
		IF( ( st->stab_fac_fx == 0 ) && ( st->old_bfi_cnt > 0 ) && NE_16( st->clas_dec, VOICED_CLAS ) && NE_16( st->clas_dec, ONSET ) && ( st->relax_prev_lsf_interp == 0 ) && !( EQ_16( st->element_mode, IVAS_CPE_TD ) && EQ_16( st->idchan, 1 ) ) )
		{
		#ifdef HARM_LSF_ENC
		int_lsp4_fx( st->L_frame, st->lsp_old_fx, lsp_mid_fx, lsp_new_fx, Aq_fx, M, 2 );
		#else
		int_lsp4_ivas_fx( st->L_frame, st->lsp_old_fx, lsp_mid_fx, lsp_new_fx, Aq_fx, M, 2 );
		#endif
		}

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