Commit 5e161604 authored Aug 16, 2024 by multrus

Merge branch '20240816_cleanup' into 'main'

20240816 cleanup

See merge request !1746

parents 6bf306af cc1648c8

lib_com/ivas_rom_com.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -1876,16 +1876,6 @@ const float ivas_param_mc_dmx_fac_CICP19_3tc[36] =
		0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f /Ct/
		};

		#ifndef FIX_1157_OBSOLETE_DMX_TABLE
		const float ivas_param_mc_dmx_fac_CICP19_4tc[48] =
		{
		1.0f, 0.0f, INV_SQRT2, INV_SQRT2, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, /Lht/
		0.0f, 1.0f, INV_SQRT2, INV_SQRT2, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, /Rht/
		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, /Lut/
		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, /Rut/
		};
		#endif

		/* Coefficient for Parametric MC ILD factorization */
		const float ivas_param_mc_ild_fac_CICP6_2tc[6] =
		{

lib_com/options.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -174,8 +174,6 @@
		#define FIX_RETURN /* VA: fix location of function returns */
		#endif
		#define FIX_1129_EXT_REND_OUTPUT_HIGH /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */
		#define FIX_1152_UNINIT_VAL_IN_ITD_VAD_COMPUTATION /* FhG: fix uninitialized value being used in ITD VAD mid signal computation that does not affect synthesis, but crashes BASOPs */
		#define FIX_1157_OBSOLETE_DMX_TABLE /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */
		#define FIX_1135_EXT_RENDERER_HANDLES /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */
		#define FIX_1159_SPLIT_RENDERING_CONFIG /* VA: issue 1159: Execute split rendering config only for split rendering outputs. */

		@@ -186,7 +184,6 @@
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_1141_OSBA_ROOM_RENDERING /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */
		#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */
		#define NONBE_FIX_1143_MASA_BRSW /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */

lib_enc/ivas_stereo_dft_enc_itd.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -288,13 +288,9 @@ static int16_t stereo_dft_enc_itd_vad(

		float Spd[STEREO_DFT_N_16k_ENC / 2 + 1];

		#ifdef FIX_1152_UNINIT_VAL_IN_ITD_VAD_COMPUTATION
		/* Spd is later only used starting at itd_vad_band_tbl[0], so only compute values starting from there */
		/* -> this avoids uninitialized values in Spd_L and Spd_R at index 0 to be used */
		for ( i = itd_vad_band_tbl[0]; i < STEREO_DFT_N_16k_ENC / 2; i++ )
		#else
		for ( i = 0; i <= STEREO_DFT_N_16k_ENC / 2; i++ )
		#endif
		{
		Spd[i] = 0.5f * ( Spd_L[i] + Spd_R[i] );
		}

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -217,7 +217,6 @@ ivas_error ivas_dirac_dec_init_binaural_data(
		}
		else if ( renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) /* Indication of binaural rendering with room effect */
		{
		#ifdef NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )
		{
		mvr2r( ( *phHrtfParambin )->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );
		@@ -226,9 +225,6 @@ ivas_error ivas_dirac_dec_init_binaural_data(
		{
		set_f( hDiracDecBin->earlyPartEneCorrection, 1.0f, CLDFB_NO_CHANNELS_MAX );
		}
		#else
		mvr2r( ( *phHrtfParambin )->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );
		#endif

		/* reconfiguration needed when Reverb. parameters are changed -> close and open the handle again */
		if ( hDiracDecBin->hReverb != NULL && ( ( hDiracDecBin->hReverb->numBins != nBins ) \|\|

lib_rend/lib_rend.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -8543,7 +8543,6 @@ static ivas_error ivas_masa_ext_rend_parambin_init(
		}
		else if ( renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) /* Indication of binaural rendering with room effect */
		{
		#ifdef NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART
		if ( *inputMasa->base.ctx.pOutConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )
		{
		mvr2r( ( *phHrtfParambin )->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );
		@@ -8552,9 +8551,6 @@ static ivas_error ivas_masa_ext_rend_parambin_init(
		{
		set_f( hDiracDecBin->earlyPartEneCorrection, 1.0f, CLDFB_NO_CHANNELS_MAX );
		}
		#else
		mvr2r( ( *phHrtfParambin )->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );
		#endif

		if ( hDiracDecBin->hReverb == NULL && pos_idx == 0 ) /* open reverb only for the main direction */
		{