Merge branch 'cleanup_20260317' into 'main' (80ecaad9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -3371,10 +3371,8 @@ static ivas_error decodeVoIP(

		phIvasDec = hIvasDec; / Update for main()' s free */
		ivasRtp.restartNeeded = false;
		#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		bitstreamReadDone = false;
		parametersAvailableForEditing = false;
		#endif
		}

		/* reference vector */
		@@ -3623,10 +3621,8 @@ static ivas_error decodeVoIP(
		goto cleanup;
		}
		phIvasDec = hIvasDec; / Update for main()' s free */
		#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		bitstreamReadDone = false;
		parametersAvailableForEditing = false;
		#endif
		}

		/* Placeholder for memory reallocation */
		@@ -4385,13 +4381,6 @@ static ivas_error restartDecoder(
		}
		}

		#ifndef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#endif
		/* ISAR frame size is set from command line, not renderer config file.
		* This will be ignored if output format is not split rendering. */
		if ( renderConfig != NULL )

lib_com/options.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -161,15 +161,13 @@
		/#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_FLOAT_1536_INIT_NO_PARAM_LPC /* FhG: make sure no_param_lpc is initialized in core_encode_twodiv() */
		#define FIX_1525_UNINIT_FORMAT_SWITCHING_DEC /* VA: float issue 1525: fix reading of uninitialized memory in format switching at the decoder */


		/* #################### End BE switches ################################## */

		/* #################### Start NON-BE switches ############################ */
		/* any switch which is non-be wrt. TS 26.258 V3.0 */
		#define FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR /* FhG: basop issue 2436 (related to basop 2283): fix garbage output for >1 object OMASA with extrend as ISAR prerenderer */
		#define FIX_FLOAT_1528_5MS_REND_ISM_META_DELAY_COMPENSATION /* Nokia: float issue 1528: Fixes incorrect compensation for ISM metadata delay in 5ms TD rendering */


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

lib_enc/core_enc_2div.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -83,9 +83,7 @@ void core_encode_twodiv(
		set_s( tnsSize, 0, 2 );
		set_s( tnsBits, 0, 2 );
		ltpBits = 0;
		#ifdef FIX_FLOAT_1536_INIT_NO_PARAM_LPC
		no_param_lpc = 0;
		#endif

		for ( i = 0; i < 3; i++ )
		{

lib_rend/ivas_objectRenderer.c

+5 −23

Original line number	Diff line number	Diff line
		@@ -317,11 +317,8 @@ ivas_error ivas_td_binaural_renderer_unwrap(
		const int16_t ism_md_subframe_update, /* i : Number of subframes to delay ism metadata to sync with audio */
		float output[], / i/o: SCE channels / Binaural synthesis */
		const int16_t output_frame, /* i : output frame length */
		const int16_t num_subframes /* i : number of subframes to render */
		#ifdef FIX_FLOAT_1528_5MS_REND_ISM_META_DELAY_COMPENSATION
		,
		const int16_t num_subframes, /* i : number of subframes to render */
		int16_t metaSfCounter / i/o: subframe counter for metadata update */
		#endif
		)
		{
		int16_t subframe_length;
		@@ -365,11 +362,7 @@ ivas_error ivas_td_binaural_renderer_unwrap(

		for ( subframe_idx = 0; subframe_idx < num_subframes; subframe_idx++ )
		{
		#ifdef FIX_FLOAT_1528_5MS_REND_ISM_META_DELAY_COMPENSATION
		if ( *metaSfCounter == ism_md_subframe_update )
		#else
		if ( subframe_idx == ism_md_subframe_update )
		#endif
		{
		/* Update object position(s) */
		if ( ( error = TDREND_Update_object_positions( hBinRendererTd, num_src, ivas_format, hIsmMetaData ) ) != IVAS_ERR_OK )
		@@ -378,10 +371,8 @@ ivas_error ivas_td_binaural_renderer_unwrap(
		}
		}

		#ifdef FIX_FLOAT_1528_5MS_REND_ISM_META_DELAY_COMPENSATION
		metaSfCounter = ( metaSfCounter + 1 ) % 4;

		#endif
		/* Update the listener's location/orientation */
		if ( ( error = TDREND_Update_listener_orientation( hBinRendererTd, ( enableCombinedOrientation != NULL ) ? enableCombinedOrientation[hCombinedOrientationData->subframe_idx] : 0, ( Quaternions != NULL ) ? &Quaternions[hCombinedOrientationData->subframe_idx] : NULL, ( Pos != NULL ) ? &Pos[hCombinedOrientationData->subframe_idx] : NULL ) ) != IVAS_ERR_OK )
		{
		@@ -734,11 +725,7 @@ ivas_error ivas_td_binaural_open_ext(
		---------------------------------------------------------------------/

		ivas_error ivas_td_binaural_renderer_ext(
		#ifdef FIX_FLOAT_1528_5MS_REND_ISM_META_DELAY_COMPENSATION
		TDREND_WRAPPER pTDRend, / i/o: TD Renderer wrapper structure */
		#else
		const TDREND_WRAPPER pTDRend, / i : TD Renderer wrapper structure */
		#endif
		const AUDIO_CONFIG inConfig, /* i : Input audio configuration */
		const LSSETUP_CUSTOM_HANDLE customLsInput, /* i : Input custom loudspeaker layout */
		const COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, / i : Combined head and external orientations */
		@@ -806,13 +793,8 @@ ivas_error ivas_td_binaural_renderer_ext(
		hIsmMetaData[0]->non_diegetic_flag = currentPos->non_diegetic_flag;
		}

		#ifdef FIX_FLOAT_1528_5MS_REND_ISM_META_DELAY_COMPENSATION
		if ( ( error = ivas_td_binaural_renderer_unwrap( hReverb, transport_config, pTDRend->hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, *hCombinedOrientationData,
		ism_md_subframe_update_ext, p_output, output_frame, (int16_t) ( ( output_frame * FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) / output_Fs ), &( pTDRend->metaSfCounter ) ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_td_binaural_renderer_unwrap( hReverb, transport_config, pTDRend->hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, *hCombinedOrientationData,
		ism_md_subframe_update_ext, p_output, output_frame, (int16_t) ( ( output_frame * FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) / output_Fs ) ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}

lib_rend/ivas_prot_rend.h

+1 −8

Original line number	Diff line number	Diff line
		@@ -640,19 +640,12 @@ ivas_error ivas_td_binaural_renderer_unwrap(
		const int16_t ism_md_subframe_update,
		float output[], / i/o: SCE channels / Binaural synthesis */
		const int16_t output_frame, /* i : output frame length */
		const int16_t num_subframes /* i : number of subframes to render */
		#ifdef FIX_FLOAT_1528_5MS_REND_ISM_META_DELAY_COMPENSATION
		,
		const int16_t num_subframes, /* i : number of subframes to render */
		int16_t metaSfCounter / i/o: subframe counter for metadata update */
		#endif
		);

		ivas_error ivas_td_binaural_renderer_ext(
		#ifdef FIX_FLOAT_1528_5MS_REND_ISM_META_DELAY_COMPENSATION
		TDREND_WRAPPER pTDRend, / i/o: TD Renderer wrapper structure */
		#else
		const TDREND_WRAPPER pTDRend, / i : TD Renderer wrapper structure */
		#endif
		const AUDIO_CONFIG inConfig, /* i : Input audio configuration */
		const LSSETUP_CUSTOM_HANDLE customLsInput, /* i : Input custom loudspeaker layout */
		const COMBINED_ORIENTATION_HANDLE hCombinedOrientationData,/ i : Combined head and external orientations */