Merge branch '20260304_cleanup' into 'main' (7f2361d1) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/calc_st_com.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -292,27 +292,15 @@ void scale_st(
		void blend_subfr2(
		float *sigIn1,
		float *sigIn2,
		#ifdef FIX_FLOAT_1533_BLEND_SUBFR2
		int16_t L_subfr,
		#endif
		float *sigOut )
		{
		#ifdef FIX_FLOAT_1533_BLEND_SUBFR2
		float fac1 = 1.f - ( 1.f / L_subfr );
		float fac2 = 0.f + ( 1.f / L_subfr );
		float step = 1.f / ( L_subfr / 2 );
		#else
		float fac1 = 1.f - ( 1.f / L_SUBFR );
		float fac2 = 0.f + ( 1.f / L_SUBFR );
		float step = 1.f / ( L_SUBFR / 2 );
		#endif
		int16_t i;

		#ifdef FIX_FLOAT_1533_BLEND_SUBFR2
		for ( i = 0; i < L_subfr / 2; i++ )
		#else
		for ( i = 0; i < L_SUBFR / 2; i++ )
		#endif
		{
		sigOut[i] = fac1 * sigIn1[i] + fac2 * sigIn2[i];
		fac1 -= step;

lib_com/ivas_prot.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -1111,17 +1111,9 @@ ivas_error ivas_param_ism_dec_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		#ifdef FIX_FLOAT_1526_DIRAC_MEM_LEAK
		void ivas_param_ism_dec_close(
		PARAM_ISM_DEC_HANDLE hParamIsmDec / i/o: decoder ParamISM handle */
		);
		#else
		void ivas_param_ism_dec_close(
		PARAM_ISM_DEC_HANDLE hParamIsmDec, / i/o: decoder ParamISM handle */
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom_out, / i/o: common spatial renderer data */
		const AUDIO_CONFIG output_config /* i : output audio configuration */
		);
		#endif

		void ivas_ism_dec_digest_tc(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */

lib_com/options.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -161,10 +161,6 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
		#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */
		#define FIX_2235_TD_RENDERER_WORD16 /* Eri: For float: small synch with BASOP, removing unnecessary abs. BASOP: Use Word16 in TD renderer without converting to Word32 */
		#define FIX_FLOAT_1526_DIRAC_MEM_LEAK /* FhG: potential memory leak in DirAC handles in case of format switching */
		#define ALIGN_ACELP_CORE /* VA: align ACELP core functions with BASOP */
		#define FIX_1532_MSAN_ERR_AMR_FIRST_FRAME_IS_SID /* FhG: fix msan complaint in AMR-WB when first frame is an SID */
		#define FIX_FLOAT_1535_ARI_RES_Q_CLEANUP /* FhG: remove dead code from tcx_ari_res_Q_spec() */

		/* #################### End BE switches ################################## */
		@@ -173,11 +169,6 @@
		/* any switch which is non-be wrt. TS 26.258 V3.0 */
		#define FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE /* Nokia: float issue 1493: Improves float decision stability in MASA encoding by adjusting reduction code */

		#define FIX_2432_ISM_SPIKES_16KHZ /* VA: basop issue 2432: fix spikes in ISM decoding at 16kHz output sampling rate */
		#define FIX_FLOAT_1518 /* FhG: fix issue 1518: loudness differences in OSBA decoding to mono or stereo output */
		#define FIX_FLOAT_1533_BLEND_SUBFR2 /* FhG: float issue 1533: correct blending in blend_subfr2() */

		#define FIX_1530_Codec_Level_Harmonization_Non_diegetic_panning /* FhG: Adjust non-diegetic panning law to harmonize codec levels with 3GPP reference software */
		/* ##################### End NON-BE switches ########################### */

		/* ################## End MAINTENANCE switches ######################### */

lib_com/prot.h

+8 −16

Original line number	Diff line number	Diff line
		@@ -2336,9 +2336,6 @@ void MDCT_classifier_reset(
		ivas_error acelp_core_enc(
		Encoder_State st, / i/o: encoder state structure */
		const float inp[], /* i : input signal of the current frame */
		#ifndef ALIGN_ACELP_CORE
		const float ener, /* i : residual energy from Levinson-Durbin */
		#endif
		float A[NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes */
		float Aw[NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquant. for subframes */
		const float epsP[M + 1], /* i : LP prediction errors */
		@@ -3031,9 +3028,6 @@ void CNG_enc(
		Encoder_State st, / i/o: State structure */
		float Aq[], /* o : LP coefficients */
		const float speech, / i : pointer to current frame input speech buffer */
		#ifndef ALIGN_ACELP_CORE
		float enr, /* i : frame energy output from Levinson recursion */
		#endif
		const float lsp_mid, / i : mid frame LSPs */
		float lsp_new, / i/o: current frame LSPs */
		float lsf_new, / i/o: current frame LSFs */
		@@ -10045,9 +10039,7 @@ int16_t tbe_celp_exc_offset(
		void blend_subfr2(
		float sigIn1, / i : input signal for fade-out */
		float sigIn2, / i : input signal for fade-in */
		#ifdef FIX_FLOAT_1533_BLEND_SUBFR2
		int16_t L_subfr, /* i : subframe length */
		#endif
		float sigOut / o : output signal */
		);

lib_dec/acelp_core_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1091,11 +1091,7 @@ ivas_error acelp_core_dec(
		syn_filt( Aq, M, temp_buf + M + L_SUBFR, temp_buf, L_SUBFR, st->hPFstat->mem_stp + L_SYN_MEM - M, 0 );
		scale_st( syn, temp_buf, &st->hPFstat->gain_prec, L_SUBFR, -1 );
		mvr2r( temp_buf, syn, L_SUBFR / 2 );
		#ifdef FIX_FLOAT_1533_BLEND_SUBFR2
		blend_subfr2( temp_buf + L_SUBFR / 2, syn + L_SUBFR / 2, L_SUBFR, syn + L_SUBFR / 2 );
		#else
		blend_subfr2( temp_buf + L_SUBFR / 2, syn + L_SUBFR / 2, syn + L_SUBFR / 2 );
		#endif
		}
		st->hPFstat->on = 0;
		}