Commit 19bcf3f2 authored Apr 07, 2025 by vaillancour

make shift_wsp = sub( shift_wsp, 1 ); conditional

parent 3f59fddf

lib_com/options.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -79,8 +79,8 @@
		#define HARM_ENC_INIT
		//#define HARM_SCE_INIT

		#define FORCE_GENERIC
		#define ALLOW_TM /* To allow some transition mode */
		//#define FORCE_GENERIC
		//#define ALLOW_TM /* To allow some transition mode */

		#define REMOVE_A_SCALE

lib_enc/acelp_core_enc_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1375,7 +1375,7 @@ ivas_error acelp_core_enc_ivas_fx(
		}
		ELSE IF( EQ_16( st->coder_type, TRANSITION ) )
		{
		#ifdef TRY_SHIFT_ACELP
		#if 0//def TRY_SHIFT_ACELP
		encod_tran_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, tc_subfr, position, unbits, shift, Q_new );
		#else
		encod_tran_ivas_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, tc_subfr, position, unbits, 0, Q_new );

lib_enc/enc_gen_voic_fx.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -540,7 +540,8 @@ void encod_gen_voic_ivas_fx(
		/------------------------------------------------------------------
		* ACELP subframe loop
		------------------------------------------------------------------/
		#if defined USE_EVS_FUNC_LP && !defined USE_EVS_FUNC_FT_G
		#if 1//defined USE_EVS_FUNC_LP && !defined USE_EVS_FUNC_FT_G
		if (L_frame < L_FRAME16k)
		shift_wsp = sub( shift_wsp, 1 );
		#endif
		FOR( i_subfr_fx = 0; i_subfr_fx < L_frame; i_subfr_fx += L_SUBFR )

lib_enc/enc_tran_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -523,6 +523,7 @@ Word16 encod_tran_ivas_fx(
		set16_fx( code_preQ, 0, L_SUBFR );
		shift_wsp = add( Q_new, shift );
		#ifdef USE_EVS_FUNC_LP
		if ( L_frame_fx < L_FRAME16k )
		shift_wsp = sub( shift_wsp, 1 );
		#endif
		/----------------------------------------------------------------