Merge branch '1963_ref_portFltMR-1568-1471-1690' into 'ivas-float-update' (53ec3ebf) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci/variables.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,8 @@ variables:
		RUNNER_TAG: "ivas-basop-linux"
		LOGS_BACKUP_SOURCE_DIR: ""
		LOGS_BACKUP_TARGET_DIR: ""
		# set this to true to skip the external HRTF testcases in pytest calls
		DISABLE_HRTF: "true"
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
		value: 'default'

apps/decoder.c

+331 −9

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+57 −0

Original line number	Diff line number	Diff line
		@@ -624,7 +624,11 @@ static int16_t get_cldfb_in_flag(
		int16_t cldfb_in_flag;

		cldfb_in_flag = 0;
		#ifdef FIX_HRTF_LOAD
		if ( renderConfig->split_rend_config.rendererSelection == IVAS_BIN_RENDERER_TYPE_FASTCONV )
		#else
		if ( renderConfig->split_rend_config.rendererSelection == ISAR_SPLIT_REND_RENDERER_SELECTION_FASTCONV )
		#endif
		{
		#ifdef DEBUGGING
		cldfb_in_flag = 1;
		@@ -673,7 +677,11 @@ int main(
		SplitRendBFIFileReader *splitRendBFIReader = NULL;
		Vector3PairFileReader *referenceVectorReader = NULL;
		hrtfFileReader *hrtfFileReader = NULL;
		#ifdef FIX_CREND_SIMPLIFY_CODE
		IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;
		#else
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
		#endif
		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
		IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
		@@ -959,7 +967,11 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_989_TD_REND_ROM
		if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		@@ -972,7 +984,20 @@ int main(
		}
		}

		#ifdef FIX_CREND_SIMPLIFY_CODE
		if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hHrtfCrend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed: %s\n\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		IVAS_AUDIO_CONFIG hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_7_1_4;
		if ( args.inConfig.ambisonicsBuses->audioConfig != IVAS_AUDIO_CONFIG_INVALID && args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )
		{
		hrtf_set_audio_cfg = args.inConfig.ambisonicsBuses->audioConfig;
		}

		if ( ( error = load_Crend_HRTF_from_binary( *hHrtfCrend, hrtfFileReader, args.outConfig.audioConfig, hrtf_set_audio_cfg, args.sampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed: %s\n\n", ivas_error_to_string( error ) );
		@@ -980,6 +1005,7 @@ int main(
		}

		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		@@ -988,7 +1014,11 @@ int main(
		}
		else
		{
		#ifdef FIX_CREND_SIMPLIFY_CODE
		destroy_crend_hrtf( hHrtfCrend );
		#else
		destroy_SetOfHRTF( hSetOfHRTF );
		#endif
		}
		}

		@@ -998,7 +1028,11 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_CREND_SIMPLIFY_CODE
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, args.outConfig.audioConfig, args.inConfig.ambisonicsBuses->audioConfig, hrtfFileReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfFileReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		@@ -2025,6 +2059,9 @@ cleanup:
		RotationFileReader_close( &referenceRotReader );

		Vector3PairFileReader_close( &referenceVectorReader );
		#ifdef FIX_CREND_SIMPLIFY_CODE
		destroy_td_hrtf( hHrtfTD );
		#else
		if ( hSetOfHRTF != NULL && *hSetOfHRTF != NULL )
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		@@ -2033,6 +2070,7 @@ cleanup:
		{
		destroy_td_hrtf( hHrtfTD );
		}
		#endif
		destroy_hrtf_statistics( hHrtfStatistics );
		IVAS_REND_Close( &hIvasRend );
		IsmPositionProvider_close( positionProvider );
		@@ -2626,6 +2664,9 @@ static CmdlnArgs defaultArgs(
		const char *executableName )
		{
		CmdlnArgs args;
		#ifdef FIX_CREND_SIMPLIFY_CODE
		int16_t i;
		#endif

		strncpy( args.executableName, executableName, RENDERER_MAX_CLI_ARG_LENGTH );
		clearString( args.inputFilePath );
		@@ -2642,8 +2683,20 @@ static CmdlnArgs defaultArgs(
		args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_INVALID;
		args.outConfig.outSetupCustom.num_spk = 0;
		args.outConfig.outSetupCustom.num_lfe = 0;
		#ifdef FIX_CREND_SIMPLIFY_CODE
		for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i )
		{
		args.inConfig.ambisonicsBuses[i].audioConfig = IVAS_AUDIO_CONFIG_INVALID;
		}
		#else
		args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;
		#endif

		#ifdef FIX_CREND_SIMPLIFY_CODE
		for ( i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )
		#else
		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		#endif
		{
		clearString( args.inMetadataFilePaths[i] );
		}
		@@ -2681,7 +2734,11 @@ static CmdlnArgs defaultArgs(
		args.render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
		args.syncMdDelay = 0;

		#ifdef FIX_CREND_SIMPLIFY_CODE
		for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		#else
		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		#endif
		{
		args.directivityPatternId[i] = 65535;
		}

lib_com/common_api_types.h

+26 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_cnst.h

+4 −0

File changed.

Preview size limit exceeded, changes collapsed.