Merge branch 'float-pc' into 1716_ref_portMR1400 (088cdca4) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+39 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,9 @@ int main(
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;
		#endif
		#ifdef DEBUGGING
		int32_t noClipping;
		int32_t cnt_frames_limited;
		@@ -769,6 +772,7 @@ int main(
		}
		}

		#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		@@ -779,6 +783,8 @@ int main(
		}
		}
		#endif
		#endif

		if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -861,6 +867,35 @@ int main(
		destroy_parambin_hrtf( hHrtfParambin );
		}
		}


		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		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 );
		}
		}
		#else
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		#endif
		#endif
		}

		/------------------------------------------------------------------------------------------
		@@ -947,6 +982,10 @@ cleanup:
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics );
		destroy_hrtf_statistics( hHrtfStatistics );
		#endif
		}

		IVAS_DEC_Close( &hIvasDec );

apps/renderer.c

+30 −0

Original line number	Diff line number	Diff line
		@@ -676,6 +676,9 @@ int main(
		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
		IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;
		#endif
		IsmPositionProvider *positionProvider;
		LfeRoutingConfig *lfeRoutingConfigs[RENDERER_MAX_MC_INPUTS];
		RenderConfigReader *renderConfigReader = NULL;
		@@ -961,6 +964,7 @@ int main(
		}
		}

		#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		@@ -970,6 +974,7 @@ int main(
		goto cleanup;
		}
		}
		#endif
		#endif

		if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		@@ -1051,6 +1056,28 @@ int main(
		destroy_parambin_hrtf( hHrtfParambin );
		}
		}

		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( error = IVAS_REND_GetHrtfStatisticsHandle( hIvasRend, &hHrtfStatistics ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_GetHrtfStatisticsHandle failed\n\n" );
		goto cleanup;
		}
		if ( ( error = load_reverb_binary( *hHrtfStatistics, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		goto cleanup;
		}
		else
		{
		destroy_hrtf_statistics( hHrtfStatistics );
		}
		}
		#endif
		#endif
		}

		hrtfFileReader_close( &hrtfFileReader );
		@@ -2139,6 +2166,9 @@ cleanup:
		{
		destroy_td_hrtf( hHrtfTD );
		}
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		destroy_hrtf_statistics( hHrtfStatistics );
		#endif
		IVAS_REND_Close( &hIvasRend );
		IsmPositionProvider_close( positionProvider );
		RenderConfigReader_close( &renderConfigReader );

lib_com/common_api_types.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,9 @@ 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 NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		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;

lib_com/ivas_prot.h

+0 −14

Original line number	Diff line number	Diff line
		@@ -5207,20 +5207,6 @@ ivas_error ivas_allocate_binaural_hrtf(
		const int16_t allocate_init_flag /* i : Memory allocation flag */
		);

		#ifdef DEBUGGING
		void ivas_binaural_cldfb(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);

		void ivas_binaural_cldfb_sf(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int16_t n_samples_to_render, /* i : output frame length per channel */
		const int16_t slot_size, /* i : JBM slot size */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);
		#endif

		void ivas_binRenderer(
		BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: binaural renderer handle */
		#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_com/options.h

+13 −1

Original line number	Diff line number	Diff line
		@@ -182,9 +182,20 @@
		#define ISAR_BITSTREAM_UPDATE_LC3PLUS /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */
		#endif
		#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
		#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
		#define NONBE_FIX_AVG_IAC_CLDFB_REVERB
		#endif


		//#define USE_NEW_HRTF_BINARY_FILE_FORMAT /* Orange: to activate when decided to change the hrtf binary file format */
		#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
		#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers */
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange: Missing left/right and coherence late reverb tables in binary format */
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		#define NONBE_FIX_AVG_IAC_CLDFB_REVERB
		#endif
		#endif
		#define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange: Missing left/right and coherence late reverb tables in binary format*/
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		#define NONBE_FIX_AVG_IAC_CLDFB_REVERB
		@@ -196,7 +207,7 @@
		#endif



		//#define FIX_777_COMBI_RENDER_CONFIG_FILE /* Philips: Fix for combined renderer config file support */
		#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */
		#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */

		@@ -209,6 +220,7 @@
		#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig */
		#define FIX_1001_ARI_HM_OVERFLOW /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */
		#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */
		#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */
		#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF /* Nokia: issue #991: fix using of binary file HRTF in ParamBin */

		/* #################### End BASOP porting switches ############################ */