Commit 92223ed0 authored May 01, 2026 by multrus

[cleanup] accept HARMONIZE_2537_SetTCXModeInfo

parent 0f7c72de

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,6 @@
		#define FIX_2402_SIMPLIFY_ARI_CODEC /* FhG: basop issue 2402: simplified arithmetic in TCX arithmetic coder */
		#define FIX_2402_REPL_EVS_ARI_CODEC_ENC /* FhG: basop issue 2402: replace EVS arith encoder with IVAS arith encoder */
		#define FIX_BASOP_2551_HARM_SCALAR_QUAN /* FhG: issue 2551: Harmonize function pair tcx_scalar_quantization_fx*/
		#define HARMONIZE_2537_SetTCXModeInfo /* FhG: Harmonize SetTCXModeInfo - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */
		#define HARMONIZE_2537_GetTCXMaxenergyChange /* FhG: Harmonize GetTCXMaxenergyChange */
		#define HARMONIZE_2508_InitTransientDetection /* FhG: harmonize GetAttackForTCXDecision derivates for evs/ivas */
		#define HARMONIZE_2564_GetEnergyCldfb /* FhG: harmonize GetEnergyCldfb derivates for evs/ivas */

lib_enc/ivas_core_pre_proc_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -405,11 +405,7 @@ void pre_proc_ivas_fx(
		}
		IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )
		{
		#ifdef HARMONIZE_2537_SetTCXModeInfo
		SetTCXModeInfo_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );
		#else
		SetTCXModeInfo_ivas_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );
		#endif
		}
		}
		ELSE IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )

lib_enc/ivas_mdct_core_enc_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1304,11 +1304,7 @@ void ivas_mdct_core_whitening_enc_fx(
		FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
		{
		st = sts[ch];
		#ifdef HARMONIZE_2537_SetTCXModeInfo
		SetTCXModeInfo_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );
		#else
		SetTCXModeInfo_ivas_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );
		#endif
		}
		}

lib_enc/ivas_stereo_mdct_core_enc_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -257,11 +257,7 @@ void stereo_mdct_core_enc_fx(
		FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
		{
		st = sts[ch];
		#ifdef HARMONIZE_2537_SetTCXModeInfo
		SetTCXModeInfo_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );
		#else
		SetTCXModeInfo_ivas_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );
		#endif
		}
		/* adaptively sync tcx modes*/
		test();

lib_enc/prot_fx_enc.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -967,17 +967,6 @@ Word16 GetTCXMaxenergyChange_ivas_fx(
		const Word16 nPrevSubblocks );
		#endif

		#ifndef HARMONIZE_2537_SetTCXModeInfo
		/** Set TCX window length and overlap configuration
		* @param prevEnergyHF previous HF energy. Exponent must be the same as for currEnergyHF.
		* @param currEnergyHF current HF energy. Exponent must be the same as for prevEnergyHF.
		*/
		void SetTCXModeInfo_ivas_fx(
		Encoder_State st, / i/o: encoder state structure */
		TRAN_DET_HANDLE hTranDet, /* i/o: transient detection handle */
		Word16 tcxModeOverlap / o : window overlap of current frame */
		);
		#endif

		/** Set TCX window length and overlap configuration
		* @param prevEnergyHF previous HF energy. Exponent must be the same as for currEnergyHF.