apply missing switch (5f41d794) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -159,7 +159,7 @@ int main(
		RenderConfigReader *renderConfigReader = NULL;
		int16_t *pcmBuf = NULL;
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		@@ -506,7 +506,7 @@ int main(

		if ( arg.hrtfReaderEnabled )
		{
		#ifndef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifndef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;
		#endif

		@@ -515,7 +515,7 @@ int main(
		fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -537,7 +537,7 @@ int main(

		#endif

		#ifndef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifndef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;
		#endif

		@@ -547,7 +547,7 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -575,7 +575,7 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -604,7 +604,7 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -631,7 +631,7 @@ int main(
		}
		#endif

		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		if ( ( error = load_reverb_binary( *hHrtfStatistics, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -706,7 +706,7 @@ cleanup:

		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );
		destroy_td_hrtf( hHrtfTD );

apps/renderer.c

+20 −21

Original line number	Diff line number	Diff line
		@@ -626,7 +626,7 @@ int main(
		RotFileReader *referenceRotReader = NULL;
		Vector3PairFileReader *referenceVectorReader = NULL;
		hrtfFileReader *hrtfFileReader = NULL;
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
		@@ -740,7 +740,7 @@ int main(
		}
		}

		#ifndef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifndef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		if ( !isEmptyString( args.customHrtfFilePath ) )
		{
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		@@ -835,7 +835,7 @@ int main(
		}
		const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );

		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		@@ -844,7 +844,7 @@ int main(
		fprintf( stderr, "Error opening renderer handle: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		if ( !isEmptyString( args.customHrtfFilePath ) )
		{
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		@@ -1444,7 +1444,6 @@ int main(
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}

		}

		for ( i = 0; i < args.inConfig.numAudioObjects; ++i )
		@@ -1744,7 +1743,7 @@ int main(
		free( outInt32Buffer );
		free( inInt32Buffer );
		#endif
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		cleanup:
		#endif
		for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )
		@@ -1764,7 +1763,7 @@ cleanup:
		RotationFileReader_close( &externalOrientationFileReader );
		RotationFileReader_close( &referenceRotReader );
		Vector3PairFileReader_close( &referenceVectorReader );
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		destroy_td_hrtf( hHrtfTD );
		destroy_SetOfHRTF( hSetOfHRTF );
		destroy_hrtf_statistics( hHrtfStatistics );

lib_com/common_api_types.h

+4 −5

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_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;
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		typedef struct ivas_hrtfs_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;
		#endif
		typedef struct cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;
		@@ -210,7 +210,6 @@ typedef struct _IVAS_JBM_TRACE_DATA
		} IVAS_JBM_TRACE_DATA;



		/----------------------------------------------------------------------------------
		* Renderer API structures and enums
		----------------------------------------------------------------------------------/

lib_com/ivas_cnst.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -1656,11 +1656,11 @@ typedef enum
		#define RV_FILTER_MAX_FFT_SIZE ( 512 )
		#define RV_FILTER_MAX_HISTORY ( 512 - 160 ) /* for longest history */
		#define RV_LENGTH_NR_FC ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		#define RV_LENGTH_NR_FC_16KHZ ( RV_FILTER_MAX_FFT_SIZE / 4 ) + 1
		#endif
		#define IVAS_REVERB_DEFAULT_N_BANDS 31
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		#define LR_IAC_LENGTH_NR_FC ( RV_LENGTH_NR_FC )
		#define LR_IAC_LENGTH_NR_FC_16KHZ ( RV_LENGTH_NR_FC_16KHZ )
		#endif

lib_com/ivas_error.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ typedef enum
		IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,
		IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,
		IVAS_ERR_INVALID_HRTF,
		#ifdef FIX_FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT
		IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,
		#endif
		IVAS_ERR_INVALID_INPUT_FORMAT,