accept FIX_910_REMOVE_DUPLICATION_TD_REND (08c94da0) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -5866,14 +5866,6 @@ 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 */
		float output[], / i/o: SCE channels / Binaural synthesis */

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,6 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		/#define SPLIT_REND_WITH_HEAD_ROT / /* Dlb,FhG: Split Rendering contributions 21 and 35 */

		#define FIX_910_REMOVE_DUPLICATION_TD_REND /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */
		#define FIX_940_DEBUGGING_VARIABLE /* Nokia: issue #940: remove debugging variable */
		#define FIX_911_REMOVE_CREND_DUPLICATION /* VA: issue 911: resolve duplication of CRend binaural external renderer function */
		#define FIX_938_GCC_12_WARNINGS /* VA: issue #938: remove set_f(.,.,0) call in which length is always 0 to remove GCC 12.0 warning */

lib_dec/ivas_jbm_dec.c

+0 −25

Original line number	Diff line number	Diff line
		@@ -1364,31 +1364,6 @@ 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 )
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		if ( ( error = ivas_td_binaural_renderer_sf_splitBinaural( st_ivas, p_output, *nSamplesRendered ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		else
		{
		#endif
		if ( ( error = ivas_td_binaural_renderer( st_ivas, p_output, *nSamplesRendered ) ) != IVAS_ERR_OK )
		{
		return error;
		}

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

lib_dec/ivas_objectRenderer_internal.c

+0 −36

Original line number	Diff line number	Diff line
		@@ -65,42 +65,6 @@ 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()
		*
		* Receives the current frames for the object streams, updates metadata
		* and renders the current frame.
		---------------------------------------------------------------------/

		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 */
		)
		{
		int16_t ism_md_subframe_update;
		int16_t nchan_transport;

		nchan_transport = ( st_ivas->ism_mode == ISM_MASA_MODE_DISC \|\| st_ivas->ism_mode == ISM_SBA_MODE_DISC ) ? st_ivas->nchan_ism : st_ivas->nchan_transport;

		if ( st_ivas->hDecoderConfig->Opt_delay_comp )
		{
		ism_md_subframe_update = 1;
		}
		else
		{
		ism_md_subframe_update = 2;
		}

		if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
		{
		ism_md_subframe_update = 2;
		}

		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

+0 −8

Original line number	Diff line number	Diff line
		@@ -230,17 +230,9 @@ 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;