adds to Erik update (98bf1ef9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_ism_com.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ ivas_error ivas_ism_config(
		const int16_t nchan_ism, /* i : number of objects */
		ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
		#ifdef ISM_NON_DIEGETIC_PAN
		const int16_t ism_extended_metadata_flag,
		const int16_t ism_ndp_flag,
		#endif
		const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */
		const int16_t ism_imp[], /* i : ISM importance flags */
		@@ -139,7 +139,7 @@ ivas_error ivas_ism_config(
		{
		nb_bits_metadata[0] += ISM_EXTENDED_METADATA_BITS;
		#ifdef ISM_NON_DIEGETIC_PAN
		if ( ism_extended_metadata_flag )
		if ( ism_ndp_flag )
		{
		nb_bits_metadata[0] += ISM_METADATA_IS_NDP_BITS;
		}
		@@ -346,9 +346,6 @@ void ivas_ism_reset_metadata(
		hIsmMeta->yaw = 0.0f;
		hIsmMeta->pitch = 0.0f;
		hIsmMeta->radius = 1.0f;
		#ifdef NON_DIEGETIC_PAN
		hIsmMeta->ism_metadata_flag = 0;
		#endif

		return;
		}
		@@ -364,9 +361,7 @@ void ivas_ism_reset_metadata_API(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		)
		{
		#ifndef ivas_ism_reset_metadata
		hIsmMeta->ism_metadata_flag = 0;
		#endif
		ivas_ism_reset_metadata( hIsmMeta );

		return;

+2 −4

Original line number	Diff line number	Diff line
		@@ -747,7 +747,7 @@ ivas_error ivas_ism_config(
		const int16_t nchan_ism, /* i : number of objects */
		ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
		#ifdef ISM_NON_DIEGETIC_PAN
		const int16_t ism_extended_metadata_flag,
		const int16_t ism_ndp_flag, /* i : non diegetic object flag */
		#endif
		const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */
		const int16_t ism_imp[], /* i : ISM importance flags */
		@@ -789,11 +789,9 @@ ivas_error ivas_set_ism_metadata(
		const float elevation, /* i : elevation value */
		const float radius_meta, /* i : radius */
		const float yaw, /* i : yaw */
		#ifdef ISM_NON_DIEGETIC_PAN
		const float pitch, /* i : pitch */
		#ifdef ISM_NON_DIEGETIC_PAN
		const int16_t non_diegetic_flag /* i : non-diegetic flag */
		#else
		const float pitch /* i : pitch */
		#endif
		);

+3 −5

Original line number	Diff line number	Diff line
		@@ -72,13 +72,11 @@ static ivas_error ivas_ism_bitrate_switching(
		st_ivas->ism_mode = ism_mode;
		#endif

		if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL,
		#ifdef ISM_NON_DIEGETIC_PAN
		0,
		if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )
		#endif
		NULL,

		NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )
		{
		return error;
		}

+456 −460

Original line number	Diff line number	Diff line
		@@ -494,13 +494,11 @@ ivas_error ivas_ism_metadata_dec(

		if ( !bfi )
		{
		if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, nchan_ism, hIsmMeta,
		#ifdef ISM_NON_DIEGETIC_PAN
		ism_extmeta_bitstream,
		if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, nchan_ism, hIsmMeta, ism_extmeta_bitstream, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK )
		#endif
		localVAD, ism_imp,
		element_brate,
		total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -617,13 +615,11 @@ ivas_error ivas_ism_metadata_dec(
		ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] );
		}

		if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL,
		#ifdef ISM_NON_DIEGETIC_PAN
		0,
		if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )
		#endif
		NULL,
		NULL,
		element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )
		{
		return error;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ void ivas_ism_render(
		{
		/* Head rotation: rotate the object positions depending the head's orientation */
		#ifdef ISM_NON_DIEGETIC_PAN
		if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 && st_ivas->hIsmMetaData[i]->ism_metadata_flag != 2 )
		if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 && st_ivas->hIsmMetaData[i]->non_diegetic_flag )
		#else
		if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 )
		#endif