Merge branch '1619_basop_port_fl1395' into 'main-pc' (8cee225c) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@
		/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF / / Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */
		#define FIX_1009_ISM_NONDIEGETIC_PANNING /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan */
		#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */
		#define FIX_998_UNUSED_FUNCTION /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */

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

lib_dec/ivas_dirac_dec_fx.c

+34 −0

Original line number	Diff line number	Diff line
		@@ -2745,6 +2745,7 @@ void ivas_dirac_dec_render_sf_fx(
		{
		masa_band_mapping = st_ivas->hMasa->data.band_mapping;
		}
		#ifndef FIX_998_UNUSED_FUNCTION
		test();
		test();
		IF( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[st_ivas->hCombinedOrientationData->subframe_idx] && EQ_16( st_ivas->hCombinedOrientationData->shd_rot_max_order, 1 ) )
		@@ -2779,6 +2780,20 @@ void ivas_dirac_dec_render_sf_fx(
		NULL,
		hodirac_flag );
		}
		#else
		ivas_dirac_dec_compute_directional_responses_fx( hSpatParamRendCom,
		hDirACRend,
		st_ivas->hVBAPdata,
		masa_band_mapping,
		st_ivas->hMasaIsmData,
		azimuth,
		elevation,
		md_idx,
		surCohRatio_fx,
		surCohRatio_q_fx,
		hodirac_flag );

		#endif
		}

		test();
		@@ -3294,6 +3309,7 @@ void ivas_dirac_dec_render_sf_fx(
		move16();
		}

		#ifndef FIX_998_UNUSED_FUNCTION
		test();
		test();
		IF( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[st_ivas->hCombinedOrientationData->subframe_idx] && st_ivas->hCombinedOrientationData->shd_rot_max_order > 0 )
		@@ -3336,6 +3352,24 @@ void ivas_dirac_dec_render_sf_fx(
		hodirac_flag,
		hDirAC->hConfig->dec_param_estim );
		}
		#else
		ivas_dirac_dec_output_synthesis_process_slot_fx( reference_power_fx,
		DirAC_mem.reference_power_q,
		p_onset_filter_fx,
		azimuth,
		elevation,
		hSpatParamRendCom->diffuseness_vector_fx[md_idx],
		hSpatParamRendCom->q_diffuseness_vector,
		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 )
		{

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+18 −4

Original line number	Diff line number	Diff line
		@@ -650,8 +650,10 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		Word16 q_diffuseness,
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common spatial renderer data handle */
		DIRAC_REND_HANDLE hDirACRend, /* i/o: DirAC renderer handle */
		#ifndef FIX_998_UNUSED_FUNCTION
		const Word16 sh_rot_max_order,
		const Word32 p_Rmat, / i : rotation matrix Q30*/
		#endif
		const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */
		const IVAS_OUTPUT_SETUP hOutSetup, /* i : output setup structure */
		const Word16 nchan_transport, /* i : number of transport channels*/
		@@ -705,8 +707,10 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		md_idx,
		NULL,
		0,
		#ifndef FIX_998_UNUSED_FUNCTION
		2,
		p_Rmat,
		#endif
		hodirac_flag );
		{

		@@ -777,8 +781,10 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		md_idx,
		NULL,
		0,
		#ifndef FIX_998_UNUSED_FUNCTION
		sh_rot_max_order,
		p_Rmat,
		#endif
		hodirac_flag );

		{
		@@ -2812,6 +2818,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
		return;
		}

		#ifndef FIX_998_UNUSED_FUNCTION

		/*-------------------------------------------------------------------------
		* ivas_dirac_dec_get_response_split_order()
		@@ -3095,6 +3102,7 @@ static void ivas_dirac_dec_get_response_split_order_fx(

		return;
		}
		#endif

		/*-------------------------------------------------------------------------
		* ivas_dirac_dec_compute_directional_responses()
		@@ -3113,8 +3121,10 @@ void ivas_dirac_dec_compute_directional_responses_fx(
		const Word16 md_idx,
		const Word32 surCohRatio_fx, /i:Q_surCohRatio*/
		Word16 Q_surCohRatio,
		#ifndef FIX_998_UNUSED_FUNCTION
		const Word16 shd_rot_max_order, /* i : split-order rotation method */
		const Word32 p_Rmat, / i : rotation matrix Q30*/
		#endif
		const Word16 hodirac_flag /* i : flag to indicate HO-DirAC mode */
		)
		{
		@@ -3228,6 +3238,7 @@ void ivas_dirac_dec_compute_directional_responses_fx(
		exp_direct_response_dir2 = 0;
		move16();

		#ifndef FIX_998_UNUSED_FUNCTION
		IF( p_Rmat != 0 )
		{
		ivas_dirac_dec_get_response_split_order_fx( azimuth[k], elevation[k], direct_response_hoa_fx, shd_rot_max_order, p_Rmat, &Q_direct_response_hoa );
		@@ -3239,6 +3250,7 @@ void ivas_dirac_dec_compute_directional_responses_fx(
		}
		ELSE
		{
		#endif
		#ifdef FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx
		ivas_dirac_dec_get_response_fx_29( azimuth[k], elevation[k], direct_response_hoa_fx, hDirACRend->hOutSetup.ambisonics_order );
		#else
		@@ -3253,7 +3265,9 @@ void ivas_dirac_dec_compute_directional_responses_fx(
		ivas_dirac_dec_get_response_fx( azimuth2[k], elevation2[k], direct_response_dir2_fx, hDirACRend->hOutSetup.ambisonics_order, Q_direct_response_dir2 );
		#endif
		}
		#ifndef FIX_998_UNUSED_FUNCTION
		}
		#endif

		test();
		test();

lib_rend/ivas_dirac_rend_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -4239,8 +4239,10 @@ static void ivas_masa_ext_dirac_render_sf_fx(
		md_idx,
		surCohRatio_fx,
		Q_surCohRatio,
		#ifndef FIX_998_UNUSED_FUNCTION
		0,
		NULL,
		#endif
		0 );

		Word16 proto_direct_buffer_f_temp_q[60];
		@@ -4619,8 +4621,10 @@ static void ivas_masa_ext_dirac_render_sf_fx(
		hSpatParamRendCom->q_diffuseness_vector,
		hSpatParamRendCom,
		hDirACRend,
		#ifndef FIX_998_UNUSED_FUNCTION
		0,
		0,
		#endif
		hMasaExtRend->hVBAPdata,
		hDirACRend->hOutSetup,
		nchan_transport,

lib_rend/ivas_prot_rend_fx.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -472,8 +472,10 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		Word16 q_diffuseness,
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common spatial renderer data handle */
		DIRAC_REND_HANDLE hDirACRend, /* i/o: DirAC renderer handle */
		#ifndef FIX_998_UNUSED_FUNCTION
		const Word16 sh_rot_max_order,
		const Word32 p_Rmat, / i : rotation matrix */
		#endif
		const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */
		const IVAS_OUTPUT_SETUP hOutSetup, /* i : output setup structure */
		const Word16 nchan_transport, /* i : number of transport channels*/
		@@ -545,8 +547,10 @@ void ivas_dirac_dec_compute_directional_responses_fx(
		const Word16 md_idx,
		const Word32 *surCohRatio_fx,
		Word16 Q_surCohRatio,
		#ifndef FIX_998_UNUSED_FUNCTION
		const Word16 shd_rot_max_order, /* i : split-order rotation method */
		const Word32 p_Rmat, / i : rotation matrix */
		#endif
		const Word16 hodirac_flag /* i : flag to indicate HO-DirAC mode */
		);