[fix] merge conflicts (39cfd25c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci-custom.yml

+4 −1142

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_ism_renderer.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -393,6 +393,7 @@ ivas_error ivas_omasa_separate_object_renderer_open(
		set_f( st_ivas->hIsmRendererData->prev_gains[i], 0.0f, MAX_OUTPUT_CHANNELS );
		}

		#ifndef API_5MS
		// Todo OMASA JBM: This needs touches for VOIP path at least. Current version is mostly an adapted copy from ivas_ism_renderer_open()
		if ( st_ivas->hDecoderConfig->voip_active )
		{
		@@ -401,9 +402,12 @@ ivas_error ivas_omasa_separate_object_renderer_open(
		}
		else
		{
		#endif
		init_interpolator_length = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC / MAX_PARAM_SPATIAL_SUBFRAMES );
		interpolator_length = init_interpolator_length;
		#ifndef API_5MS
		}
		#endif
		st_ivas->hIsmRendererData->interpolator = (float ) malloc( sizeof( float ) init_interpolator_length );

		for ( i = 0; i < interpolator_length; i++ )

lib_dec/ivas_omasa_dec.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -582,7 +582,12 @@ void ivas_omasa_dirac_rend(

		dirac_read_idx = st_ivas->hSpatParamRendCom->dirac_read_idx;

		ivas_dirac_dec( st_ivas, output, st_ivas->nchan_transport );
		ivas_dirac_dec( st_ivas, output, st_ivas->nchan_transport
		#ifdef LIB_REND_API_5MS
		,
		MAX_PARAM_SPATIAL_SUBFRAMES
		#endif
		);

		st_ivas->hSpatParamRendCom->dirac_read_idx = dirac_read_idx; /* Original read index is needed for the next function which will update it again */

		@@ -626,7 +631,12 @@ ivas_error ivas_omasa_dirac_td_binaural(
		delay_signal( data_separated_objects[n], output_frame, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
		}

		ivas_dirac_dec_binaural( st_ivas, st_ivas->hCombinedOrientationData, output, st_ivas->nchan_transport );
		ivas_dirac_dec_binaural( st_ivas, st_ivas->hCombinedOrientationData, output, st_ivas->nchan_transport
		#ifdef LIB_REND_API_5MS
		,
		MAX_PARAM_SPATIAL_SUBFRAMES
		#endif
		);

		if ( ( error = ivas_td_binaural_renderer( st_ivas, p_sepobj, output_frame ) ) != IVAS_ERR_OK )
		{

lib_rend/ivas_dirac_dec_binaural_functions.c

+22 −1

Original line number	Diff line number	Diff line
		@@ -951,7 +951,11 @@ static void ivas_dirac_dec_binaural_internal(
		subFrameTotalEne, IIReneLimiter );
		#ifdef MASA_AND_OBJECTS
		ivas_dirac_dec_binaural_formulate_target_covariance_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, Rmat, subframe,
		#ifdef LIB_REND_API_5MS
		hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation > 0,
		#else
		hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[subframe] > 0,
		#endif
		subFrameTotalEne, IIReneLimiter, st_ivas->hMasaIsmData );
		#else
		ivas_dirac_dec_binaural_formulate_target_covariance_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, Rmat, subframe,
		@@ -971,7 +975,11 @@ static void ivas_dirac_dec_binaural_internal(
		nchanSeparateChannels = (uint8_t) st_ivas->nchan_ism;
		}
		ivas_dirac_dec_binaural_determine_processing_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, max_band_decorr, Rmat,
		#ifdef LIB_REND_API_5MS
		hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation > 0,
		#else
		hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[subframe] > 0,
		#endif
		nchanSeparateChannels, st_ivas->hMasaIsmData );
		#else
		ivas_dirac_dec_binaural_determine_processing_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, max_band_decorr, Rmat,
		@@ -1017,7 +1025,11 @@ static void ivas_dirac_dec_binaural_internal(

		if ( hCombinedOrientationData )
		{
		#ifdef LIB_REND_API_5MS
		Quaternions_ref = &hCombinedOrientationData->Quaternion;
		#else
		Quaternions_ref = &hCombinedOrientationData->Quaternions[0];
		#endif
		Quaternions_rot.w = -3.0f; /* signal to use Euler */
		Quaternions_abs.w = -3.0f; /* signal to use Euler */
		Quat2EulerDegree( Quaternions_ref, &Quaternions_abs.z, &Quaternions_abs.y, &Quaternions_abs.x ); /order in Quat2Euler seems to be reversed ?*/
		@@ -1047,12 +1059,21 @@ static void ivas_dirac_dec_binaural_internal(

		#ifdef MASA_AND_OBJECTS
		ivas_dirac_dec_binaural_formulate_target_covariance_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, Rmat_local, subframe,
		#ifdef LIB_REND_API_5MS
		hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation > 0,
		#else
		hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[subframe] > 0,
		#endif
		subFrameTotalEne, IIReneLimiter, st_ivas->hMasaIsmData );


		ivas_dirac_dec_binaural_determine_processing_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, max_band_decorr, Rmat_local,
		hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[subframe] > 0, nchanSeparateChannels, st_ivas->hMasaIsmData );
		#ifdef LIB_REND_API_5MS
		hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation > 0,
		#else
		hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[subframe] > 0,
		#endif
		nchanSeparateChannels, st_ivas->hMasaIsmData );

		#else
		ivas_dirac_dec_binaural_formulate_target_covariance_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, Rmat_local, subframe,

tests/renderer/constants.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ HR_TRAJECTORIES_TO_TEST = [
		]

		""" 5ms framing """
		FRAMING_5MS_TO_TEST = [True, False]
		FRAMING_5MS_TO_TEST = ["5ms", "20ms"]

		""" Per-testcase xfail SNR thresholds (dB) """
		pass_snr = dict() # not relevant for tests anymore, should be deprecated soon