Commit e2ef5aba authored Jan 20, 2026 by vaillancour

replace FEC_encode_ivas_fx with FEC_encode_fx

parent 76c1d7a6

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@
		#define FIX_2261_REMOVE_LP_RESCALING /* VA: Remove of unnecessary lpc coefficient rescaling */
		#define FIX_2320_OOB_SCE_SWITCHING /* VA: basop issue 2320: Correct the length of the buffer to be scaled in SCE/CPE switching */
		#define FIX_2302_LSF_CDBK_THRESHOLD /* VA: basop issue 2302: fix threshold for LSF Q codebook-type decision */
		#define FIX_2348_REPLACE_FEC_ENC /* VA: basop issue 2348: replace FEC_encode_ivas_fx with FEC_encode_fx */

		/* ##################### End NON-BE switches ########################### */

lib_com/prot_fx.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -10827,7 +10827,7 @@ Word16 msvq_stage1_dct_recalc_candidates_fdcng_wb_fx(
		Word32 dist_ptr_fx, / i/o: updated MSE vector for stage1 */
		Word16 dist_ptr_e / i/o: exp for updated MSE vector for stage1 */
		);

		#ifndef FIX_2348_REPLACE_FEC_ENC
		void FEC_encode_ivas_fx(
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		const ACELP_config acelp_cfg, /* i/o: configuration of the ACELP */
		@@ -10841,7 +10841,7 @@ void FEC_encode_ivas_fx(
		const Word32 total_brate, /* i : total codec bitrate Q0*/
		const Word16 Q_synth /* i : input scaling */
		);

		#endif
		ivas_error IGF_Reconfig_fx(
		IGF_ENC_INSTANCE_HANDLE hIGFEnc, / i/o: instance handle of IGF Encoder */
		const Word16 igf, /* i : IGF on/off */

lib_enc/FEC_enc_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -292,7 +292,7 @@ void FEC_lsf_estim_enc_fx(

		return;
		}

		#ifndef FIX_2348_REPLACE_FEC_ENC
		/-------------------------------------------------------------------
		* FEC_encode()
		*
		@@ -464,3 +464,4 @@ void FEC_encode_ivas_fx(

		return;
		}
		#endif
		No newline at end of file

lib_enc/acelp_core_enc_fx.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1402,10 +1402,13 @@ ivas_error acelp_core_enc_ivas_fx(
		/-----------------------------------------------------------------
		* Encode supplementary information for Frame Error Concealment
		-----------------------------------------------------------------/

		#ifndef FIX_2348_REPLACE_FEC_ENC
		Scale_sig( syn_fx, L_FRAME, sub( s_min( st->Q_syn, Q_new ), st->Q_syn ) ); // min( st->Q_syn, Q_new )
		Scale_sig( res_fx, st->L_frame, sub( s_min( st->Q_syn, Q_new ), Q_new ) ); // min( st->Q_syn, Q_new )
		FEC_encode_ivas_fx( hBstr, st->acelp_cfg, syn_fx, st->coder_type, st->clas, pitch_buf, res_fx, &st->Last_pulse_pos, st->L_frame, st->total_brate, s_min( st->Q_syn, Q_new ) );
		#else
		FEC_encode_fx( hBstr, st->acelp_cfg, syn_fx, st->coder_type, st->clas, pitch_buf, res_fx, &st->Last_pulse_pos, st->L_frame, st->total_brate, add( st->Q_syn, 1), 0 );
		#endif
		IF( st->hBWE_TD != NULL )
		{
		IF( EQ_16( st->L_frame, L_FRAME ) )