Merge branch '1638_basop_cleanup' into 'main' (e81dcc6b) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -2376,20 +2376,14 @@ ivas_error ivas_ism_dec_config_fx(

	ivas_error ivas_ism_metadata_dec_create_fx(		ivas_error ivas_ism_metadata_dec_create_fx(
	Decoder_Struct st_ivas, / i/o: IVAS decoder structure */		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
	#ifdef NONBE_FIX_1065_ISM_MD_HANDLE
	const Word16 n_ISms, /* i : number of separately coded objects */		const Word16 n_ISms, /* i : number of separately coded objects */
	#else
	const Word16 n_ISms, /* i : number of objects */
	#endif
	Word32 element_brate_tmp[] /* o : element bitrate per object */		Word32 element_brate_tmp[] /* o : element bitrate per object */
	);		);

	#ifdef NONBE_FIX_1065_ISM_MD_HANDLE
	void ivas_ism_reset_metadata_handle_dec_fx(		void ivas_ism_reset_metadata_handle_dec_fx(
	ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
	);		);

	#endif
	ivas_error ivas_sba_dec_reconfigure_fx(		ivas_error ivas_sba_dec_reconfigure_fx(
	Decoder_Struct st_ivas, / i/o: IVAS decoder structure */		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
	UWord16 nSamplesFlushed, / o : number of samples flushed */		UWord16 nSamplesFlushed, / o : number of samples flushed */

lib_com/options.h

+1 −16

Original line number	Original line	Diff line number	Diff line
	@@ -92,32 +92,17 @@
	/* #################### Start BASOP porting switches ############################ */		/* #################### Start BASOP porting switches ############################ */

	#define FIX_1372_ISAR_POST_REND		#define FIX_1372_ISAR_POST_REND
	#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
	#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
	#endif

	#define NONBE_FIX_984_OMASA_EXT_OUTPUT /* Nokia: issue #984: complete the OMASA EXT output implementation */		#define NONBE_FIX_984_OMASA_EXT_OUTPUT /* Nokia: issue #984: complete the OMASA EXT output implementation */
	#define FIX_1044_ISM_REND_MEMORY /* VA: issue 1044: Lower the memory of the ISM renderer handle. */

	#define USE_NEW_HRTF_BINARY_FILE_FORMAT /* Orange: to activate when decided to change the hrtf binary file format */		#define USE_NEW_HRTF_BINARY_FILE_FORMAT /* Orange: to activate when decided to change the hrtf binary file format */

	#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */		#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */
	#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */		#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */
	#define FIX_1741_REVERB_TIMES_Q_FORMAT /* Philips: reverberation times in Q26 format instead of Q31 */		#define FIX_1741_REVERB_TIMES_Q_FORMAT /* Philips: reverberation times in Q26 format instead of Q31 */
	#define FIX_1831_REVERB_REGRESSION /* Philips: fixes reverb regression issues */		#define FIX_1831_REVERB_REGRESSION /* Philips: fixes reverb regression issues */
	#define FIX_1835_REVERB_ACTIVATION /* FhG: Modified reverberation activation logic and corrected factEQ calculation */		#define FIX_1835_REVERB_ACTIVATION /* FhG: Modified reverberation activation logic and corrected factEQ calculation */
	#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST /* FhG: address issue 1037 */
	#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */
	#define NONBE_FIX_1056_ISM_RATE_SWITCH /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */
	#define NONBE_FIX_1075 /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */
	#define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB /* FhG: fix bug in TD MDCT-Stereo concealment */
	#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */
	#define FIX_1060_USAN_ARRAY_BOUNDS /* FhG: issue 1060: USAN array-bounds errors */
	#define NONBE_FIX_SBA_SIGNALING_BITS_B /* FhG: issue 1061: option B: signal sba order additionally in OSBA */		#define NONBE_FIX_SBA_SIGNALING_BITS_B /* FhG: issue 1061: option B: signal sba order additionally in OSBA */
	#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */
	#define NONBE_FIX_1065_ISM_MD_HANDLE /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */
	#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */		#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */
	#define FIX_1053_REVERB_RECONFIGURATION /* Philips: issue 1053: fix for dynamic switching of acoustic environment */		#define FIX_1053_REVERB_RECONFIGURATION /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

	/* #################### End BASOP porting switches ############################ */		/* #################### End BASOP porting switches ############################ */

	#endif		#endif

lib_dec/dec_LPD_fx.c

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -718,20 +718,12 @@ void decoder_LPD_fx(
	FOR( k = 0; k < 2; k++ )		FOR( k = 0; k < 2; k++ )
	{		{

	#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
	/* Set pointer to parameters */
	prm = param + ( k * DEC_NPRM_DIV );

	/* Stability Factor */
	#endif
	IF( bfi == 0 )		IF( bfi == 0 )
	{		{
	#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
	/* Set pointer to parameters */		/* Set pointer to parameters */
	prm = param + ( k * DEC_NPRM_DIV );		prm = param + ( k * DEC_NPRM_DIV );

	/* Stability Factor */		/* Stability Factor */
	#endif
	st->stab_fac_fx = lsf_stab_fx( &lsf[( ( k + 1 ) ) * M], &lsf[k * M], 0, L_FRAME );		st->stab_fac_fx = lsf_stab_fx( &lsf[( ( k + 1 ) ) * M], &lsf[k * M], 0, L_FRAME );
	move16();		move16();
	}		}

lib_dec/dec_tcx_fx.c

+0 −17

Original line number	Original line	Diff line number	Diff line
	@@ -4401,15 +4401,11 @@ void decoder_tcx_invQ_fx(

	tnsSize = 0;		tnsSize = 0;
	move16();		move16();
	#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
	prm_target = NULL; /* just to suppress MSVC warnigs */
	#else
	/* just to suppress MSVC warnigs */		/* just to suppress MSVC warnigs */
	prm_target = NULL;		prm_target = NULL;
	prm_ltp = NULL;		prm_ltp = NULL;
	prm_tns = NULL;		prm_tns = NULL;
	prm_sqQ = NULL;		prm_sqQ = NULL;
	#endif

	/-----------------------------------------------------------------		/-----------------------------------------------------------------
	* Initializations		* Initializations
	@@ -4433,10 +4429,6 @@ void decoder_tcx_invQ_fx(
	move16();		move16();
	}		}

	#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
	prm_ltp = &prm[1 + NOISE_FILL_RANGES];
	prm_tns = prm_ltp + LTPSIZE;
	#endif

	gainCompensate = ONE_IN_Q14;		gainCompensate = ONE_IN_Q14;
	move16();		move16();
	@@ -4452,10 +4444,8 @@ void decoder_tcx_invQ_fx(

	IF( !bfi )		IF( !bfi )
	{		{
	#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
	prm_ltp = &prm[1 + NOISE_FILL_RANGES];		prm_ltp = &prm[1 + NOISE_FILL_RANGES];
	prm_tns = prm_ltp + LTPSIZE;		prm_tns = prm_ltp + LTPSIZE;
	#endif
	index = prm[0];		index = prm[0];
	move16();		move16();

	@@ -4477,11 +4467,6 @@ void decoder_tcx_invQ_fx(
	move16();		move16();
	}		}

	#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
	prm_hm = prm_tns + tnsSize;
	prm_sqQ = prm_hm + NPRM_CTX_HM;
	*prm_sqQ1 = prm_sqQ;
	#endif

	/-----------------------------------------------------------		/-----------------------------------------------------------
	* Spectrum data *		* Spectrum data *
	@@ -4489,11 +4474,9 @@ void decoder_tcx_invQ_fx(

	IF( !bfi )		IF( !bfi )
	{		{
	#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
	prm_hm = prm_tns + tnsSize;		prm_hm = prm_tns + tnsSize;
	prm_sqQ = prm_hm + NPRM_CTX_HM;		prm_sqQ = prm_hm + NPRM_CTX_HM;
	*prm_sqQ1 = prm_sqQ;		*prm_sqQ1 = prm_sqQ;
	#endif
	/-----------------------------------------------------------		/-----------------------------------------------------------
	* Context HM *		* Context HM *
	-----------------------------------------------------------/		-----------------------------------------------------------/

lib_dec/er_dec_tcx_fx.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1766,11 +1766,7 @@ void con_tcx_ivas_fx(

	alpha_inv = sub( 16384 /Q.0f in Q14/, alpha_delayed ); /Q14/		alpha_inv = sub( 16384 /Q.0f in Q14/, alpha_delayed ); /Q14/

	#ifdef NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB
	E_LPC_a_lsp_conversion( A_local, lsp_local, st->lspold_cng, M );		E_LPC_a_lsp_conversion( A_local, lsp_local, st->lspold_cng, M );
	#else
	E_LPC_a_lsp_conversion( A_local, lsp_local, lsp_local, M );
	#endif

	FOR( i = 0; i < M; i++ )		FOR( i = 0; i < M; i++ )
	{		{