Clang formatting changes (6f1ac6e4) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot_fx.h

+15 −20

Original line number	Diff line number	Diff line
		@@ -3061,8 +3061,7 @@ void GenShapedSHBExcitation_fx(
		Word16 n_mem2, /* i : n_mem2 scale factor to adjust 24.4/32kbps memories */
		Word16 prev_Q_bwe_syn, /* i : st_fx->prev_Q_bwe_syn */
		const Word32 bitrate,
		const Word16 prev_bfi
		);
		const Word16 prev_bfi );

		void GenShapedSHBExcitation_ivas_enc_fx(
		Word16 excSHB, / o : synthesized shaped shb excitation Q_bwe_exc*/
		@@ -3137,8 +3136,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
		Word16 n_mem2, /* i : n_mem2 scale factor to adjust 24.4/32kbps memories */
		Word16 prev_Q_bwe_syn, /* i : st_fx->prev_Q_bwe_syn */
		const Word32 bitrate,
		const Word16 prev_bfi
		, /* i : previous frame was concealed */
		const Word16 prev_bfi, /* i : previous frame was concealed */
		const Word16 element_mode, /* i : element mode */
		const Word16 flag_ACELP16k, /* i : ACELP@16kHz flag */
		Word16 nlExc16k, / i/o: NL exc for IC-BWE */
		@@ -3326,8 +3324,7 @@ void prep_tbe_exc_ivas_fx(
		Word16 T0, /* i : integer pitch variables Q0 */
		Word16 T0_frac, /* i : Fractional pitch variables Q0*/
		const Word16 coder_type, /* i : coding type */
		Word32 core_brate
		, /* i : core bitrate */
		Word32 core_brate, /* i : core bitrate */
		const Word16 element_mode, /* i : element mode */
		const Word16 idchan, /* i : channel ID */
		const Word16 flag_TD_BWE, /* i : flag indicating whether hTD_BWE exists */
		@@ -6539,8 +6536,7 @@ void TonalMDCTConceal_SaveFreqSignal(
		Word16 nNewSamplesCore,
		const Word16 *scaleFactors,
		const Word16 *scaleFactors_exp,
		const Word16 gain_tcx_exp
		);
		const Word16 gain_tcx_exp );

		void TonalMDCTConceal_SaveFreqSignal_ivas_fx(
		TonalMDCTConcealPtr hTonalMDCTConc,
		@@ -8951,8 +8947,7 @@ ReadTnsData( STnsConfig const *pTnsConfig,
		Word16 *stream,
		Word16 *pnSize );

		void
		ReadTnsData_ivas_fx( STnsConfig const *pTnsConfig,
		void ReadTnsData_ivas_fx( STnsConfig const *pTnsConfig,
		Decoder_State *st,
		Word16 *pnBits,
		Word16 *stream,

lib_com/swb_tbe_com_fx.c

+212 −216

Original line number	Diff line number	Diff line
		@@ -2102,8 +2102,7 @@ void GenShapedSHBExcitation_fx(
		Word16 n_mem2, /* i : n_mem2 scale factor to adjust 24.4/32kbps memories */
		Word16 prev_Q_bwe_syn, /* i : st_fx->prev_Q_bwe_syn */
		const Word32 bitrate,
		const Word16 prev_bfi
		)
		const Word16 prev_bfi )
		{
		Word16 i, j, k;
		Word16 wht_fil_mem[LPC_WHTN_ORDER];
		@@ -2367,8 +2366,7 @@ void GenShapedSHBExcitation_fx(
		}
		ELSE /* decoder side */
		{
		{
		/* vf_ind is an integer scale by 0.125f/
		{ /* vf_ind is an integer scale by 0.125f/
		tmp = shl( *vf_ind, ( 15 - 3 ) );
		tmp2 = MAX_16;
		move16();
		@@ -7278,8 +7276,7 @@ void prep_tbe_exc_fx(
		Word16 T0, /* i : integer pitch variables Q0 */
		Word16 T0_frac, /* i : Fractional pitch variables Q0*/
		const Word16 coder_type, /* i : coding type */
		Word32 core_brate
		)
		Word32 core_brate )
		{
		Word16 i;
		Word16 tmp_code_fx[2 * L_SUBFR * HIBND_ACB_L_FAC];
		@@ -7425,8 +7422,7 @@ void prep_tbe_exc_ivas_fx(
		Word16 T0, /* i : integer pitch variables Q0 */
		Word16 T0_frac, /* i : Fractional pitch variables Q0*/
		const Word16 coder_type, /* i : coding type */
		Word32 core_brate
		, /* i : core bitrate */
		Word32 core_brate, /* i : core bitrate */
		const Word16 element_mode, /* i : element mode */
		const Word16 idchan, /* i : channel ID */
		const Word16 flag_TD_BWE, /* i : flag indicating whether hTD_BWE exists */

lib_dec/FEC_HQ_phase_ecu_fx.c

+9 −18

Original line number	Diff line number	Diff line
		@@ -64,11 +64,9 @@ static void windowing( const Word16 , Word16 , const Word16 *, const Word16, c
		static void windowing_ROM_optimized( const Word16 , Word16 , const Word16, const Word16, const Word16 );
		static void fft_spec2_fx( const Word16[], Word32[], const Word16 );
		static void trans_ana_fx( const Word16 , Word16 , Word16 , Word16 , const Word16, const Word16, const Word16, const Word16, Word16 , Word16 , Word16 , Word16 );
		static void peakfinder_fx( const Word16 , const Word16, Word16 , Word16 *, const Word16
		);
		static void peakfinder_fx( const Word16 , const Word16, Word16 , Word16 *, const Word16 );
		static Word16 imax_fx( const Word16 *, const Word16 );
		static void spec_ana_fx( const Word16 prevsynth, Word16 plocs, Word32 plocsi, Word16 num_plocs, Word16 X_sav, const Word16 output_frame, const Word16 bwidth_fx, Word16 Q
		);
		static void spec_ana_fx( const Word16 prevsynth, Word16 plocs, Word32 plocsi, Word16 num_plocs, Word16 X_sav, const Word16 output_frame, const Word16 bwidth_fx, Word16 Q );
		static void subst_spec_fx( const Word16 , const Word32 , Word16 , const Word16, Word16 , const Word16 , const Word16, const Word16 , const Word16, Word16 , const Word16 , const Word16 , Word16, const Word16 );
		static Word16 rand_phase_fx( const Word16 seed, Word16 sin_F, Word16 cos_F );

		@@ -1779,8 +1777,7 @@ static void spec_ana_fx(
		{
		sel = mult_r( sub( Xmax, Xmin ), CMPLMNT_PFIND_SENS_FX );
		}
		peakfinder_fx( xfp, Lprot2_1, plocs, num_plocs, sel
		);
		peakfinder_fx( xfp, Lprot2_1, plocs, num_plocs, sel );


		{
		@@ -2875,8 +2872,7 @@ static void rec_frame_fx(
		Word16 X, / i : FFT spectrum */
		Word32 ecu_rec, / o : Reconstructed frame in tda domain */
		const Word16 output_frame, /* i : Frame length */
		const Word16 Q
		)
		const Word16 Q )
		{
		const Word16 *pFftTbl;
		Word16 Lprot, lprotLog2Minus1;
		@@ -4402,13 +4398,11 @@ static void fec_alg_fx(
		Word16 exp;
		Word16 n, Q;

		fec_ecu_dft_fx( prevsynth_LP, N, Tfr, Tfi, &sum_Tf_abs, Tf_abs, &Nfft, &exp
		);
		fec_ecu_dft_fx( prevsynth_LP, N, Tfr, Tfi, &sum_Tf_abs, Tf_abs, &Nfft, &exp );

		sinusoidal_synthesis_fx( Tfr, Tfi, Tf_abs, N, output_frame, decimatefactor, Nfft, sum_Tf_abs, synthesis, HqVoicing, exp );

		fec_noise_filling_fx( prevsynth, synthesis, ni_seed_forfec, output_frame, i_mult2( N, decimatefactor ), HqVoicing, gapsynth
		);
		fec_noise_filling_fx( prevsynth, synthesis, ni_seed_forfec, output_frame, i_mult2( N, decimatefactor ), HqVoicing, gapsynth );

		n = R1_48 - R2_48;
		move16();
		@@ -4629,8 +4623,7 @@ static void hq_phase_ecu_fx(
		trans_ana_fx( prevsynth + offset, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab,
		*last_fec, alpha, beta, beta_mute, Xavg );

		spec_ana_fx( prevsynth + offset, plocs, plocsi, num_p, X_sav, output_frame, bwidth_fx, Q_spec
		);
		spec_ana_fx( prevsynth + offset, plocs, plocsi, num_p, X_sav, output_frame, bwidth_fx, Q_spec );

		test();
		IF( prev_bfi != 0 && *last_fec != 0 )
		@@ -4660,12 +4653,10 @@ static void hq_phase_ecu_fx(
		}

		subst_spec_fx( plocs, plocsi, num_p, *time_offs, X, mag_chg, ph_dith, old_is_transient, output_frame, &seed,
		alpha, beta, *beta_mute, Xavg
		);
		alpha, beta, *beta_mute, Xavg );

		/* reconstructed frame in tda domain */
		rec_frame_fx( X, ecu_rec, output_frame, *Q_spec
		);
		rec_frame_fx( X, ecu_rec, output_frame, *Q_spec );

		*last_fec = 0;
		move16();

lib_dec/dec_ace_fx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -538,8 +538,7 @@ void decoder_acelp_fx(
		#else
		prep_tbe_exc_fx( st->L_frame,
		i_subfr, gain_pit, gain_code, code, st->voice_fac, &voice_factors[idx], bwe_exc,
		gain_preQ, code_preQ, st->Q_exc, T0, T0_frac, st->coder_type, st->core_brate
		);
		gain_preQ, code_preQ, st->Q_exc, T0, T0_frac, st->coder_type, st->core_brate );
		#endif
		}

lib_dec/fd_cng_dec_fx.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -792,7 +792,6 @@ Word16 ApplyFdCng_fx(
		{
		/* Perform noise estimation in active frames in the decoder for downward updates */
		perform_noise_estimation_dec_fx( timeDomainInput, Q, hFdCngDec );

		}
		}
		test();