merge and fix conflicts (7245d585) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci-custom.yml

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		include:
		- project: $CUSTOM_CI_PROJECT
		ref: $CUSTOM_CI_REF
		file: $CUSTOM_CI_FILE
		No newline at end of file

lib_com/arith_coder_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -260,7 +260,7 @@ void tcx_arith_scale_envelope(
		b_e = add(b_e, mean_e);

		/* scale = (-b + (float)sqrt(bb - 4.0fa0.035f)) / (2.0f a); */
		tmp = round_fx(BASOP_Util_Add_Mant32Exp(L_mult(b, b), shl(b_e, 1), Mpy_32_16_1(a, -4588/-4.0f0.035f Q15*/), a_e, &tmp2));
		tmp = round_fx_o(BASOP_Util_Add_Mant32Exp(L_mult(b, b), shl(b_e, 1), Mpy_32_16_1(a, -4588/-4.0f0.035f Q15*/), a_e, &tmp2), &Overflow);

		IF( tmp <= 0 )
		{

lib_com/cnst.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -566,7 +566,7 @@ enum

		#define FRAMES_PER_SEC 50
		#ifdef IVAS_FLOAT_FIXED
		#define MAX_PARAM__SPATIAL_SUB_FRAMES_PER_SEC 200 //(FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES)
		#define MAX_PARAM_SPATIAL_SUB_FRAMES_PER_SEC 200 //(FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES)
		#define ONE_BY_FRAMES_PER_SEC ((Word32)(0x028F5C29))
		#define FRAMES_PER_SEC_BY_2 (FRAMES_PER_SEC >> 1)
		#endif

lib_com/fd_cng_com.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,8 @@ ivas_error createFdCngCom_flt(

		void initFdCngCom_flt(
		HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
		const float scale )
		const float scale
		)
		{
		#ifndef IVAS_FLOAT_FIXED
		/* Calculate FFT scaling factor */
		@@ -102,6 +103,7 @@ void initFdCngCom_flt(
		/* Initialize the comfort noise generation */
		set_f( hFdCngCom->fftBuffer_flt, 0.0f, FFTLEN );
		#endif
		UNUSED_PARAM(scale);
		set_f( hFdCngCom->cngNoiseLevel_flt, 0.0f, FFTCLDFBLEN );
		set_f( hFdCngCom->olapBufferSynth2_flt, 0.0f, FFTLEN );

lib_com/float_to_fix_ops.c

+29 −10

Original line number	Diff line number	Diff line
		@@ -683,7 +683,7 @@ void stereo_tcx_dec_mode_switch_reconf_To_fixed_2(
		st->hTcxDec->conNoiseLevelIndex = st->hTcxDec->NoiseLevelIndex_bfi;
		st->hTcxDec->conCurrLevelIndex = st->hTcxDec->CurrLevelIndex_bfi;
		st->hTcxDec->conLastFrameLevel = st->hTcxDec->LastFrameLevel_bfi_fx;
		st->hTcxDec->conLastFrameLevel_e = 0;
		//st->hTcxDec->conLastFrameLevel_e = 0;
		}

		IF( st->hHQ_core )
		@@ -756,10 +756,10 @@ void stereo_tcx_dec_mode_switch_reconf_To_fixed_2(
		st->prev_Q_syn = st->Q_syn;
		//st->hTcxDec->conceal_eof_gain = (Word16) floatToFixed( st->hTcxDec->conceal_eof_gain_float, Q14 );
		//st->hTcxDec->conCngLevelBackgroundTrace = (Word16) floatToFixed( st->hTcxDec->CngLevelBackgroundTrace_bfi, Q15 - st->hTcxDec->conCngLevelBackgroundTrace_e );
		if ( st->hTcxDec->conNoiseLevelMemory_e[0] < 0 )
		{
		set16_fx( st->hTcxDec->conNoiseLevelMemory_e, 0, PLC_MIN_STAT_BUFF_SIZE );
		}
		//if ( st->hTcxDec->conNoiseLevelMemory_e[0] < 0 )
		//{
		// set16_fx( st->hTcxDec->conNoiseLevelMemory_e, 0, PLC_MIN_STAT_BUFF_SIZE );
		//}
		st->hTcxDec->conNoiseLevelIndex = st->hTcxDec->NoiseLevelIndex_bfi;
		st->hTcxDec->conCurrLevelIndex = st->hTcxDec->CurrLevelIndex_bfi;
		if ( hTcxLtpDec->tcxltp )
		@@ -844,11 +844,21 @@ void fixed_to_float_stereo_tcx_core_dec(
		//st->hTcxDec->syn_Overl_TDACFB_float[p] = (float) st->hTcxDec->syn_Overl_TDACFB[p] * 2 * (float) pow( 2, st->Q_syn );
		//st->hTcxDec->syn_Overl_TDAC_float[p] = (float) st->hTcxDec->syn_Overl_TDAC[p] * 2 * (float) pow( 2, st->Q_syn );
		}
		if (st->hHQ_core->Q_old_wtda >= 0)
		{
		for ( int p = 0; p < st->L_frame; p++ )
		{
		st->hHQ_core->old_outLB[p] = (float) st->hHQ_core->old_out_LB_fx[p] / ( 1u << st->hHQ_core->Q_old_wtda );
		st->hHQ_core->old_out[p] = (float) st->hHQ_core->old_out_fx[p] / ( 1u << st->hHQ_core->Q_old_wtda );
		}
		}
		else{
		for ( int p = 0; p < st->L_frame; p++ )
		{
		st->hHQ_core->old_outLB[p] = (float) st->hHQ_core->old_out_LB_fx[p] * ( 1u << (-st->hHQ_core->Q_old_wtda) );
		st->hHQ_core->old_out[p] = (float) st->hHQ_core->old_out_fx[p] * ( 1u << (-st->hHQ_core->Q_old_wtda) );
		}
		}
		//for ( int p = 0; p < st->L_frame; p++ )
		//{
		// st->hTcxDec->old_excFB[p] = (float) ( st->hTcxDec->old_excFB_fx[p] ) / ( 1u << st->Q_exc );
		@@ -903,10 +913,19 @@ void fixed_to_float_stereo_tcx_core_dec(
		//{
		// st->hFdCngDec->hFdCngCom->fftBuffer_flt[p] = ( (float) st->hFdCngDec->hFdCngCom->fftBuffer[p] / ( 1u << ( 31 - st->hFdCngDec->hFdCngCom->fftBuffer_exp ) ) );
		//}
		if(( 31 - st->hFdCngDec->hFdCngCom->cngNoiseLevelExp ) >= 0)
		{
		for ( int p = 0; p < ( st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand ); p++ )
		{
		st->hFdCngDec->hFdCngCom->cngNoiseLevel_flt[p] = ( (float) st->hFdCngDec->hFdCngCom->cngNoiseLevel[p] / ( 1u << ( 31 - st->hFdCngDec->hFdCngCom->cngNoiseLevelExp ) ) );
		}
		}
		else{
		for ( int p = 0; p < ( st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand ); p++ )
		{
		st->hFdCngDec->hFdCngCom->cngNoiseLevel_flt[p] = ( (float) st->hFdCngDec->hFdCngCom->cngNoiseLevel[p] * ( 1u << ( st->hFdCngDec->hFdCngCom->cngNoiseLevelExp - 31) ) );
		}
		}
		for ( int p = 0; p < ( st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand ); p++ )
		{
		//st->hFdCngDec->bandNoiseShape_float[p] = ( (float) st->hFdCngDec->bandNoiseShape[p] / ( 1u << ( 31 - st->hFdCngDec->bandNoiseShape_exp ) ) );