Merge branch 'main' into 1224-float-split-rendering-command-line-issues (6d9565e4) · Commits · SA4 / Audio / IVAS BASOP

lib_com/int_lsp_fx.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -132,6 +132,12 @@ 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/
		@@ -177,6 +183,7 @@ void int_lsp4_fx(

		return;
		}
		#ifndef HARM_LSF_ENC

		void int_lsp4_ivas_fx(
		const Word16 L_frame, /* i : length of the frame */
		@@ -257,3 +264,4 @@ void int_lsp4_ivas_fx(

		return;
		}
		#endif

+1 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,7 @@
		#define CLEANUP_VBR_CAM_ENC /* VA: basop issue 2299: Remove unused core-encoder VBR and CAM code */
		#define FIX_1494_SET_SPLITBFI_UNUSED /* Dolby: Fix issue 1494, remove unused function setting BFI flag in ISAR renderer */
		#define FIX_1479_MSAN_SPAR_UNINITIALIZED_VALUE /* Dolby: Fix for issue 1479, MSAN error due to uninitialized value in SPAR */
		#define HARM_LSF_ENC /* VA: basop issue 2301: Remove duplicated code in LSF quantizer */

		/* #################### End BE switches ################################## */

+2 −1

Original line number	Diff line number	Diff line
		@@ -1670,6 +1670,7 @@ 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*/
		@@ -1679,7 +1680,7 @@ void int_lsp4_ivas_fx(
		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 */

+4 −0

Original line number	Diff line number	Diff line
		@@ -614,7 +614,11 @@ 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) */

+4 −0

Original line number	Diff line number	Diff line
		@@ -1035,7 +1035,11 @@ 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
		}

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