clean up if-conditions in ivas_ism_renderer.c (19e4481a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_ism_renderer.c

+6 −21

Original line number	Diff line number	Diff line
		@@ -245,33 +245,18 @@ void ivas_ism_render_sf(
		if ( subframe_idx >= ism_md_subframe_update_jbm )
		{
		#ifdef OBJ_EDITING_DECODER
		/*
		Due to a smoothing in the MD decoder, setting the edited values to the original ones
		does not recover the same output as without the object-editing feature.
		Therefore, the smoothed unedited values must be used here, when no editing has been performed.
		*/
		if ( 1 )
		{
		rotateAziEle( st_ivas->hIsmRendererData->edited_azimuth[i], st_ivas->hIsmRendererData->edited_elevation[i], &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat[st_ivas->hCombinedOrientationData->subframe_idx], st_ivas->hIntSetup.is_planar_setup );
		}
		else
		#endif
		{
		#else
		rotateAziEle( st_ivas->hIsmMetaData[i]->azimuth, st_ivas->hIsmMetaData[i]->elevation, &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat[st_ivas->hCombinedOrientationData->subframe_idx], st_ivas->hIntSetup.is_planar_setup );
		}
		#endif
		}
		else
		{
		#ifdef OBJ_EDITING_DECODER
		if ( 1 )
		{
		rotateAziEle( st_ivas->hIsmRendererData->edited_azimuth[i], st_ivas->hIsmRendererData->edited_elevation[i], &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat[st_ivas->hCombinedOrientationData->subframe_idx], st_ivas->hIntSetup.is_planar_setup );
		}
		else
		#endif
		{
		#else
		rotateAziEle( st_ivas->hIsmMetaData[i]->last_azimuth, st_ivas->hIsmMetaData[i]->last_elevation, &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat[st_ivas->hCombinedOrientationData->subframe_idx], st_ivas->hIntSetup.is_planar_setup );
		}
		#endif
		}
		if ( st_ivas->hEFAPdata != NULL )
		{