Commit 0ac6bf52 authored Dec 01, 2023 by vaclav

issue 910: remove duplication of function ivas_td_binaural_renderer(); under...

issue 910: remove duplication of function ivas_td_binaural_renderer(); under FIX_910_REMOVE_DUPLICATION_TD_REND

parent bb7289a8

lib_com/ivas_prot.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -5974,12 +5974,14 @@ 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

+1 −0

Original line number	Diff line number	Diff line
		@@ -157,6 +157,7 @@
		#define FIX_891_PARAMUPMIX_CLEANUP /* Dlb: issue 891: remove unneeded code from ParamUpmix */
		#define FIX_917_LCLD_WARNINGS /* Dlb: issue 917 and 918: fix LCLD codec warnings*/
		#define FIX_920_IGF_INIT_ERROR /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */
		#define FIX_910_REMOVE_DUPLICATION_TD_REND /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */

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

lib_dec/ivas_jbm_dec.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1453,6 +1453,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 )
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		@@ -1476,6 +1477,7 @@ ivas_error ivas_jbm_dec_render(
		}
		#endif
		}
		#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()
		*
		@@ -109,7 +109,7 @@ ivas_error ivas_td_binaural_renderer(
		ism_md_subframe_update, output, output_frame, MAX_PARAM_SPATIAL_SUBFRAMES );
		#endif
		}

		#endif

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

lib_dec/ivas_output_config.c

+8 −0

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