issue: 2446 Clang formatting patch (de956b75) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/er_dec_tcx_fx.c

+104 −87

Original line number	Diff line number	Diff line
		@@ -1052,10 +1052,12 @@ void con_tcx_ivas_fx(
		Q_exc = E_UTIL_f_preemph3_ivas_fx( &( synth[-( ( ( L_frame / 2 ) + hTcxDec->pit_max_TCX ) + 2 * M )] ), st->preemph_fac, add( add( shr( L_frame, 1 ), hTcxDec->pit_max_TCX ), shl( M, 1 ) ), &mem, 1 );

		#else
		IF(NE_16(st->element_mode, EVS_MONO)) {
		IF( NE_16( st->element_mode, EVS_MONO ) )
		{
		Q_exc = E_UTIL_f_preemph3_ivas_fx( &( synth[-( ( ( L_frame / 2 ) + hTcxDec->pit_max_TCX ) + 2 * M )] ), st->preemph_fac, add( add( shr( L_frame, 1 ), hTcxDec->pit_max_TCX ), shl( M, 1 ) ), &mem, 1 );
		}
		ELSE{
		ELSE
		{
		Q_exc = E_UTIL_f_preemph3( &( synth[-( ( ( L_frame / 2 ) + hTcxDec->pit_max_TCX ) + 2 * M )] ), st->preemph_fac, add( add( shr( L_frame, 1 ), hTcxDec->pit_max_TCX ), shl( M, 1 ) ), &mem, 1 );
		}
		#endif // !HARMONIZE_2446_CON_TCX_FX
		@@ -1089,10 +1091,12 @@ void con_tcx_ivas_fx(
		E_LPC_lev_dur_ivas_fx( r_h, r_l, A_local, NULL, M, NULL );

		#else
		IF(NE_16(st->element_mode, EVS_MONO)) {
		IF( NE_16( st->element_mode, EVS_MONO ) )
		{
		E_LPC_lev_dur_ivas_fx( r_h, r_l, A_local, NULL, M, NULL );
		}
		ELSE{
		ELSE
		{
		E_LPC_lev_dur_fx( r_h, r_l, A_local, NULL, M, NULL );
		}
		#endif // !HARMONIZE_2446_CON_TCX_FX
		@@ -1123,11 +1127,13 @@ void con_tcx_ivas_fx(
		scale_sig( &synth[-L_frame], L_frame, negate( st->Q_syn_factor ) ); /Q0, Setting back to Q0, as the following calculations are implemented assuming synth is in Q0 /

		#else
		IF(NE_16(st->element_mode, EVS_MONO)) {
		IF( NE_16( st->element_mode, EVS_MONO ) )
		{
		Q_exc = E_UTIL_f_preemph3_ivas_fx( &( synth[-L_frame] ), st->preemph_fac, L_frame, &mem, 1 );
		scale_sig( &synth[-L_frame], L_frame, negate( st->Q_syn_factor ) ); /Q0, Setting back to Q0, as the following calculations are implemented assuming synth is in Q0 /
		}
		ELSE{
		ELSE
		{
		Q_exc = E_UTIL_f_preemph3( &( synth[-L_frame] ), st->preemph_fac, L_frame, &mem, 1 );
		Scale_sig( &synth[-L_frame], L_frame, negate( st->Q_syn_factor ) ); /Q0, Setting back to Q0, as the following calculations are implemented assuming synth is in Q0 /
		}
		@@ -1621,10 +1627,12 @@ void con_tcx_ivas_fx(
		#ifndef HARMONIZE_2446_CON_TCX_FX
		L_tmp = L_shl( gain32, 1 ); /Q16/
		#else
		IF( NE_16(st->element_mode, EVS_MONO) ) {
		IF( NE_16( st->element_mode, EVS_MONO ) )
		{
		L_tmp = L_shl( gain32, 1 ); /Q16/
		}
		ELSE{
		ELSE
		{
		L_tmp = L_shl_sat( gain32, 1 ); /Q16/
		}
		#endif // !HARMONIZE_2446_CON_TCX_FX
		@@ -1664,7 +1672,8 @@ void con_tcx_ivas_fx(
		#ifndef HARMONIZE_2446_CON_TCX_FX
		tmp_e = sub( add( tmp_e, shl( noise_e, 1 ) ), 1 ); // actual multiplier!
		#else
		IF(NE_16(st->element_mode, EVS_MONO)) {
		IF( NE_16( st->element_mode, EVS_MONO ) )
		{
		tmp_e = sub( add( tmp_e, shl( noise_e, 1 ) ), 1 ); // actual multiplier!
		}
		#endif // !HARMONIZE_2446_CON_TCX_FX
		@@ -1683,7 +1692,8 @@ void con_tcx_ivas_fx(
		move16();
		}
		#else
		IF(NE_16(st->element_mode, EVS_MONO)){
		IF( NE_16( st->element_mode, EVS_MONO ) )
		{
		tmp_e = add( tmp_e, 31 - 6 ); /-->Q31/
		gain_inov = 0;
		move16();
		@@ -1696,7 +1706,8 @@ void con_tcx_ivas_fx(
		move16();
		}
		}
		ELSE{
		ELSE
		{
		tmp_e = add( tmp_e, 31 - 5 ); /-->Q31/
		gain_inov = round_fx( ISqrt32( L_tmp, &tmp_e ) ); /Q15,tmp_e/
		gain_inov_e = tmp_e;
		@@ -1893,7 +1904,8 @@ void con_tcx_ivas_fx(
		deemph_fx( syn, st->preemph_fac, add( L_frame, shr( L_frame, 1 ) ), &tmp_deemph );

		#ifdef HARMONIZE_2446_CON_TCX_FX
		IF(EQ_32(st->element_mode, EVS_MONO)) {
		IF( EQ_32( st->element_mode, EVS_MONO ) )
		{
		bufferCopyFx( syn + sub( L_frame, M + 1 ), st->syn, 1 + M, Q_syn, 0, 0, 0 ); /Q_syn/
		}
		#endif // HARMONIZE_2446_CON_TCX_FX
		@@ -1937,7 +1949,8 @@ void con_tcx_ivas_fx(
		Copy_Scale_sig( syn + L_frame, hTcxDec->syn_OverlFB, shr( L_frame, 1 ), sub( st->Q_syn_factor, Q_syn ) );
		hTcxDec->Q_syn_OverlFB = st->Q_syn_factor;
		#else
		IF(NE_16(st->element_mode, EVS_MONO)) {
		IF( NE_16( st->element_mode, EVS_MONO ) )
		{
		scf = add( getScaleFactor16( syn, L_frame ), Q_syn );
		IF( LT_16( scf, 0 ) ) // Only avoid left shift in bufferCopyFX when overflow could occur
		{
		@@ -1955,7 +1968,8 @@ void con_tcx_ivas_fx(
		Copy_Scale_sig( syn + L_frame, hTcxDec->syn_OverlFB, shr( L_frame, 1 ), sub( st->Q_syn_factor, Q_syn ) );
		hTcxDec->Q_syn_OverlFB = st->Q_syn_factor;
		}
		ELSE{
		ELSE
		{
		/* As long as there is no synth scaling factor introduced, which
		is given to the outside, there might occur overflows here */
		BASOP_SATURATE_WARNING_OFF_EVS
		@@ -1986,11 +2000,13 @@ void con_tcx_ivas_fx(
		hTcxDec->Q_syn_Overl_TDACFB = Q_syn;

		#else
		IF(NE_16(st->element_mode, EVS_MONO)) {
		IF( NE_16( st->element_mode, EVS_MONO ) )
		{
		Copy( syn + L_frame, hTcxDec->syn_Overl_TDACFB, shr( L_frame, 1 ) );
		hTcxDec->Q_syn_Overl_TDACFB = Q_syn;
		}
		ELSE{
		ELSE
		{
		bufferCopyFx( syn + L_frame, hTcxDec->syn_Overl_TDACFB, shr( L_frame, 1 ), Q_syn, 0, -1, 0 );
		hTcxDec->Q_syn_Overl_TDACFB = add( st->Q_syn, sub( st->Q_syn, -1 ) );
		}
		@@ -2044,10 +2060,12 @@ void con_tcx_ivas_fx(
		#ifndef HARMONIZE_2446_CON_TCX_FX
		st->Q_syn = Q_syn;
		#else
		IF(NE_16(st->element_mode, EVS_MONO)) {
		IF( NE_16( st->element_mode, EVS_MONO ) )
		{
		st->Q_syn = Q_syn;
		}
		ELSE{
		ELSE
		{
		Scale_sig( hTcxDec->old_syn_Overl, shr( st->L_frame, 1 ), sub( -1, Q_syn ) ); /Q_syn/
		hTcxDec->Q_old_syn_Overl = -1;
		}
		@@ -2064,7 +2082,8 @@ void con_tcx_ivas_fx(
		#ifndef HARMONIZE_2446_CON_TCX_FX
		st->hHQ_core->Q_old_wtda_LB = Q_syn; // st->hHQ_core->Q_old_wtda
		#else
		IF(EQ_16(st->element_mode, EVS_MONO)) {
		IF( EQ_16( st->element_mode, EVS_MONO ) )
		{
		st->hHQ_core->Q_old_wtda_LB = Q_syn; // st->hHQ_core->Q_old_wtda
		}
		#endif // !HARMONIZE_2446_CON_TCX_FX
		@@ -2074,5 +2093,3 @@ void con_tcx_ivas_fx(

		return;
		}