delete unnecessary if conditions from ivas_dirac_dec_render_sf (959debdc) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_dirac_dec.c

+39 −18

Original line number	Diff line number	Diff line
		@@ -1844,6 +1844,7 @@ void ivas_dirac_dec_render_sf(
		set_zero( surCohRatio, hSpatParamRendCom->num_freq_bands );
		}
		}
		#ifndef FIX_998_UNUSED_FUNCTION

		if ( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[st_ivas->hCombinedOrientationData->subframe_idx] && st_ivas->hCombinedOrientationData->shd_rot_max_order == 1 )
		{
		@@ -1856,10 +1857,8 @@ void ivas_dirac_dec_render_sf(
		elevation,
		md_idx,
		surCohRatio,
		#ifndef FIX_998_UNUSED_FUNCTION
		st_ivas->hCombinedOrientationData->shd_rot_max_order,
		p_Rmat,
		#endif
		hodirac_flag );
		}
		else
		@@ -1873,13 +1872,23 @@ void ivas_dirac_dec_render_sf(
		elevation,
		md_idx,
		surCohRatio,
		#ifndef FIX_998_UNUSED_FUNCTION
		0,
		NULL,
		#endif
		hodirac_flag );
		}
		}
		#else
		ivas_dirac_dec_compute_directional_responses( hSpatParamRendCom,
		hDirACRend,
		st_ivas->hVBAPdata,
		st_ivas->hMasa == NULL ? NULL : st_ivas->hMasa->data.band_mapping,
		st_ivas->hMasaIsmData,
		azimuth,
		elevation,
		md_idx,
		surCohRatio,
		hodirac_flag );
		#endif

		if ( st_ivas->ivas_format == MASA_ISM_FORMAT && nchan_transport == 2 )
		{
		@@ -2208,6 +2217,7 @@ void ivas_dirac_dec_render_sf(
		}

		/Compute PSDs/
		#ifndef FIX_998_UNUSED_FUNCTION
		if ( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[st_ivas->hCombinedOrientationData->subframe_idx] && st_ivas->hCombinedOrientationData->shd_rot_max_order > 0 )
		{
		ivas_dirac_dec_output_synthesis_process_slot( reference_power,
		@@ -2217,10 +2227,8 @@ void ivas_dirac_dec_render_sf(
		hSpatParamRendCom->diffuseness_vector[md_idx],
		hSpatParamRendCom,
		hDirACRend,
		#ifndef FIX_998_UNUSED_FUNCTION
		st_ivas->hCombinedOrientationData->shd_rot_max_order,
		p_Rmat,
		#endif
		st_ivas->hVBAPdata,
		hDirACRend->hOutSetup,
		nchan_transport,
		@@ -2237,10 +2245,8 @@ void ivas_dirac_dec_render_sf(
		hSpatParamRendCom->diffuseness_vector[md_idx],
		hSpatParamRendCom,
		hDirACRend,
		#ifndef FIX_998_UNUSED_FUNCTION
		0,
		0,
		#endif
		st_ivas->hVBAPdata,
		hDirACRend->hOutSetup,
		nchan_transport,
		@@ -2248,6 +2254,21 @@ void ivas_dirac_dec_render_sf(
		hodirac_flag,
		hDirAC->hConfig->dec_param_estim );
		}
		#else
		ivas_dirac_dec_output_synthesis_process_slot( reference_power,
		p_onset_filter,
		azimuth,
		elevation,
		hSpatParamRendCom->diffuseness_vector[md_idx],
		hSpatParamRendCom,
		hDirACRend,
		st_ivas->hVBAPdata,
		hDirACRend->hOutSetup,
		nchan_transport,
		md_idx,
		hodirac_flag,
		hDirAC->hConfig->dec_param_estim );
		#endif

		if ( hDirAC->hConfig->dec_param_estim )
		{