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

apps/decoder.c

+1 −76

Original line number	Diff line number	Diff line
		@@ -160,9 +160,6 @@ typedef struct
		char *hrtfFileName;

		IVAS_DEC_HRTF_HANDLE *hHrtfTD;
		#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF;
		#endif

		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics;

		@@ -171,12 +168,7 @@ typedef struct
		IVAS_BIN_RENDERER_TYPE binaural_renderer_sec;
		IVAS_BIN_RENDERER_TYPE binaural_renderer_sec_old;

		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		IVAS_AUDIO_CONFIG hrtf_set_audio_cfg;
		#else
		IVAS_AUDIO_CONFIG intern_audio_config;
		int16_t room_reverb_flag;
		#endif

		} IVAS_DEC_HRTF_BINARY_WRAPPER;

		@@ -189,11 +181,7 @@ static bool parseCmdlIVAS_dec( int16_t argc, char *argv, DecArguments arg );
		static void usage_dec( void );
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );
		#else
		static ivas_error IVAS_DEC_LoadHrtfFromFile( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const int32_t output_Fs );
		#endif
		#ifdef DEBUGGING
		static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
		static int16_t app_own_random( int16_t *seed );
		@@ -248,9 +236,6 @@ int main(
		#endif

		hHrtfBinary.hHrtfTD = NULL; /* just to avoid compilation warning */
		#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM
		hHrtfBinary.hSetOfHRTF = NULL; /* just to avoid compilation warning */
		#endif
		hHrtfBinary.hHrtfStatistics = NULL; /* just to avoid compilation warning */

		splitRendBits.bits_buf = splitRendBitsBuf;
		@@ -734,12 +719,7 @@ int main(
		hHrtfBinary.hrtfFileName = arg.hrtfFileName;
		hHrtfBinary.binaural_renderer = IVAS_BIN_RENDERER_TYPE_NONE;
		hHrtfBinary.binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_NONE;
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		hHrtfBinary.hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;
		#else
		hHrtfBinary.room_reverb_flag = 0;
		hHrtfBinary.intern_audio_config = IVAS_AUDIO_CONFIG_INVALID;
		#endif
		}

		/------------------------------------------------------------------------------------------
		@@ -818,9 +798,6 @@ cleanup:
		if ( arg.hrtfReaderEnabled )
		{
		destroy_td_hrtf( hHrtfBinary.hHrtfTD );
		#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM
		destroy_SetOfHRTF( hHrtfBinary.hSetOfHRTF );
		#endif
		destroy_hrtf_statistics( hHrtfBinary.hHrtfStatistics );
		}

		@@ -2372,11 +2349,7 @@ static ivas_error decodeG192(
		/* Read main parameters from the bitstream to set-up the decoder */
		hHrtfBinary->binaural_renderer_old = hHrtfBinary->binaural_renderer;
		hHrtfBinary->binaural_renderer_sec_old = hHrtfBinary->binaural_renderer_sec;
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtfBinary->binaural_renderer, &hHrtfBinary->binaural_renderer_sec, &hHrtfBinary->hrtf_set_audio_cfg ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtfBinary->binaural_renderer, &hHrtfBinary->binaural_renderer_sec, &hHrtfBinary->room_reverb_flag, &hHrtfBinary->intern_audio_config ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -2387,11 +2360,7 @@ static ivas_error decodeG192(
		/* Load HRTF binary file data */
		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = load_hrtf_from_file( hHrtfBinary, hIvasDec, arg.outputConfig, arg.output_Fs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_LoadHrtfFromFile( hHrtfBinary, hIvasDec, arg.output_Fs ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_DEC_LoadHrtfFromFile failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -3287,11 +3256,7 @@ static ivas_error decodeVoIP(
		/* Read main parameters from the bitstream to set-up the decoder */
		hHrtf->binaural_renderer_old = hHrtf->binaural_renderer;
		hHrtf->binaural_renderer_sec_old = hHrtf->binaural_renderer_sec;
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtf->binaural_renderer, &hHrtf->binaural_renderer_sec, &hHrtf->hrtf_set_audio_cfg ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtf->binaural_renderer, &hHrtf->binaural_renderer_sec, &hHrtf->room_reverb_flag, &hHrtf->intern_audio_config ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -3302,11 +3267,7 @@ static ivas_error decodeVoIP(
		/* Load HRTF binary file data */
		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = load_hrtf_from_file( hHrtf, hIvasDec, arg.outputConfig, arg.output_Fs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_LoadHrtfFromFile( hHrtf, hIvasDec, arg.output_Fs ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_DEC_LoadHrtfFromFile failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -3697,7 +3658,6 @@ static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec(
		#endif


		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		/---------------------------------------------------------------------
		* load_hrtf_from_file()
		*
		@@ -3710,18 +3670,6 @@ static ivas_error load_hrtf_from_file(
		const IVAS_AUDIO_CONFIG OutputConfig, /* i : output audio configuration */
		const int32_t output_Fs /* i : output sampling rate */
		)
		#else
		/---------------------------------------------------------------------
		* IVAS_DEC_LoadHrtfFromFile()
		*
		*
		---------------------------------------------------------------------/

		static ivas_error IVAS_DEC_LoadHrtfFromFile(
		IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary,
		IVAS_DEC_HANDLE hIvasDec,
		const int32_t output_Fs )
		#endif
		{
		ivas_error error;
		IVAS_BIN_RENDERER_TYPE binaural_renderer, binaural_renderer_sec;
		@@ -3747,13 +3695,6 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile(
		destroy_td_hrtf( hHrtfBinary->hHrtfTD );
		}

		#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( !( binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND \|\| binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT ) && hHrtfBinary->hSetOfHRTF != NULL )
		{
		destroy_SetOfHRTF( hHrtfBinary->hSetOfHRTF );
		}

		#endif
		if ( ( error = IVAS_DEC_HRTF_binary_close( hIvasDec, hHrtfBinary->binaural_renderer_old ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -3801,22 +3742,14 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile(

		if ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND \|\| binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT )
		{
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;
		if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hHrtfCrend ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hHrtfBinary->hSetOfHRTF ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		return error;
		}

		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ( error = load_Crend_HRTF_from_binary( *hHrtfCrend, hHrtfBinary->hrtfReader, OutputConfig, hHrtfBinary->hrtf_set_audio_cfg, output_Fs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = create_SetOfHRTF_from_binary( *hHrtfBinary->hSetOfHRTF, hHrtfBinary->hrtfReader, output_Fs ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		@@ -3825,11 +3758,7 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile(
		}
		else
		{
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		destroy_crend_hrtf( hHrtfCrend );
		#else
		destroy_SetOfHRTF( hHrtfBinary->hSetOfHRTF );
		#endif
		}
		}
		}
		@@ -3843,11 +3772,7 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile(
		return error;
		}

		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, OutputConfig, hHrtfBinary->hrtf_set_audio_cfg, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hHrtfBinary->room_reverb_flag, hHrtfBinary->intern_audio_config, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{

apps/renderer.c

+48 −26

Original line number	Diff line number	Diff line
		@@ -669,11 +669,7 @@ int main(
		SplitRendBFIFileReader *splitRendBFIReader = NULL;
		Vector3PairFileReader *referenceVectorReader = NULL;
		hrtfFileReader *hrtfFileReader = NULL;
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		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;
		@@ -741,6 +737,10 @@ int main(
		lfeRoutingConfigs[i] = NULL;
		}

		#ifdef FIX_1225_DISCLAIMER
		IVAS_REND_PrintDisclaimer();

		#endif
		CmdlnArgs args = parseCmdlnArgs( argc, argv );

		if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) \|\|
		@@ -898,6 +898,49 @@ int main(
		exit( -1 );
		}

		#ifdef FIX_1225_DISCLAIMER
		fprintf( stdout, "Input audio file: %s\n", args.inputFilePath );
		fprintf( stdout, "Output audio file: %s\n\n", args.outputFilePath );

		if ( args.inConfig.numAudioObjects > 0 )
		{
		if ( args.inConfig.numAudioObjects == 1 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM1 );
		}
		else if ( args.inConfig.numAudioObjects == 2 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM2 );
		}
		else if ( args.inConfig.numAudioObjects == 3 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM3 );
		}
		else if ( args.inConfig.numAudioObjects == 4 )
		{
		IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM4 );
		}
		}
		for ( i = 0; i < args.inConfig.numMultiChannelBuses; i++ )
		{
		IVAS_REND_PrintInputConfig( args.inConfig.multiChannelBuses[i].audioConfig );
		}
		for ( i = 0; i < args.inConfig.numMasaBuses; i++ )
		{
		IVAS_REND_PrintInputConfig( args.inConfig.masaBuses[i].audioConfig );
		}
		for ( i = 0; i < args.inConfig.numAmbisonicsBuses; i++ )
		{
		IVAS_REND_PrintInputConfig( args.inConfig.ambisonicsBuses[i].audioConfig );
		}

		if ( ( error = IVAS_REND_PrintConfig( hIvasRend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\n IVAS_REND_PrintConfig failed: %s\n\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#endif
		if ( !isEmptyString( args.customHrtfFilePath ) )
		{
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		@@ -932,17 +975,12 @@ int main(
		}


		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hHrtfCrend ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed: %s\n\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		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 )
		{
		@@ -950,9 +988,6 @@ int main(
		}

		if ( ( error = load_Crend_HRTF_from_binary( *hHrtfCrend, hrtfFileReader, args.outConfig.audioConfig, hrtf_set_audio_cfg, args.sampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		@@ -961,11 +996,7 @@ int main(
		}
		else
		{
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		destroy_crend_hrtf( hHrtfCrend );
		#else
		destroy_SetOfHRTF( hSetOfHRTF );
		#endif
		}
		}

		@@ -975,11 +1006,7 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		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, 0, IVAS_AUDIO_CONFIG_INVALID, hrtfFileReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		@@ -1986,9 +2013,6 @@ cleanup:

		Vector3PairFileReader_close( &referenceVectorReader );
		destroy_td_hrtf( hHrtfTD );
		#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM
		destroy_SetOfHRTF( hSetOfHRTF );
		#endif
		destroy_hrtf_statistics( hHrtfStatistics );
		IVAS_REND_Close( &hIvasRend );
		IsmPositionProvider_close( positionProvider );
		@@ -2537,9 +2561,7 @@ static CmdlnArgs defaultArgs(
		args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_INVALID;
		args.outConfig.outSetupCustom.num_spk = 0;
		args.outConfig.outSetupCustom.num_lfe = 0;
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;
		#endif

		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		{

lib_com/common_api_types.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -175,11 +175,7 @@ typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;
		typedef struct ivas_masa_decoder_ext_out_meta_struct *IVAS_MASA_DECODER_EXT_OUT_META_HANDLE;

		typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		typedef struct ivas_hrtf_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
		#else
		typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
		#endif
		typedef struct ivas_hrtfs_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;
		typedef struct ivas_hrtfs_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;
		typedef struct ivas_hrtfs_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;

lib_com/disclaimer.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -47,7 +47,11 @@ int16_t print_disclaimer( FILE *fPtr )
		{

		fprintf( fPtr, "\n==================================================================================================\n" );
		#ifdef FIX_1225_DISCLAIMER
		fprintf( fPtr, " \n IVAS Codec Version IVAS-FL-2.0\n" );
		#else
		fprintf( fPtr, " IVAS Codec Baseline\n" );
		#endif
		fprintf( fPtr, " \n" );
		fprintf( fPtr, " Based on EVS Codec (Floating Point) 3GPP TS26.443 Nov 04, 2021,\n" );
		fprintf( fPtr, " Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0\n" );

lib_com/ivas_cnst.h

+0 −13

Original line number	Diff line number	Diff line
		@@ -1495,19 +1495,6 @@ typedef enum

		#define BINAURAL_COHERENCE_DIFFERENCE_BINS 9 /* Number of bins for direction-dependent diffuse-field binaural coherence */

		#ifndef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		typedef enum
		{
		BINAURAL_INPUT_AUDIO_CONFIG_INVALID,
		BINAURAL_INPUT_AUDIO_CONFIG_COMBINED, /* 5_1, 5_1_2, 5_1_4, 7_1, 7_1_4 */
		BINAURAL_INPUT_AUDIO_CONFIG_HOA3, /* HOA3 */
		BINAURAL_INPUT_AUDIO_CONFIG_HOA2, /* HOA2 */
		BINAURAL_INPUT_AUDIO_CONFIG_FOA, /* FOA */
		BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED /* Not used */

		} BINAURAL_INPUT_AUDIO_CONFIG;

		#endif
		#define HEADROT_ORDER 3
		#define HEADROT_SHMAT_DIM ( ( HEADROT_ORDER + 1 ) * ( HEADROT_ORDER + 1 ) )
		#define HEADROT_SHMAT_DIM2 ( HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM )