Commit 7e0378a1 authored Apr 01, 2025 by malenovsky

Merge branch '1356_flp_PortFlpMR1263' into 'float-pc'

Port float MR1263 to BASOP FLP ref

See merge request !1242

parents 0af5a5f6 a223ba4e

lib_com/ivas_prot.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -5896,11 +5896,13 @@ ivas_error ivas_td_binaural_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		#ifndef FIX_910_REMOVE_DUPLICATION_TD_REND
		ivas_error ivas_td_binaural_renderer(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output[], / i/o: SCE channels / Binaural synthesis */
		const int16_t output_frame /* i : output frame length */
		);
		#endif

		ivas_error ivas_td_binaural_renderer_sf(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -207,6 +207,7 @@
		#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
		#define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING /* Dlb: issue 907: fix for band mapping at VLBR */
		#define NONBE_FIX_869_MASA_PREREND_MERGE /* Nokia: issue: #869: MASA pre-rend not updating energy */
		#define FIX_910_REMOVE_DUPLICATION_TD_REND /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */

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

lib_dec/ivas_jbm_dec.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1365,6 +1365,7 @@ ivas_error ivas_jbm_dec_render(
		{
		ivas_mc2sba( st_ivas->hIntSetup, p_output, p_output, *nSamplesRendered, st_ivas->hOutSetup.ambisonics_order, 0.f );
		}
		#ifndef FIX_910_REMOVE_DUPLICATION_TD_REND
		else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )
		{
		if ( ( error = ivas_td_binaural_renderer( st_ivas, p_output, *nSamplesRendered ) ) != IVAS_ERR_OK )
		@@ -1374,6 +1375,7 @@ ivas_error ivas_jbm_dec_render(

		ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, p_output, p_output );
		}
		#endif
		}
		else if ( st_ivas->mc_mode == MC_MODE_PARAMMC )
		{

lib_dec/ivas_objectRenderer_internal.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ ivas_error ivas_td_binaural_open(
		st_ivas->transport_config, st_ivas->hRenderConfig->directivity, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns );
		}


		#ifndef FIX_910_REMOVE_DUPLICATION_TD_REND
		/---------------------------------------------------------------------
		* ivas_td_binaural_renderer()
		*
		@@ -100,7 +100,7 @@ ivas_error ivas_td_binaural_renderer(

		return ivas_td_binaural_renderer_unwrap( st_ivas->hReverb, st_ivas->transport_config, st_ivas->hBinRendererTd, nchan_transport, LFE_CHANNEL, st_ivas->ivas_format, st_ivas->hIsmMetaData, st_ivas->hCombinedOrientationData, ism_md_subframe_update, output, output_frame, MAX_PARAM_SPATIAL_SUBFRAMES );
		}

		#endif

		/---------------------------------------------------------------------
		* ivas_td_binaural_renderer_sf()

lib_dec/ivas_output_config.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -227,9 +227,17 @@ void ivas_renderer_select(
		#endif
		{
		#ifdef DEBUGGING
		#ifdef FIX_910_REMOVE_DUPLICATION_TD_REND
		if ( ( ( ( st_ivas->transport_config == IVAS_AUDIO_CONFIG_5_1 \|\| st_ivas->transport_config == IVAS_AUDIO_CONFIG_7_1 ) && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) ) \|\| ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && st_ivas->mc_mode == MC_MODE_MCT && st_ivas->hDecoderConfig->force_rend != FORCE_CLDFB_RENDERER )
		#else
		if ( ( ( ( st_ivas->transport_config == IVAS_AUDIO_CONFIG_5_1 \|\| st_ivas->transport_config == IVAS_AUDIO_CONFIG_7_1 ) && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) ) \|\| ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && ( st_ivas->mc_mode == MC_MODE_MCT \|\| st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && !( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) )
		#endif
		#else
		#ifdef FIX_910_REMOVE_DUPLICATION_TD_REND
		if ( ( st_ivas->transport_config == IVAS_AUDIO_CONFIG_5_1 \|\| st_ivas->transport_config == IVAS_AUDIO_CONFIG_7_1 ) && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) && st_ivas->mc_mode == MC_MODE_MCT )
		#else
		if ( ( st_ivas->transport_config == IVAS_AUDIO_CONFIG_5_1 \|\| st_ivas->transport_config == IVAS_AUDIO_CONFIG_7_1 ) && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) && ( st_ivas->mc_mode == MC_MODE_MCT \|\| st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) )
		#endif
		#endif
		{
		*renderer_type = RENDERER_BINAURAL_OBJECTS_TD;