fix difference in code formating (941b99cd) · Commits · SA4 / Audio / IVAS BASOP

lib_com/count.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ char *BasicOperationList[] = {

		};


		const BASIC_OP op_weight = {
		1, 1, 1, 1, 1,
		1, 1, 1, 1, 1,

lib_com/ivas_cnst.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -1645,6 +1645,7 @@ typedef enum
		#define HRTF_LS_CHANNELS 15
		#define HRTF_NUM_BINS 60
		#define REVERB_PREDELAY_MAX 20 /* Max input delay for reverb module */
		#define GAIN_LFE 1.88364911f /* Gain applied to LFE during renderering */
		#define GAIN_LFE_WORD32 2022552831 /* Gain applied to LFE during renderering */
		#ifdef IVAS_FLOAT_FIXED
		#define GAIN_LFE_FX 30862 /Q.14 Gain applied to LFE during renderering /

lib_dec/ivas_mct_dec.c

+149 −156

Original line number	Diff line number	Diff line
		@@ -2074,11 +2074,9 @@ static ivas_error ivas_mc_dec_reconfig_fx(
		}

		test();
		IF( st_ivas->hBinRendererTd != NULL && ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) ) )
		{
		IF( st_ivas->hBinRendererTd != NULL && ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) ) ){
		#ifdef FIX_1033_MEMORY_LEAK_OMASA
		IF( EQ_16( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM, TRUE ) )
		{
		IF( EQ_16( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM, TRUE ) ){
		#endif
		ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
		st_ivas->hHrtfTD = NULL;
		@@ -2134,18 +2132,13 @@ static ivas_error ivas_mc_dec_reconfig_fx(
		ELSE IF( st_ivas->hCrendWrapper == NULL && ( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV ) \|\| EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) )
		{
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		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 ) )
		{
		return error;
		}
		IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
		#else
		IF( ( 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
		{
		return error;
		}
		#endif
		st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;
		move32();
		}

lib_dec/lib_dec_fx.c

+104 −97

Original line number	Diff line number	Diff line
		@@ -1048,12 +1048,10 @@ ivas_error IVAS_DEC_GetSamples(
		{
		/* check if we need to run the setup function */
		test();
		IF( !hIvasDec->isInitialized \|\| hIvasDec->hasBeenFedFrame )
		{
		IF( !hIvasDec->isInitialized \|\| hIvasDec->hasBeenFedFrame ){
		/* setup */

		IF( NE_32( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) )
		{
		IF( NE_32( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) ){
		return error;
		}
		}
		@@ -2167,6 +2165,7 @@ ivas_error IVAS_DEC_FeedCustomLsData(
		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* IVAS_DEC_GetHrtfHandle( )
		*
		@@ -2928,6 +2927,14 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
		return error;
		}
		}
		ELSE IF( hIvasDec->hasDecodedFirstGoodFrame )
		{
		/* Decoder has been initialized with first good frame - do PLC */
		IF( NE_32( ( error = IVAS_DEC_FeedFrame_Serial( hIvasDec, hIvasDec->hVoIP->bs_conversion_buf, 0, 1 ) ), IVAS_ERR_OK ) )
		{
		return error;
		}
		}

		#ifdef SUPPORT_JBM_TRACEFILE
		/* jbmWriterFn and jbmWriter may be NULL if tracefile writing was not requested on CLI */

lib_rend/ivas_rom_rend.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -436,8 +436,7 @@ const Word32 SincTable_fx[321] /Q31/ = {
		4368840, 3818118, 3267783, 2718370, 2170290, 1624034, 1079948, 538481,
		};
		#endif

		#ifndef FIX_POINT_HRTF_FILE_FORMAT
		#if !defined FIX_POINT_HRTF_FILE_FORMAT \|\| !defined IVAS_FLOAT_FIXED
		const float defaultHRIR_coherence_48kHz[LR_IAC_LENGTH_NR_FC] = {
		0.983003f, 0.933450f, 0.789276f, 0.574420f, 0.340710f, 0.144220f, 0.018803f, 0.000000f, 0.000000f,
		0.000000f, 0.011939f, 0.035489f, 0.043188f, 0.042460f, 0.041788f, 0.038562f, 0.028911f, 0.017162f,