fixed formatting - compiler switch (87603b32) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/ivas_init_dec_fx.c

+63 −19

Original line number	Diff line number	Diff line
		@@ -1156,8 +1156,7 @@ ivas_error ivas_init_decoder_front(

		IF( st_ivas->hDecoderConfig->Opt_HRTF_binary )
		{
		IF( NE_32( ( error = ivas_HRTF_binary_open_fx( &( st_ivas->hHrtfTD ) ) ), IVAS_ERR_OK ) )
		{
		IF( NE_32( ( error = ivas_HRTF_binary_open_fx( &( st_ivas->hHrtfTD ) ) ), IVAS_ERR_OK ) ){
		return error;
		}

		@@ -1175,6 +1174,13 @@ ivas_error ivas_init_decoder_front(
		{
		return error;
		}

		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IF( NE_32( ( error = ivas_HRTF_statistics_binary_open( &st_ivas->hHrtfStatistics ) ), IVAS_ERR_OK ) )
		{
		return error;
		}
		#endif
		}

		/-------------------------------------------------------------------
		@@ -1362,6 +1368,21 @@ ivas_error ivas_init_decoder_fx(
		}
		}


		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		/--------------------------------------------------------------------
		* Allocate and initialize HRTF Statistics handle
		--------------------------------------------------------------------/

		IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		IF( NE_32( ( error = ivas_HRTF_statistics_init( &st_ivas->hHrtfStatistics, output_Fs ) ), IVAS_ERR_OK ) )
		{
		return error;
		}
		}
		#endif

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		/-----------------------------------------------------------------
		* Initialize binuaral split rendering
		@@ -2273,7 +2294,11 @@ ivas_error ivas_init_decoder_fx(
		IF( EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		#endif
		{
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		if ( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac_fx, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
		#endif
		{
		return error;
		}
		@@ -2317,13 +2342,24 @@ ivas_error ivas_init_decoder_fx(
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,
		st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ),
		IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,
		st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs, ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ),
		IVAS_ERR_OK ) )
		#endif
		#else
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		if( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,
		st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,
		st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ),
		IVAS_ERR_OK ) )
		#endif
		#endif
		{
		return error;
		@@ -2861,6 +2897,9 @@ void ivas_initialize_handles_dec(
		st_ivas->hSetOfHRTF = NULL;
		st_ivas->hHrtfFastConv = NULL;
		st_ivas->hHrtfParambin = NULL;
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		st_ivas->hHrtfStatistics = NULL;
		#endif
		st_ivas->hoa_dec_mtx = NULL;
		st_ivas->hMasaIsmData = NULL;
		st_ivas->hSbaIsmData = NULL;
		@@ -3095,6 +3134,11 @@ void ivas_destroy_dec_fx(
		/* Parametric binauralizer HRTF filters */
		ivas_HRTF_parambin_binary_close_fx( &st_ivas->hHrtfParambin );

		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		/* HRTF statistics */
		ivas_HRTF_statistics_close( &st_ivas->hHrtfStatistics );
		#endif

		/* Config. Renderer */
		ivas_render_config_close( &( st_ivas->hRenderConfig ) );

lib_rend/ivas_prot_rend_fx.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -957,8 +957,8 @@ ivas_error ivas_binaural_reverb_open_fastconv_fx(
		#endif
		const Word32 sampling_rate, /* i : sampling rate */
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		const float defaultTimes, / i : default reverberation times */
		const float defaultEne / i : default reverberation energies */
		const Word32 defaultTimes, / i : default reverberation times */
		const Word32 defaultEne / i : default reverberation energies */
		#else
		const HRTFS_FASTCONV_HANDLE hHrtfFastConv /* i : FastConv HRTF handle */
		#endif

lib_rend/ivas_rom_binaural_crend_head_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -59838,7 +59838,7 @@ const Word32 defaultHRIR_right_avg_power_32kHz_fx[LR_IAC_LENGTH_NR_FC] /Q-23/
		2790378,2355663,2029237,1865240,1832432
		};

		#ifndef NONBE_FIX_AVG_IAC_CLDFB_REVERB
		#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB

		const Word32 defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC] /Q-27/ = {
		130123416,130123416,128225040,123478832,118732624,113118568,104033232,94947768,85862304,