Commit 4c3b3037 authored Aug 26, 2025 by multrus

[cleanup] accept REUSE_EVS_BE_ACELP_LP_FILT

parent a8124c5e

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@



		#define REUSE_EVS_BE_ACELP_LP_FILT
		#define REUSE_EVS_BE_ACELP_4T64
		#define REUSE_EVS_BE_ACELP_2t32
		#define REUSE_EVS_BE_ACELP_1t64

lib_enc/acelp_core_switch_enc_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -653,11 +653,7 @@ static void encod_gen_voic_core_switch_ivas_fx(
		-----------------------------------------------------------------/
		lp_flag = st_fx->acelp_cfg.ltf_mode; /* Q0 */
		Scale_sig( h1, L_SUBFR, sub( 14, q_h1 ) ); /* set h1[] in Q14 with scaling for convolution Q14+shift*/
		#ifdef REUSE_EVS_BE_ACELP_LP_FILT
		lp_select = lp_filt_exc_enc_fx( MODE1, GENERIC, 0, exc, h1, xn, y1, xn2, L_SUBFR, L_frame, g_corr, clip_gain, &gain_pit, &lp_flag ); /* Q0 */
		#else
		lp_select = lp_filt_exc_enc_ivas_fx( MODE1, GENERIC, 0, exc, h1, xn, y1, xn2, L_SUBFR, L_frame, g_corr, clip_gain, &gain_pit, &lp_flag ); /* Q0 */
		#endif
		IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
		{
		push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );

lib_enc/enc_gen_voic_fx.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -662,13 +662,8 @@ void encod_gen_voic_ivas_fx(
		/-----------------------------------------------------------------
		* LP filtering of the adaptive excitation, codebook target computation
		-----------------------------------------------------------------/
		#ifndef REUSE_EVS_BE_ACELP_LP_FILT
		lp_select = lp_filt_exc_enc_ivas_fx( MODE1, st_fx->coder_type, i_subfr_fx, exc_fx, h1_fx,
		xn_fx, y1_fx, xn2_fx, L_SUBFR, L_frame, g_corr_fx, clip_gain_fx, &gain_pit_fx, &lp_flag );
		#else
		lp_select = lp_filt_exc_enc_fx( MODE1, st_fx->coder_type, i_subfr_fx, exc_fx, h1_fx,
		xn_fx, y1_fx, xn2_fx, L_SUBFR, L_frame, g_corr_fx, clip_gain_fx, &gain_pit_fx, &lp_flag );
		#endif

		IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
		{

lib_enc/enc_pit_exc_fx.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -775,13 +775,8 @@ void enc_pit_exc_ivas_fx(
		* Codebook target computation
		* (No LP filtering of the adaptive excitation)
		-----------------------------------------------------------------/
		#ifndef REUSE_EVS_BE_ACELP_LP_FILT
		lp_select = lp_filt_exc_enc_ivas_fx( MODE1, AUDIO, i_subfr, exc, h1,
		xn, y1, xn2, L_subfr, st_fx->L_frame, g_corr, clip_gain, &gain_pit, &lp_flag ); /* Q0 */
		#else
		lp_select = lp_filt_exc_enc_fx( MODE1, AUDIO, i_subfr, exc, h1,
		xn, y1, xn2, L_subfr, st_fx->L_frame, g_corr, clip_gain, &gain_pit, &lp_flag ); /* Q0 */
		#endif
		IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
		{
		push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );

lib_enc/ivas_td_low_rate_enc_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -306,11 +306,7 @@ void encod_gen_2sbfr(
		-----------------------------------------------------------------/
		Scale_sig( h1, 2 * L_SUBFR, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */

		#ifndef REUSE_EVS_BE_ACELP_LP_FILT
		lp_filt_exc_enc_ivas_fx( MODE1, coder_type, i_subfr, exc, h1, xn, y1, xn2, 2 * L_SUBFR, L_frame, g_corr, clip_gain, &gain_pit, &st->acelp_cfg.ltf_mode );
		#else
		lp_filt_exc_enc_fx( MODE1, coder_type, i_subfr, exc, h1, xn, y1, xn2, 2 * L_SUBFR, L_frame, g_corr, clip_gain, &gain_pit, &st->acelp_cfg.ltf_mode );
		#endif
		/* update long-term pitch gain for speech/music classifier */
		st->hSpMusClas->lowrate_pitchGain = add( mult( 29491, st->hSpMusClas->lowrate_pitchGain ), mult( 3277 /Q15/, gain_pit ) ); // Q14
		move16();