Merge branch 'main' into 2097-unused-function-getattackfortcxdecision_fx (06cba5d1) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+32 −174

Original line number	Diff line number	Diff line
		@@ -138,7 +138,6 @@ typedef struct

		} DecArguments;

		#ifdef FIX_CREND_SIMPLIFY_CODE
		typedef struct
		{
		hrtfFileReader *hrtfReader;
		@@ -156,7 +155,7 @@ typedef struct
		IVAS_AUDIO_CONFIG hrtf_set_audio_cfg;

		} IVAS_DEC_HRTF_BINARY_WRAPPER;
		#endif


		/------------------------------------------------------------------------------------------
		* Local functions prototypes
		@@ -164,14 +163,9 @@ typedef struct

		static bool parseCmdlIVAS_dec( int16_t argc, char *argv, DecArguments arg );
		static void usage_dec( void );
		#ifdef FIX_CREND_SIMPLIFY_CODE
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary, 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 hHrtfBinary, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );
		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 decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, 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, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );
		#endif


		/------------------------------------------------------------------------------------------
		@@ -202,23 +196,15 @@ int main(
		RenderConfigReader *renderConfigReader = NULL;
		int16_t *pcmBuf = NULL;
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		#ifdef FIX_CREND_SIMPLIFY_CODE
		IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;
		#else
		IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD = NULL;
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;
		#endif

		#ifdef WMOPS
		reset_wmops();
		reset_mem( USE_BYTES );
		#endif

		#ifdef FIX_CREND_SIMPLIFY_CODE
		hHrtfBinary.hHrtfTD = NULL; /* just to avoid compilation warning */
		hHrtfBinary.hHrtfStatistics = NULL; /* just to avoid compilation warning */
		#endif

		splitRendBits.bits_buf = splitRendBitsBuf;

		@@ -603,112 +589,11 @@ int main(

		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_CREND_SIMPLIFY_CODE
		hHrtfBinary.hrtfReader = hrtfReader;
		hHrtfBinary.hrtfFileName = arg.hrtfFileName;
		hHrtfBinary.binaural_renderer = IVAS_BIN_RENDERER_TYPE_NONE;
		hHrtfBinary.binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_NONE;
		hHrtfBinary.hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;
		#else
		if ( ( error = IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef FIX_989_TD_REND_ROM
		if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_td_hrtf( hHrtfTD );
		}
		}

		if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		}

		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		if ( ( error = IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfFastConvHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_fastconv_hrtf( hHrtfFastConv );
		}
		}

		IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
		if ( ( error = IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfParamBinHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_parambin_hrtf( hHrtfParambin );
		}
		}
		if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		if ( ( error = load_reverb_binary( *hHrtfStatistics, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_hrtf_statistics( hHrtfStatistics );
		}
		}
		#endif
		}

		/------------------------------------------------------------------------------------------
		@@ -723,13 +608,11 @@ int main(
		}

		pcmBuf = malloc( pcmBufSize * sizeof( int16_t ) );
		#ifdef FIX_CREND_SIMPLIFY_CODE
		if ( pcmBuf == NULL )
		{
		fprintf( stdout, "Error: Unable to allocate memory for output buffer.\n" );
		goto cleanup;
		}
		#endif

		/-----------------------------------------------------------------
		* Decoding
		@@ -737,19 +620,11 @@ int main(

		if ( arg.voipMode )
		{
		#ifdef FIX_CREND_SIMPLIFY_CODE
		error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, hIvasDec );
		#else
		error = decodeVoIP( arg, hBsReader, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, hIvasDec );
		#endif
		}
		else
		{
		#ifdef FIX_CREND_SIMPLIFY_CODE
		error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, &splitRendBits, hIvasDec, pcmBuf );
		#else
		error = decodeG192( arg, hBsReader, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, &splitRendBits, hIvasDec, pcmBuf );
		#endif
		}

		if ( error == IVAS_ERR_OK \|\| error == IVAS_ERR_END_OF_FILE )
		@@ -765,11 +640,7 @@ int main(
		}
		else
		{
		#ifdef FIX_CREND_SIMPLIFY_CODE
		fprintf( stderr, "\nDecoding finished prematurely: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		#else
		fprintf( stdout, "Decoding finished prematurely\n\n" );
		#endif
		goto cleanup;
		}

		@@ -792,38 +663,17 @@ cleanup:

		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_CREND_SIMPLIFY_CODE
		destroy_td_hrtf( hHrtfBinary.hHrtfTD );
		destroy_hrtf_statistics( hHrtfBinary.hHrtfStatistics );
		#else
		IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );
		if ( hHrtfTD != NULL )
		{
		destroy_td_hrtf( hHrtfTD );
		}
		IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );
		if ( hSetOfHRTF != NULL )
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics );
		destroy_hrtf_statistics( hHrtfStatistics );
		#endif
		}
		#ifdef FIX_1990_SANITIZER_IN_REVERB_LOAD
		// TODO:
		/* This free differs from float version.
		This is needed as HRTF statistics from ROM are currently converted from Word16 values to scaled Word32 values. */
		#ifdef FIX_CREND_SIMPLIFY_CODE
		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;
		IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics );
		destroy_hrtf_statistics( hHrtfStatistics );
		#else
		IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics );
		destroy_hrtf_statistics( hHrtfStatistics );
		#endif
		#endif

		IVAS_DEC_Close( &hIvasDec );
		CustomLsReader_close( &hLsCustomReader );
		hrtfFileReader_close( &hrtfReader );
		@@ -1959,9 +1809,7 @@ static ivas_error initOnFirstGoodFrame(
		static ivas_error decodeG192(
		DecArguments arg,
		BS_READER_HANDLE hBsReader,
		#ifdef FIX_CREND_SIMPLIFY_CODE
		IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary,
		#endif
		RotFileReader *headRotReader,
		RotFileReader *externalOrientationFileReader,
		RotFileReader *refRotReader,
		@@ -2243,7 +2091,6 @@ static ivas_error decodeG192(
		goto cleanup;
		}

		#ifdef FIX_CREND_SIMPLIFY_CODE
		/* 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;
		@@ -2264,6 +2111,20 @@ static ivas_error decodeG192(
		goto cleanup;
		}
		}

		/* decode transport channels, do TSM and feed to renderer */
		if ( ( error = IVAS_DEC_GetSamplesDecoder( hIvasDec, isSplitRend, splitRendBits ) ) != IVAS_ERR_OK )
		{
		return error;
		}

		#ifdef OBJ_EDITING_API
		/* Do the final preparations needed for rendering */
		if ( ( error = IVAS_DEC_PrepareRenderer( hIvasDec ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: could not prepare the renderer: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#endif
		}

		@@ -2660,9 +2521,7 @@ static ivas_error writeJbmTraceFileFrameWrapper( const void data, void writer
		static ivas_error decodeVoIP(
		DecArguments arg,
		BS_READER_HANDLE hBsReader,
		#ifdef FIX_CREND_SIMPLIFY_CODE
		IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf,
		#endif
		RotFileReader *headRotReader,
		RotFileReader *externalOrientationFileReader,
		RotFileReader *refRotReader,
		@@ -2712,10 +2571,11 @@ static ivas_error decodeVoIP(
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 } };
		int16_t vec_pos_update, vec_pos_len;
		int16_t nOutSamples = 0;
		#ifdef FIX_CREND_SIMPLIFY_CODE
		bool bitstreamReadDone = false;
		uint16_t nSamplesRendered;
		#ifdef OBJ_EDITING_API
		bool parametersAvailableForEditing = false;
		#endif
		uint16_t nSamplesRendered;

		vec_pos_update = 0;
		if ( ( error = IVAS_DEC_GetRenderFramesizeMs( hIvasDec, &systemTimeInc_ms ) ) != IVAS_ERR_OK )
		@@ -2833,9 +2693,7 @@ static ivas_error decodeVoIP(

		while ( 1 )
		{
		#ifdef FIX_CREND_SIMPLIFY_CODE
		nSamplesRendered = 0;
		#endif

		/* reference vector */
		if ( arg.enableReferenceVectorTracking && vec_pos_update == 0 )
		@@ -2999,21 +2857,19 @@ static ivas_error decodeVoIP(


		/* decode and get samples */
		#ifdef FIX_HRTF_LOAD
		while ( nSamplesRendered < nOutSamples )
		{
		#endif
		#ifdef SUPPORT_JBM_TRACEFILE
		#ifdef FIX_CREND_SIMPLIFY_CODE
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered ) ) != IVAS_ERR_OK )
		#ifdef OBJ_EDITING_API
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef FIX_CREND_SIMPLIFY_CODE
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, &bitstreamReadDone ) ) != IVAS_ERR_OK )
		#ifdef OBJ_EDITING_API
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, &bitstreamReadDone, &parametersAvailableForEditing ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, &bitstreamReadDone ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		@@ -3021,7 +2877,6 @@ static ivas_error decodeVoIP(
		goto cleanup;
		}

		#ifdef FIX_CREND_SIMPLIFY_CODE
		if ( bitstreamReadDone == true )
		{
		/* Read main parameters from the bitstream to set-up the decoder */
		@@ -3045,10 +2900,14 @@ static ivas_error decodeVoIP(
		}
		}
		}
		#endif
		#ifdef FIX_HRTF_LOAD

		#ifdef OBJ_EDITING_API
		if ( parametersAvailableForEditing == true )
		{
		/* do the object editing here */
		}
		#endif
		} /* while ( nSamplesRendered < nOutSamples ) */

		/* write JBM Offset file entry */
		if ( jbmOffsetWriter != NULL )
		@@ -3334,7 +3193,6 @@ cleanup:
		}


		#ifdef FIX_CREND_SIMPLIFY_CODE
		/---------------------------------------------------------------------
		* load_hrtf_from_file()
		*
		@@ -3507,5 +3365,5 @@ static ivas_error load_hrtf_from_file(

		return IVAS_ERR_OK;
		}
		#endif

		#undef WMC_TOOL_SKIP

