- temporarily disable TD5 and TD5_FIX_INVALID_MEMORY_ACCESS +fix compilation when they are disabled (958f8709) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -149,8 +149,8 @@
		#define FIX_350_MASA_DELAY_COMP /* Nokia: Issue 350: MASA audio/meta delay compensation */
		#define FIX_372_LIB_REND_VALIDATE_IO /* FhG: Issue 372: IVAS_rend segfaults with unsupported I/O configs - add validation checks of I/O config */
		#define FIX_376_SBA_ROTATE /DLB: Fix for issue 376/
		#define TD5 /* Eri: Contribution 17: Extended metadata for 6 DoF rendering in TD renderer */
		#define TD5_FIX_INVALID_MEMORY_ACCESS /* FhG: Resolves segfault in case IVAS_REND_InitConfig gets initialized with rendererConfigEnabled:=false && ISM are being rendered */
		//#define TD5 /* Eri: Contribution 17: Extended metadata for 6 DoF rendering in TD renderer */
		//#define TD5_FIX_INVALID_MEMORY_ACCESS /* FhG: Resolves segfault in case IVAS_REND_InitConfig gets initialized with rendererConfigEnabled:=false && ISM are being rendered */
		#define FIX_371_DELAY_REPORT /* Issue 371: div. by zero with -no_delay_cmp */
		#define FIX_373_MASA_DELAY_COMP_MSAN /* Nokia: Issue 373: MASA audio/meta delay compensation. MSAN bugfix */

lib_dec/ivas_ism_metadata_dec.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1163,13 +1163,23 @@ void ivas_ism_metadata_sid_dec(
		/* update last indexes to correspond to active frames coding */
		if ( nBits_azimuth > ISM_AZIMUTH_NBITS )
		{
		#ifdef MD5
		hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS );
		hIsmMetaData->angle[0].last_elevation_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS );
		#else
		hIsmMetaData->last_azimuth_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS );
		hIsmMetaData->last_elevation_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS );
		#endif
		}
		else
		{
		#ifdef MD5
		hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth );
		hIsmMetaData->angle[0].last_elevation_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation );
		#else
		hIsmMetaData->last_azimuth_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth );
		hIsmMetaData->last_elevation_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation );
		#endif
		}

		/* save for smoothing metadata evolution */

lib_enc/ivas_ism_enc.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -277,7 +277,11 @@ ivas_error ivas_ism_enc(
		#endif
		st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag );
		#else
		ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm );
		ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate,
		#ifdef NCHAN_ISM_PARAMETER
		nchan_ism,
		#endif
		st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm );
		#endif
		}
		else /* ISM_MODE_DISC */
		@@ -289,7 +293,11 @@ ivas_error ivas_ism_enc(
		#endif
		st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL, st_ivas->hEncoderConfig->ism_extended_metadata_flag );
		#else
		ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL );
		ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate,
		#ifdef NCHAN_ISM_PARAMETER
		nchan_ism,
		#endif
		st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL );
		#endif
		}

lib_enc/ivas_ism_metadata_enc.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1425,13 +1425,23 @@ void ivas_ism_metadata_sid_enc(
		/* update last indexes to correspond to active frames coding */
		if ( nBits_azimuth > ISM_AZIMUTH_NBITS )
		{
		#ifdef MD5
		hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS );
		hIsmMetaData->angle[0].last_elevation_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS );
		#else
		hIsmMetaData->last_azimuth_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS );
		hIsmMetaData->last_elevation_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS );
		#endif
		}
		else
		{
		#ifdef MD5
		hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth );
		hIsmMetaData->angle[0].last_elevation_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation );
		#else
		hIsmMetaData->last_azimuth_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth );
		hIsmMetaData->last_elevation_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation );
		#endif
		}
		}
		}

lib_rend/ivas_objectRenderer.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -612,7 +612,10 @@ ivas_error ivas_td_binaural_open_ext(
		#ifdef TD5
		#ifdef TD5_FIX_INVALID_MEMORY_ACCESS
		if ( NULL != hRendCfg )
		{
		directivity = hRendCfg->directivity;
		}

		return ivas_td_binaural_open_unwrap( &pTDRend->hHrtfTD, outFs, nchan_transport, ivas_format, transport_config, directivity, hTransSetup, &pTDRend->hBinRendererTd, &pTDRend->binaural_latency_ns );
		#else
		return ivas_td_binaural_open_unwrap( &pTDRend->hHrtfTD, outFs, nchan_transport, ivas_format, transport_config, hRendCfg->directivity, hTransSetup, &pTDRend->hBinRendererTd, &pTDRend->binaural_latency_ns );