cleaning (d664e502) · Commits · SA4 / Audio / IVAS BASOP

lib_dec/FEC_HQ_phase_ecu_fx.c

+0 −31

Original line number	Diff line number	Diff line
		@@ -4625,11 +4625,7 @@ static void fec_alg_fx(
		Word16 exp;
		Word16 n, Q;

		#ifdef HARM_HQ_CORE
		fec_ecu_dft_fx( prevsynth_LP, N, Tfr, Tfi, &sum_Tf_abs, Tf_abs, &Nfft, &exp, EVS_MONO );
		#else
		fec_ecu_dft_fx( prevsynth_LP, N, Tfr, Tfi, &sum_Tf_abs, Tf_abs, &Nfft, &exp );
		#endif

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

		@@ -4875,11 +4871,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, EVS_MONO, alpha, beta, beta_mute, Xavg );

		#ifdef HARM_HQ_CORE
		spec_ana_fx( prevsynth + offset, plocs, plocsi, num_p, X_sav, output_frame, bwidth_fx, Q_spec, EVS_MONO, &seed /temp/, -1 );
		#else
		spec_ana_fx( prevsynth + offset, plocs, plocsi, num_p, X_sav, output_frame, bwidth_fx, Q_spec );
		#endif

		test();
		IF( prev_bfi != 0 && *last_fec != 0 )
		@@ -4909,20 +4901,11 @@ static void hq_phase_ecu_fx(
		seed = add_sat( seed, plocs[*num_p - 1] );
		}

		#ifdef HARM_HQ_CORE
		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, EVS_MONO, -1, -1 );
		#else
		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 );
		#endif

		/* reconstructed frame in tda domain */
		#ifdef HARM_HQ_CORE
		rec_frame_fx( X, ecu_rec, output_frame, *Q_spec, NULL, EVS_MONO, NULL, NULL );
		#else
		rec_frame_fx( X, ecu_rec, output_frame, *Q_spec );
		#endif

		*last_fec = 0;
		move16();
		@@ -5128,11 +5111,7 @@ void hq_ecu_fx(
		/* find pitch and R value */
		IF( !( LT_16( output_frame, L_FRAME16k ) ) )
		{
		#ifdef HARM_HQ_CORE
		fec_ecu_pitch_fx( st_fx->element_mode, prevsynth + NS2SA_FX2( L_mult0( output_frame, 50 ), ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS ), prevsynth_LP, output_frame, &N, &corr, &decimatefactor, ph_ecu_HqVoicing );
		#else
		fec_ecu_pitch_fx( prevsynth + NS2SA_FX2( L_mult0( output_frame, 50 ), ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS ), prevsynth_LP, output_frame, &N, &corr, &decimatefactor, ph_ecu_HqVoicing );
		#endif
		}
		ELSE
		{
		@@ -5159,11 +5138,7 @@ void hq_ecu_fx(
		( GE_16( output_frame, L_FRAME16k ) && !prev_bfi && ( !old_is_transient[0] \|\| old_is_transient[1] ) && ( NE_16( ph_ecu_HqVoicing, 0 ) \|\| ( ( ( NE_16( st_fx->hHQ_core->env_stab_plc_fx, 0 ) ) && ( LT_16( corr, 19661 ) ) ) \|\| ( !( NE_16( st_fx->hHQ_core->env_stab_plc_fx, 0 ) ) && ( GT_16( corr, 27853 ) ) ) ) ) ) ) \|\|
		( LT_32( st_fx->total_brate, 48000 ) && ( ( ph_ecu_HqVoicing \|\| GT_16( corr, 27853 ) ) && !prev_bfi && ( !old_is_transient[0] \|\| old_is_transient[1] ) ) ) )
		{
		#ifdef HARM_HQ_CORE
		fec_alg_fx( prevsynth + NS2SA_FX2( L_mult0( output_frame, 50 ), ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS ), prevsynth_LP, &st_fx->hHQ_core->ni_seed_forfec, ecu_rec, output_frame, N, decimatefactor, ph_ecu_HqVoicing, gapsynth, EVS_MONO, NULL, 0 );
		#else
		fec_alg_fx( prevsynth + NS2SA_FX2( L_mult0( output_frame, 50 ), ACELP_LOOK_NS / 2 - PH_ECU_LOOKAHEAD_NS ), prevsynth_LP, &st_fx->hHQ_core->ni_seed_forfec, ecu_rec, output_frame, N, decimatefactor, ph_ecu_HqVoicing, gapsynth );
		#endif
		*last_fec = 1;
		move16();
		*ph_ecu_active = 0;
		@@ -5173,15 +5148,9 @@ void hq_ecu_fx(
		}
		ELSE
		{
		#ifdef HARM_HQ_CORE
		hq_phase_ecu_fx( prevsynth, ecu_rec, time_offs, X_sav, Q_spec, num_p, plocs, plocsi,
		env_stab, last_fec, ph_ecu_active, prev_bfi, old_is_transient,
		mag_chg_1st, Xavg, beta_mute, st_fx->bwidth, output_frame, -1, EVS_MONO );
		#else
		hq_phase_ecu_fx( prevsynth, ecu_rec, time_offs, X_sav, Q_spec, num_p, plocs, plocsi,
		env_stab, last_fec, ph_ecu_active, prev_bfi, old_is_transient,
		mag_chg_1st, Xavg, beta_mute, st_fx->bwidth, output_frame );
		#endif
		}

		return;

lib_dec/hq_core_dec_fx.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -160,15 +160,9 @@ void hq_core_dec_fx(
		IF( GE_16( output_frame, L_FRAME16k ) ) /* Apply phase ecu for WB, SWB and FB */
		{
		/* ecu_rec sent to OLA, env_stab passed in ph_ecu_st */
		#ifdef HARM_HQ_CORE
		hq_ecu_fx( st_fx->hTcxDec->prev_good_synth_fx, t_audio_q, &hHQ_core->time_offs, hHQ_core->X_sav_fx, &hHQ_core->Q_X_sav, &hHQ_core->num_p, hHQ_core->plocs, hHQ_core->plocsi_fx, hHQ_core->env_stab_fx,
		&hHQ_core->last_fec, hHQ_core->ph_ecu_HqVoicing, &hHQ_core->ph_ecu_active, gapsynth_fx, st_fx->prev_bfi, hHQ_core->old_is_transient, hHQ_core->mag_chg_1st_fx,
		hHQ_core->Xavg_fx, &hHQ_core->beta_mute_fx, output_frame, st_fx );
		#else
		hq_ecu_fx( st_fx->hTcxDec->prev_good_synth_fx, t_audio_q, &hHQ_core->time_offs, hHQ_core->X_sav_fx, &hHQ_core->Q_X_sav, &hHQ_core->num_p, hHQ_core->plocs, hHQ_core->plocsi_fx, hHQ_core->env_stab_fx,
		&hHQ_core->last_fec, hHQ_core->ph_ecu_HqVoicing, &hHQ_core->ph_ecu_active, gapsynth_fx, st_fx->prev_bfi, hHQ_core->old_is_transient, hHQ_core->mag_chg_1st_fx,
		hHQ_core->Xavg_fx, &hHQ_core->beta_mute_fx, output_frame, st_fx );
		#endif
		}
		ELSE
		{

lib_dec/hq_hr_dec_fx.c

+0 −30

Original line number	Diff line number	Diff line
		@@ -555,26 +555,8 @@ void hq_hr_dec_fx(
		* set quantization parameters
		------------------------------------------------------------------/

		#ifdef HARM_HQ_CORE
		#ifdef HARM_HQ_CORE_KEEP_EVS_BE
		Word16 tmp_length = length;
		move16();
		if ( EQ_16( length, L_FRAME48k ) )
		{
		tmp_length = L_SPEC48k;
		move16();
		}

		hq_configure_fx( tmp_length, *hqswb_clas, st_fx->core_brate, &num_sfm, &nb_sfm, &start_norm,
		&num_env_bands, &numnrmibits, &hq_generic_offset, sfmsize, sfm_start, sfm_end );
		#else
		hq_configure_fx( length, *hqswb_clas, st_fx->core_brate, &num_sfm, &nb_sfm, &start_norm,
		&num_env_bands, &numnrmibits, &hq_generic_offset, sfmsize, sfm_start, sfm_end );
		#endif
		#else
		hq_configure_evs_fx( length, *hqswb_clas, st_fx->core_brate, &num_sfm, &nb_sfm, &start_norm,
		&num_env_bands, &numnrmibits, &hq_generic_offset, sfmsize, sfm_start, sfm_end );
		#endif

		/------------------------------------------------------------------
		* Unpacking bitstream
		@@ -749,19 +731,7 @@ void hq_hr_dec_fx(

		IF( EQ_16( *is_transient, 1 ) )
		{
		#ifdef HARM_HQ_CORE_KEEP_EVS_BE
		tmp_length = length;
		move16();
		if ( EQ_16( length, L_FRAME48k ) )
		{
		tmp_length = L_SPEC48k;
		move16();
		}

		de_interleave_spectrum_fx( t_audio_q, tmp_length );
		#else
		de_interleave_spectrum_fx( t_audio_q, length );
		#endif
		}

		/------------------------------------------------------------------

lib_enc/hq_hr_enc_fx.c

+0 −54

Original line number	Diff line number	Diff line
		@@ -102,26 +102,8 @@ void hq_hr_enc_fx(
		* set quantization parameters
		------------------------------------------------------------------/

		#ifdef HARM_HQ_CORE
		#ifdef HARM_HQ_CORE_KEEP_EVS_BE
		Word16 tmp_length = length;
		move16();
		if ( EQ_16( length, L_FRAME48k ) )
		{
		tmp_length = L_SPEC48k;
		move16();
		}

		hq_configure_fx( tmp_length, hqswb_clas, st_fx->core_brate, &num_sfm, &nb_sfm, &start_norm, &num_env_bands, &numnrmibits, &hq_generic_offset,
		sfmsize, sfm_start, sfm_end );
		#else
		hq_configure_fx( length, hqswb_clas, st_fx->core_brate, &num_sfm, &nb_sfm, &start_norm, &num_env_bands, &numnrmibits, &hq_generic_offset,
		sfmsize, sfm_start, sfm_end );
		#endif
		#else
		hq_configure_evs_fx( length, hqswb_clas, st_fx->core_brate, &num_sfm, &nb_sfm, &start_norm, &num_env_bands, &numnrmibits, &hq_generic_offset,
		sfmsize, sfm_start, sfm_end );
		#endif

		/------------------------------------------------------------------
		* Transient frame handling
		@@ -130,19 +112,7 @@ void hq_hr_enc_fx(
		/* Interleave MLT coefficients of 4 sub-vectors in case of transient */
		IF( EQ_16( is_transient, 1 ) )
		{
		#ifdef HARM_HQ_CORE_KEEP_EVS_BE
		tmp_length = length;
		move16();
		if ( EQ_16( length, L_FRAME48k ) )
		{
		tmp_length = L_SPEC48k;
		move16();
		}

		interleave_spectrum_fx( t_audio, tmp_length );
		#else
		interleave_spectrum_fx( t_audio, length );
		#endif
		}

		test();
		@@ -178,23 +148,7 @@ void hq_hr_enc_fx(
		test();
		IF( EQ_16( hqswb_clas, HQ_GEN_SWB ) \|\| EQ_16( hqswb_clas, HQ_GEN_FB ) )
		{
		#ifdef HARM_HQ_CORE
		#ifdef HARM_HQ_CORE_KEEP_EVS_BE
		tmp_length = length;
		move16();
		if ( EQ_16( length, L_FRAME48k ) )
		{
		tmp_length = L_SPEC48k;
		move16();
		}

		hq_generic_hf_encoding_fx( st_fx->element_mode, t_audio, hq_generic_fenv, hq_generic_offset, st_fx, &hq_generic_exc_clas, tmp_length );
		#else
		hq_generic_hf_encoding_fx( st_fx->element_mode, t_audio, hq_generic_fenv, hq_generic_offset, st_fx, &hq_generic_exc_clas, length );
		#endif
		#else
		hq_generic_encoding_fx( t_audio, hq_generic_fenv, hq_generic_offset, st_fx, &hq_generic_exc_clas /, length/ );
		#endif
		IF( EQ_16( hq_generic_exc_clas, HQ_GENERIC_SP_EXC ) )
		{
		num_bits = add( num_bits, 1 ); /* conditional 1 bit saving for representing FD3 BWE excitation class Q0*/
		@@ -232,22 +186,14 @@ void hq_hr_enc_fx(

		IF( EQ_16( hqswb_clas, HQ_HVQ ) )
		{
		#ifdef HARM_HQ_CORE
		sum = hvq_enc_fx( st_fx, st_fx->core_brate, *num_bits, Npeaks, ynrm, R, peaks, nf_gains, noise_level, pe_gains, t_audio, t_audio_q );
		#else
		sum = hvq_enc_fx( st_fx, st_fx->core_brate, *num_bits, Npeaks, ynrm, R, peaks, nf_gains, noise_level, pe_gains, t_audio, t_audio_q );
		#endif
		num_bits = sub( num_bits, sum ); /* Q0 */
		move16();
		}
		ELSE
		{
		#ifdef HARM_HQ_CORE
		shape_bits = pvq_core_enc_fx( st_fx->element_mode, st_fx->hBstr, t_audio_norm, t_audio_q_norm, &Q_audio, sum, nb_sfm, sfm_start, sfm_end, sfmsize, Rsubband, R, npulses, maxpulse, HQ_CORE );
		#else
		shape_bits = pvq_core_enc_fx( st_fx->hBstr, t_audio_norm, t_audio_q_norm, &Q_audio, sum, nb_sfm, sfm_start, sfm_end, sfmsize, Rsubband, R,
		npulses, maxpulse, HQ_CORE );
		#endif
		num_bits = add( num_bits, sub( sum, shape_bits ) ); /* Q0 */
		move16();
		}

lib_enc/hvq_enc_fx.c

+4 −19

Original line number	Diff line number	Diff line
		@@ -204,20 +204,6 @@ Word16 hvq_enc_ivas_fx( /o : Consumed bits /
		}
		}

		#ifdef HARM_HQ_CORE
		IF( st_fx->element_mode == EVS_MONO )
		{
		#ifdef HARM_HQ_CORE
		nBits = peak_vq_enc_fx( st_fx->element_mode, st_fx->hBstr, st_fx->bwidth, coefs, coefs_out, core_brate, sub( hvq_bits, bits_used ),
		Npeaks, ynrm, R, peaks, &nf_gains[0] );
		#else
		nBits = peak_vq_enc_fx( st_fx->hBstr, st_fx->bwidth, coefs, coefs_out, core_brate, sub( hvq_bits, bits_used ),
		Npeaks, ynrm, R, peaks, &nf_gains[0] );
		#endif
		}
		ELSE
		#endif
		{
		#ifdef HARM_HQ_CORE
		nBits = peak_vq_enc_fx( st_fx->element_mode, st_fx->hBstr, st_fx->bwidth, coefs, coefs_out, core_brate, sub( hvq_bits, bits_used ),
		Npeaks, ynrm, R, peaks, &nf_gains[0] );
		@@ -225,7 +211,6 @@ Word16 hvq_enc_ivas_fx( /o : Consumed bits /
		nBits = peak_vq_enc_ivas_fx( st_fx->hBstr, st_fx->bwidth, coefs, coefs_out, core_brate, sub( hvq_bits, bits_used ),
		Npeaks, ynrm, R, peaks, &nf_gains[0] );
		#endif
		}

		bits_used = add( bits_used, nBits );