Revert "formatting" (d2aee022) · Commits · SA4 / Audio / IVAS BASOP

lib_com/gs_gains_fx.c

+4 −58

Original line number	Diff line number	Diff line
		@@ -70,19 +70,12 @@ static Word16 VDQ_vec_fx( Word16 Qvec_out_fx, const Word16 mean_dic_fx, const
		/* _ None */
		/========================================================================/

		#ifdef FIX_2380_HARM_GSC_GAIN_COMP_FX
		Word16 Comp_and_apply_gain_fx(
		#else
		void Comp_and_apply_gain_fx(
		#endif
		Word16 exc_diffQ[], /* i/o: Quantized excitation */
		Word16 Ener_per_bd_iQ[], /* i : Target ener per band Q13 */
		Word16 Ener_per_bd_yQ[], /* i/o: Ener per band for norm vector i->Q13/o->Q13 */
		Word16 Mbands_gn, /* i : number of bands */
		const Word16 ReUseGain, /* i : Reuse the gain in Ener_per_bd_yQ */
		#ifdef FIX_2380_HARM_GSC_GAIN_COMP_FX
		const Word16 Flag_adj_q_exc, /* i : Flag allowing Q_exc adjustment */
		#endif
		Word16 Qexc_diff,
		Word16 Q_exc )
		{
		@@ -90,11 +83,6 @@ void Comp_and_apply_gain_fx(
		Word16 StartBin, NB_Qbins;
		Word16 y_gain;
		Word16 L16, frac, exp1, tmp_exp;
		#ifdef FIX_2380_HARM_GSC_GAIN_COMP_FX
		Word16 Q_adapt;
		Word16 Q_exc_diffQ[L_FRAME16k];
		Word32 exc_diffQ32[L_FRAME16k];
		#endif
		Word32 L32;

		/* Recreate excitation for local synthesis and decoder */
		@@ -104,7 +92,6 @@ void Comp_and_apply_gain_fx(
		move16();

		tmp_exp = add( 14, sub( Q_exc, Qexc_diff ) ); /* In case of reuse, it can be computed outside the loop*/

		FOR( i_band = 0; i_band < Mbands_gn; i_band++ )
		{
		StartBin = add( StartBin, NB_Qbins );
		@@ -140,24 +127,6 @@ void Comp_and_apply_gain_fx(
		move16(); /Q1 /
		tmp_exp = add( add( exp1, 1 ), sub( Q_exc, Qexc_diff ) );

		#ifdef FIX_2380_HARM_GSC_GAIN_COMP_FX
		IF( Flag_adj_q_exc != 0 )
		{
		FOR( i = StartBin; i < NB_Qbins + StartBin; i++ )
		{
		exc_diffQ32[i] = L_mult( exc_diffQ[i], y_gain ); /Qexc_diff+15 /
		move32();
		Q_exc_diffQ[i] = Q_exc;
		if ( exc_diffQ[i] )
		{
		Q_exc_diffQ[i] = sub( Q_exc_diffQ[i], tmp_exp );
		move16();
		}
		}
		}
		ELSE
		#endif
		{
		FOR( i = StartBin; i < NB_Qbins + StartBin; i++ )
		{
		L32 = L_mult( exc_diffQ[i], y_gain ); /Qexc_diff+15 /
		@@ -166,31 +135,8 @@ void Comp_and_apply_gain_fx(
		}
		}
		}
		}

		#ifdef FIX_2380_HARM_GSC_GAIN_COMP_FX
		Q_adapt = Q_exc;
		move16();
		test();
		IF( EQ_16( ReUseGain, 0 ) && Flag_adj_q_exc != 0 )
		{
		Word16 total_bins = add( StartBin, NB_Qbins );
		move16();
		FOR( i = 0; i < total_bins; i++ )
		{
		Q_adapt = s_min( Q_adapt, add( Q_exc_diffQ[i], norm_l( exc_diffQ32[i] ) ) );
		move16();
		}
		FOR( i = 0; i < total_bins; i++ )
		{
		exc_diffQ[i] = round_fx( L_shl( exc_diffQ32[i], sub( Q_adapt, Q_exc_diffQ[i] ) ) ); /Q_exc/
		}
		}

		return Q_adapt;
		#else
		return;
		#endif
		}
		#ifndef FIX_2338_HARM_GSC_GAIN_COMP

lib_com/gs_noisefill_fx.c

+3 −33

Original line number	Diff line number	Diff line
		@@ -1081,9 +1081,6 @@ void highband_exc_dct_in_ivas_fx(
		Word16 frac, exp, tmp1;
		Word16 tmp2;
		Word16 *end, Q_hb_exc;
		#ifdef FIX_2380_HARM_GSC_GAIN_COMP_FX
		Word16 Flag_adj_q_exc, old_Q_exc;
		#endif

		FOR( j = 10; j < MBANDS_GN; j++ )
		{
		@@ -1367,9 +1364,10 @@ void highband_exc_dct_in_ivas_fx(
		move16();
		}
		}
		#if !defined FIX_2338_HARM_GSC_GAIN_COMP && !defined FIX_2380_HARM_GSC_GAIN_COMP_FX
		#ifndef FIX_2338_HARM_GSC_GAIN_COMP
		IF( EQ_16( element_mode, EVS_MONO ) )
		{
		#endif
		Comp_and_apply_gain_fx( exc_diffQ, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 0, Qexc_diffQ, *Q_exc );

		IF( exc_wo_nf != NULL )
		@@ -1377,6 +1375,7 @@ void highband_exc_dct_in_ivas_fx(
		Comp_and_apply_gain_fx( exc_wo_nf, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 1, Qexc_diffQ, *Q_exc );
		Vr_add( exc_dct_in, exc_wo_nf, exc_wo_nf, L_frame );
		}
		#ifndef FIX_2338_HARM_GSC_GAIN_COMP
		}
		ELSE
		{
		@@ -1407,36 +1406,7 @@ void highband_exc_dct_in_ivas_fx(
		Scale_sig( exc_dct_in, L_frame, sub( *Q_exc, Q_old ) );
		}
		}
		#elif defined FIX_2380_HARM_GSC_GAIN_COMP_FX

		Flag_adj_q_exc = 0;
		move16();
		IF( NE_16( element_mode, EVS_MONO ) && lt_ener_per_band_fx != NULL ) /* to keep all EVS BE */
		{
		Flag_adj_q_exc = 1;
		move16();
		}

		old_Q_exc = *Q_exc;
		move16();
		Q_exc = Comp_and_apply_gain_fx( exc_diffQ, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 0, Flag_adj_q_exc, Qexc_diffQ, Q_exc );
		Scale_sig( exc_dct_in, L_frame, sub( *Q_exc, old_Q_exc ) );

		IF( exc_wo_nf != NULL )
		{
		Comp_and_apply_gain_fx( exc_wo_nf, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 1, Flag_adj_q_exc, Qexc_diffQ, *Q_exc );
		Vr_add( exc_dct_in, exc_wo_nf, exc_wo_nf, L_frame );
		}
		#else /* #if defined FIX_2338_HARM_GSC_GAIN_COMP */
		Comp_and_apply_gain_fx( exc_diffQ, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 0, Qexc_diffQ, *Q_exc );

		IF( exc_wo_nf != NULL )
		{
		Comp_and_apply_gain_fx( exc_wo_nf, Ener_per_bd_iQ, Ener_per_bd_yQ, last_bin, 1, Qexc_diffQ, *Q_exc );
		Vr_add( exc_dct_in, exc_wo_nf, exc_wo_nf, L_frame );
		}
		#endif

		/--------------------------------------------------------------------------------------
		* add the correction layer to the LF bins,
		* and add the quantized pulses or the noise for the higher part of the spectrum