version building when define link to new hrtf binary file format are disabled (4afef491) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ typedef struct

		} DecArguments;

		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		typedef struct
		{
		hrtfFileReader *hrtfReader;
		@@ -150,7 +150,7 @@ typedef struct
		static bool parseCmdlIVAS_dec( int16_t argc, char *argv, DecArguments arg );
		static void usage_dec( void );

		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, 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 );
		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 );
		@@ -185,7 +185,7 @@ int main(
		RenderConfigReader *renderConfigReader = NULL;
		int16_t *pcmBuf = NULL;
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;
		#endif

		@@ -194,7 +194,7 @@ int main(
		reset_mem( USE_BYTES );
		#endif

		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		hHrtfBinary.hHrtfTD = NULL; /* just to avoid compilation warning */
		hHrtfBinary.hHrtfStatistics = NULL; /* just to avoid compilation warning */
		#endif
		@@ -374,7 +374,7 @@ int main(
		* Initialize HRTF binary file data
		------------------------------------------------------------------------------------------/

		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		if ( arg.hrtfReaderEnabled )
		{
		hHrtfBinary.hrtfReader = hrtfReader;
		@@ -539,7 +539,7 @@ int main(
		}
		}

		#ifndef FIX_POINT_HRTF_FILE_FORMAT
		#ifndef FIX_POINT_HRTF_FILE_OPTIM
		/------------------------------------------------------------------------------------------
		* Load HRTF binary file data
		------------------------------------------------------------------------------------------/
		@@ -616,7 +616,7 @@ int main(
		/-----------------------------------------------------------------
		* Decoding
		-----------------------------------------------------------------/
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		if ( arg.voipMode )
		{
		error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, hIvasDec );
		@@ -666,7 +666,7 @@ cleanup:

		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		if ( arg.hrtfReaderEnabled )
		{
		destroy_td_hrtf( hHrtfBinary.hHrtfTD );
		@@ -678,7 +678,7 @@ cleanup:
		dealloc_HRTF_binary( hHrtfTD );
		IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;
		IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );
		destroy_SetOfHRTF( &hSetOfHRTF );
		destroy_SetOfHRTF( hSetOfHRTF );
		#endif
		}

		@@ -1551,7 +1551,7 @@ static ivas_error initOnFirstGoodFrame(
		static ivas_error decodeG192(
		DecArguments arg,
		BS_READER_HANDLE hBsReader,
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary,
		#endif
		RotFileReader *headRotReader,
		@@ -1752,7 +1752,7 @@ static ivas_error decodeG192(
		}
		}

		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		/* 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;
		@@ -2120,7 +2120,7 @@ static ivas_error writeJbmTraceFileFrameWrapper( const void data, void writer
		static ivas_error decodeVoIP(
		DecArguments arg,
		BS_READER_HANDLE hBsReader,
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf,
		#endif
		RotFileReader *headRotReader,
		@@ -2640,7 +2640,7 @@ cleanup:
		}


		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		/---------------------------------------------------------------------
		* load_hrtf_from_file()
		*

lib_com/common_api_types.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -173,7 +173,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_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		typedef struct ivas_hrtf_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
		#else
		typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
		@@ -216,7 +216,7 @@ typedef struct _IVAS_JBM_TRACE_DATA

		} IVAS_JBM_TRACE_DATA;

		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		typedef enum _ivas_binaural_renderer_type
		{
		IVAS_BIN_RENDERER_TYPE_NONE,

lib_com/ivas_cnst.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1639,7 +1639,7 @@ typedef enum

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

		#ifndef FIX_POINT_HRTF_FILE_FORMAT
		#ifndef FIX_POINT_HRTF_FILE_OPTIM
		typedef enum
		{
		BINAURAL_INPUT_AUDIO_CONFIG_INVALID,

lib_com/ivas_prot.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -337,7 +337,7 @@ ivas_error ivas_dec(
		int16_t data / o : output synthesis signal */
		);

		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		ivas_error ivas_dec_get_format(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

lib_com/ivas_prot_fx.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3640,7 +3640,7 @@ void ivas_init_binaural_hrtf_fx(

		ivas_error ivas_allocate_binaural_hrtf_fx(
		HRTFS_FASTCONV HrtfFastConv, / i/o: FASTCONV HRTF structure */
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_OPTIM
		const Word16 n_channels, /* i : number of input channels */
		#else
		const AUDIO_CONFIG input_config, /* i : input audio configuration */