Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 20240807_python_fixes (e9ef465c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -435,6 +435,8 @@ check-compatibility-with-basop-reference-branch:
		- make -j -C ivas-basop
		- cp ivas-basop/IVAS_cod ./IVAS_cod_ref
		- cp ivas-basop/IVAS_dec ./IVAS_dec_ref
		- cp ivas-basop/IVAS_cod ./IVAS_cod # Not used but needed to launch the pytest
		- cp ivas-basop/IVAS_dec ./IVAS_dec # Not used but needed to launch the pytest
		- python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm
		- python3 tests/create_short_testvectors.py
		- exit_code1=0

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,7 @@
		#define FIX_1152_UNINIT_VAL_IN_ITD_VAD_COMPUTATION /* FhG: fix uninitialized value being used in ITD VAD mid signal computation that does not affect synthesis, but crashes BASOPs */
		#define FIX_1157_OBSOLETE_DMX_TABLE /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */
		#define FIX_1135_EXT_RENDERER_HANDLES /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */
		#define FIX_1159_SPLIT_RENDERING_CONFIG /* VA: issue 1159: Execute split rendering config only for split rendering outputs. */

		/* #################### End BE switches ################################## */

lib_dec/lib_dec.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -2230,10 +2230,17 @@ ivas_error IVAS_DEC_FeedRenderConfig(
		hRenderConfig->split_rend_config.poseCorrectionMode = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;
		}

		#ifdef FIX_1159_SPLIT_RENDERING_CONFIG
		if ( is_split_rendering_enabled( hIvasDec->st_ivas->hDecoderConfig, hRenderConfig ) )
		{
		#endif
		if ( ( error = isar_split_rend_validate_config( &hRenderConfig->split_rend_config, ( hIvasDec->st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		#ifdef FIX_1159_SPLIT_RENDERING_CONFIG
		}
		#endif

		return IVAS_ERR_OK;
		}

lib_rend/lib_rend.c

+20 −11

Original line number	Diff line number	Diff line
		@@ -609,7 +609,9 @@ static ivas_error validateOutputSampleRate(
		/* Otherwise rendering to binaural, support the same set as IVAS decoder */
		switch ( sampleRate )
		{
		#ifndef FIX_1159_SPLIT_RENDERING_CONFIG
		case 8000:
		#endif
		case 16000:
		case 32000:
		case 48000:
		@@ -2930,7 +2932,7 @@ ivas_error IVAS_REND_Open(
		{
		if ( ( hIvasRend->splitRendWrapper = (SPLIT_REND_WRAPPER *) malloc( sizeof( SPLIT_REND_WRAPPER ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for IVAS decoder handle" );
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for IVAS renderer handle" );
		}

		isar_init_split_rend_handles( hIvasRend->splitRendWrapper );
		@@ -3975,7 +3977,7 @@ ivas_error IVAS_REND_GetDelay(
		if ( hIvasRend->inputsSba[i].base.inConfig != IVAS_AUDIO_CONFIG_INVALID )
		{
		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		if ( hIvasRend->splitRendWrapper->hBinHrSplitPreRend != NULL )
		if ( hIvasRend->splitRendWrapper != NULL && hIvasRend->splitRendWrapper->hBinHrSplitPreRend != NULL )
		#else
		if ( hIvasRend->splitRendWrapper.hBinHrSplitPreRend != NULL )
		#endif
		@@ -4253,7 +4255,7 @@ ivas_error IVAS_REND_InitConfig(
		-------------------------------------------------------------------/

		ivas_error IVAS_REND_GetRenderConfig(
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		const IVAS_RENDER_CONFIG_HANDLE hRCout /* o : Render configuration handle */
		)
		{
		@@ -4316,7 +4318,7 @@ ivas_error IVAS_REND_GetRenderConfig(
		-------------------------------------------------------------------/

		ivas_error IVAS_REND_FeedRenderConfig(
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */
		)
		{
		@@ -4466,10 +4468,17 @@ ivas_error IVAS_REND_FeedRenderConfig(

		hRenderConfig->split_rend_config.codec = renderConfig.split_rend_config.codec;

		#ifdef FIX_1159_SPLIT_RENDERING_CONFIG
		if ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		#endif
		if ( ( error = isar_split_rend_validate_config( &hRenderConfig->split_rend_config, ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		#ifdef FIX_1159_SPLIT_RENDERING_CONFIG
		}
		#endif

		/* Must re-initialize split rendering config in case renderer config is updated after adding renderer inputs */
		/* if its not initialized yet then no need to re-initialize, initialization will happen while adding inputs*/
		@@ -7975,7 +7984,7 @@ int32_t IVAS_REND_GetCntFramesLimited(
		---------------------------------------------------------------------/

		ivas_error IVAS_REND_GetHrtfHandle(
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		IVAS_DEC_HRTF_HANDLE *hHrtfTD / o : HRTF handle */
		)
		{
		@@ -7997,7 +8006,7 @@ ivas_error IVAS_REND_GetHrtfHandle(
		---------------------------------------------------------------------/

		ivas_error IVAS_REND_GetHrtfCRendHandle(
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF / o : Set of HRTF handle */
		)
		{
		@@ -8019,7 +8028,7 @@ ivas_error IVAS_REND_GetHrtfCRendHandle(
		---------------------------------------------------------------------/

		ivas_error IVAS_REND_GetHrtfFastConvHandle(
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv / o : FASTCONV HRTF handle */
		)
		{
		@@ -8041,7 +8050,7 @@ ivas_error IVAS_REND_GetHrtfFastConvHandle(
		---------------------------------------------------------------------/

		ivas_error IVAS_REND_GetHrtfParamBinHandle(
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin / o : Parametric binauralizer HRTF handle */
		)
		{
		@@ -8062,7 +8071,7 @@ ivas_error IVAS_REND_GetHrtfParamBinHandle(
		---------------------------------------------------------------------/

		ivas_error IVAS_REND_GetHrtfStatisticsHandle(
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics / o : HRTF statistics handle */
		)
		{

lib_rend/lib_rend.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -243,12 +243,12 @@ ivas_error IVAS_REND_InitConfig(
		);

		ivas_error IVAS_REND_GetRenderConfig(
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		const IVAS_RENDER_CONFIG_HANDLE hRCout /* o : Render configuration handle */
		);

		ivas_error IVAS_REND_FeedRenderConfig(
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */
		IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS renderer handle */
		const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */
		);