apps/isar_post_rend.c

+21 −0

Original line number	Diff line number	Diff line
		@@ -992,6 +992,9 @@ int main(

		while ( 1 )
		{
		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		int16_t bfi = 0;
		#endif
		int16_t num_in_channels;
		num_in_channels = inBuffer.config.numChannels;

		@@ -1000,7 +1003,11 @@ int main(
		{
		ivas_error error_tmp;
		numSamplesRead = (int16_t) inBufferSize;
		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		error_tmp = split_rend_read_bits_from_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead, &bitsBuffer.config.bitsWritten, &bfi );
		#else
		error_tmp = split_rend_read_bits_from_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead, &bitsBuffer.config.bitsWritten );
		#endif
		if ( error_tmp != IVAS_ERR_OK )
		{
		if ( error_tmp == IVAS_ERR_END_OF_FILE )
		@@ -1067,19 +1074,33 @@ int main(
		/* Read from split renderer bfi file if specified */
		if ( splitRendBFIReader != NULL && splitBinNeedsNewFrame )
		{
		#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST
		int16_t bfi;
		#endif
		if ( ( error = SplitRendBFIFileReading( splitRendBFIReader, &bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in SplitRendBFIFileReading(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		#endif
		}

		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( splitBinNeedsNewFrame )
		{
		if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		#endif

		for ( i = 0; i < args.inConfig.numBinBuses; ++i )
		{

apps/renderer.c

+8 −51

Original line number	Diff line number	Diff line
		@@ -715,11 +715,7 @@ 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;
		@@ -770,11 +766,7 @@ 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_TD_HANDLE *hHrtfTD = NULL;
		@@ -1025,11 +1017,7 @@ 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 )
		{
		@@ -1042,7 +1030,6 @@ 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 ) );
		@@ -1056,15 +1043,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 = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed: %s\n\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

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

		@@ -1087,11 +1061,7 @@ 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 )
		{
		@@ -1342,7 +1312,15 @@ int main(
		masaIds[i] = 0u;
		}
		#ifdef NONBE_1377_REND_DIRATT_CONF
		#ifdef FIX_1377_HANDLE_ERROR_CODE
		if ( ( error = IVAS_REND_SetObjectIDs( hIvasRend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_SetObjectIDs: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		#else
		IVAS_REND_SetObjectIDs( hIvasRend );
		#endif
		#endif

		for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )
		@@ -2195,18 +2173,7 @@ cleanup:
		RotationFileReader_close( &externalOrientationFileReader );
		RotationFileReader_close( &referenceRotReader );
		Vector3PairFileReader_close( &referenceVectorReader );
		#ifdef FIX_CREND_SIMPLIFY_CODE
		destroy_td_hrtf( hHrtfTD );
		#else
		if ( hSetOfHRTF != NULL && *hSetOfHRTF != NULL )
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		if ( hHrtfTD != NULL && *hHrtfTD != NULL )
		{
		destroy_td_hrtf( hHrtfTD );
		}
		#endif
		destroy_hrtf_statistics( hHrtfStatistics );
		IVAS_REND_Close( &hIvasRend );
		IsmPositionProvider_close( positionProvider );
		@@ -2797,9 +2764,7 @@ 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 );
		@@ -2816,16 +2781,12 @@ 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;
		}

		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] );
		}
		@@ -2862,11 +2823,7 @@ static CmdlnArgs defaultArgs(
		clearString( args.inLfePanningMatrixFile );
		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

+12 −25

Original line number	Diff line number	Diff line
		@@ -137,9 +137,21 @@ typedef struct _IVAS_ISM_METADATA
		float yaw;
		float pitch;
		Word16 non_diegetic_flag;
		#ifdef OBJ_EDITING_API
		Word32 gain_fx;
		#endif

		} IVAS_ISM_METADATA;

		#ifdef OBJ_EDITING_API
		typedef struct _IVAS_EDITABLE_PARAMETERS
		{
		Word16 num_obj;
		IVAS_ISM_METADATA ism_metadata[IVAS_MAX_NUM_OBJECTS];
		Word32 gain_bed_fx;
		} IVAS_EDITABLE_PARAMETERS;
		#endif

		typedef struct
		{
		// float w, x, y, z;
		@@ -178,19 +190,11 @@ typedef enum
		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;

		#ifdef FIX_CREND_SIMPLIFY_CODE
		typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_TD_HANDLE;
		typedef struct ivas_hrtf_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
		typedef struct ivas_hrtf_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;
		typedef struct ivas_hrtf_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;
		typedef struct ivas_hrtf_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;
		#else
		typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_TD_HANDLE;
		typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
		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;
		#endif
		typedef struct cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;

		typedef struct ivas_LS_setup_custom *IVAS_LSSETUP_CUSTOM_HANDLE;
		@@ -224,7 +228,6 @@ typedef struct _IVAS_JBM_TRACE_DATA

		} IVAS_JBM_TRACE_DATA;

		#ifdef FIX_CREND_SIMPLIFY_CODE
		typedef enum _ivas_binaural_renderer_type
		{
		IVAS_BIN_RENDERER_TYPE_NONE,
		@@ -235,7 +238,6 @@ typedef enum _ivas_binaural_renderer_type
		IVAS_BIN_RENDERER_TYPE_DEFAULT,

		} IVAS_BIN_RENDERER_TYPE;
		#endif

		/----------------------------------------------------------------------------------
		* Split rendering API constants, structures, and enums
		@@ -274,17 +276,6 @@ typedef enum

		} ISAR_SPLIT_REND_CODEC;

		#ifndef FIX_HRTF_LOAD
		typedef enum
		{
		ISAR_SPLIT_REND_RENDERER_SELECTION_CREND,
		ISAR_SPLIT_REND_RENDERER_SELECTION_FASTCONV,
		ISAR_SPLIT_REND_RENDERER_SELECTION_PARAMBIN,
		ISAR_SPLIT_REND_RENDERER_SELECTION_TDREND,
		ISAR_SPLIT_REND_RENDERER_SELECTION_DEFAULT,

		} ISAR_SPLIT_REND_RENDERER_SELECTION;
		#endif
		typedef struct _ISAR_SPLIT_REND_BITS_DATA
		{
		uint8_t *bits_buf;
		@@ -315,11 +306,7 @@ typedef struct _ISAR_SPLIT_REND_CONFIG
		int16_t codec_frame_size_ms; /* Codec frame size in milliseconds, only relevant with LC3plus */
		ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode;
		ISAR_SPLIT_REND_CODEC codec;
		#ifdef FIX_HRTF_LOAD
		IVAS_BIN_RENDERER_TYPE rendererSelection;
		#else
		ISAR_SPLIT_REND_RENDERER_SELECTION rendererSelection;
		#endif
		int16_t lc3plus_highres;

		} ISAR_SPLIT_REND_CONFIG_DATA, *ISAR_SPLIT_REND_CONFIG_HANDLE;