Commit b45ca67f authored Feb 12, 2025 by vaclav

fix build

parent 94c98bdb

lib_com/bits_alloc_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -439,6 +439,7 @@ static Word16 fcb_table(
		* Routine to allocate fixed innovation codebook bit-budget
		--------------------------------------------------------------------/

		#ifndef REMOVE_EVS_DUPLICATES
		static ivas_error acelp_FCB_allocator(
		Word16 nBits, / i/o: available bit-budget */
		Word16 fixed_cdk_index[], /* o : codebook index Q0 */
		@@ -599,7 +600,7 @@ static ivas_error acelp_FCB_allocator(

		return error;
		}

		#endif
		static ivas_error acelp_FCB_allocator_ivas(
		Word16 nBits, / i/o: available bit-budget */
		Word16 fixed_cdk_index[], /* o : codebook index Q0 */

lib_com/prot_fx.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -7166,6 +7166,7 @@ void Mode2_delta_pit_dec(
		Word16 *pt_indice / i/o: pointer to Vector of Q indexes */
		);

		#ifndef REMOVE_EVS_DUPLICATES3
		Word16 pit_decode_fx( /* o : floating pitch value */
		Decoder_State st_fx, / i/o: decoder state structure */
		const Word32 core_brate, /* i : core bitrate */
		@@ -7185,7 +7186,7 @@ Word16 pit_decode_fx( /* o : floating pitch value
		const Word16 tdm_Pri_pitch_buf[] /* i : primary channel pitch buffer */
		#endif
		);

		#endif
		Word16 pit_decode_ivas_fx( /* o : floating pitch value */
		Decoder_State st_fx, / i/o: decoder state structure */
		const Word32 core_brate, /* i : core bitrate */

lib_dec/acelp_core_switch_dec_fx.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -919,7 +919,11 @@ static void decod_gen_voic_core_switch_fx(
		* Decode pitch lag
		----------------------------------------------------------------------/

		#ifdef REMOVE_EVS_DUPLICATES3
		pitch = pit_decode_ivas_fx( st_fx, core_brate, 0, L_frame, 0, GENERIC, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR ); /Q6/
		#else
		pitch = pit_decode_fx( st_fx, core_brate, 0, L_frame, 0, GENERIC, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR ); /Q6/
		#endif

		/--------------------------------------------------------------
		* Find the adaptive codebook vector.

lib_dec/dec_amr_wb_fx.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -71,12 +71,17 @@ void decod_amr_wb_fx(
		* Decode pitch lag
		----------------------------------------------------------------------/

		#ifdef REMOVE_EVS_DUPLICATES
		*pt_pitch_fx = pit_decode_ivas_fx( st_fx, st_fx->core_brate, 1, L_FRAME, i_subfr, -1, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR, 0, NULL );
		#else
		*pt_pitch_fx = pit_decode_fx( st_fx, st_fx->core_brate, 1, L_FRAME, i_subfr, -1, &pitch_limit_flag, &T0, &T0_frac, &T0_min, &T0_max, L_SUBFR
		#ifdef ADD_LRTD
		,
		0, NULL
		#endif
		);
		#endif

		/--------------------------------------------------------------
		* Find the adaptive codebook vector
		--------------------------------------------------------------/

lib_dec/dec_gen_voic_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -677,6 +677,7 @@ ivas_error decod_gen_voic_ivas_fx(

		IF( LE_32( st_fx->core_brate, ACELP_8k00 ) )
		{
		// VE: function to be merged?
		gain_dec_lbr_ivas_fx( st_fx, st_fx->coder_type, i_subfr_fx, code_fx, &gain_pit_fx, &gain_code_fx, &gain_inov_fx, &norm_gain_code_fx, gc_mem, gp_mem, L_SUBFR );
		}
		ELSE IF( GT_32( st_fx->core_brate, ACELP_32k ) )
		@@ -801,7 +802,7 @@ ivas_error decod_gen_voic_ivas_fx(
		{
		idx = idiv1616( i_subfr_fx, L_SUBFR );
		}

		// VE: function to be merged
		prep_tbe_exc_ivas_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
		&voice_factors_fx[idx], bwe_exc_fx, gain_preQ_fx, code_preQ_fx,
		st_fx->Q_exc, T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,