remove redundant code under IVAS_CODE_CNG (7bf53946) · Commits · SA4 / Audio / IVAS BASOP

lib_com/fd_cng_com_fx.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -566,11 +566,6 @@ void minimum_statistics(
		Word16 msPeriodogBuf, / i/o: Buffer of periodograms (energies) */
		Word16 msPeriodogBufPtr, / i/o: Counter */
		HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */
		#ifdef IVAS_CODE_CNG
		,
		const Word16 enc_dec, /* i : encoder/decoder indicator */
		const Word16 element_mode /* i : IVAS element mode type */
		#endif
		)
		{
		Word16 i, j, k, s, s1, s2, s3;

lib_com/prot_fx.h

+0 −13

Original line number	Diff line number	Diff line
		@@ -7588,15 +7588,6 @@ void perform_noise_estimation_dec_fx(
		float *power_spectrum,
		#endif
		HANDLE_FD_CNG_DEC hFdCngDec /* i/o: FD_CNG structure containing all buffers and variables */
		#ifdef IVAS_CODE_CNG
		,
		const Word16 element_mode, /* i : element mode */
		const Word16 bwidth, /* i : audio bandwidth */
		const Word16 L_frame, /* i : frame length at internal Fs */
		const Word16 last_L_frame, /* i : frame length of the last frame at internal Fs */
		const Word32 last_core_brate, /* i : previous frame core bitrate */
		const Word16 VAD /* i : VAD flag in the decoder */
		#endif
		);

		void perform_noise_estimation_dec_ivas_fx(
		@@ -8725,10 +8716,6 @@ Word16 dec_acelp_tcx_frame_fx(
		Word32 bwe_exc_extended[], /* i/o: bandwidth extended excitation */
		Word16 voice_factors, / o : voicing factors */
		Word16 pitch_buf[] /* o : floating pitch for each subframe */
		#ifdef IVAS_CODE_CNG
		,
		STEREO_CNG_DEC_HANDLE hStereoCng /* i : stereo CNG handle */
		#endif
		);

		// dec_LPD_fx.c

lib_dec/cng_dec_fx.c

+2 −50

Original line number	Diff line number	Diff line
		@@ -1513,12 +1513,6 @@ static void shb_CNG_decod_fx(
		}
		ELSE
		{
		#ifdef IVAS_CODE_CNG
		/* de-quantization of SHB CNG parameters */ To be verified
		L_tmp = L_mult( idx_ener_fx, 17615 ); /Q13/
		st_fx->last_shb_cng_ener_fx = extract_l( L_shr( L_sub( L_tmp, 147962 ), 5 ) ); /Q8 /
		move16();
		#endif
		}
		}
		}
		@@ -1549,9 +1543,6 @@ static void shb_CNG_decod_fx(

		Copy_Scale_sig( shb_lpcCNG_fx, shb_lpcCNG_fx, LPC_SHB_ORDER + 1, sub( norm_s( shb_lpcCNG_fx[0] ), 2 ) ); /* Q12 */

		#ifdef IVAS_CODE_CNG
		// mvr2r(shb_lpcCNG, st->hTdCngDec->shb_lpcCNG, LPC_SHB_ORDER + 1);
		#endif
		/* SHB energy estimation */
		wb_ener_fx = L_deposit_l( 1 ); /Q1 /
		FOR( i = 0; i < L_FRAME32k; i++ )
		@@ -1695,9 +1686,7 @@ static void shb_CNG_decod_fx(
		L_tmp = L_deposit_h( tmp ); /Q31 /
		tmp = sub( add( 5, exp ), add( q, exp1 ) );
		L_gain_fx = Isqrt_lc( L_tmp, &tmp ); /Q31-Qtmp /
		#ifdef IVAS_CODE_CNG
		st->hTdCngDec->shb_cng_gain = ener_fx;
		#endif

		FOR( i = 0; i < L_FRAME16k; i++ )
		{
		shb_syn16k_fx[i] = extract_l( L_shr( Mpy_32_16_1( L_gain_fx, excSHB_fx[i] ), sub( 5, tmp ) ) ); /Q3 = 31-Qtmp-8-15-5+Qtmp /
		@@ -1726,11 +1715,8 @@ static void shb_CNG_decod_fx(
		{
		interpolate_3_over_2_allpass_fx( shb_synth_fx, L_FRAME32k, shb_synth_fx, st_fx->interpol_3_2_cng_dec_fx, allpass_poles_3_ov_2 );
		}
		#ifdef IVAS_CODE_CNG
		ResetSHBbuffer_Dec( st->hBWE_TD, st->extl );
		#else

		ResetSHBbuffer_Dec_fx( st_fx );
		#endif

		return;
		}
		@@ -2037,20 +2023,6 @@ void td_cng_dec_init_fx(
		move16();
		hTdCngDec->last_allow_cn_step = 0;
		move16();
		#ifdef IVAS_CODE_CNG
		// mvr2r(st->lsp_old, st->lspCNG, M);
		// hTdCngDec->shb_cng_ener = -6.02f;
		IF( st->element_mode != EVS_MONO )
		{
		// set_f(hTdCngDec->shb_lpcCNG, 0.0f, LPC_SHB_ORDER + 1);
		// hTdCngDec->shb_lpcCNG[0] = 1.0f;
		// hTdCngDec->shb_cng_gain = -82.0; /* a dB value approximately corresponding to shb index 0(used as index -15) */
		}
		// hTdCngDec->wb_cng_ener = -6.02f;
		// hTdCngDec->last_wb_cng_ener = -6.02f;
		// hTdCngDec->last_shb_cng_ener = -6.02f;
		// hTdCngDec->swb_cng_seed = RANDOM_INITSEED;
		#endif
		hTdCngDec->ho_hist_ptr = -1;
		move16();
		hTdCngDec->ho_sid_bw = L_deposit_l( 0 );
		@@ -2081,26 +2053,6 @@ void td_cng_dec_init_fx(
		set16_fx( hTdCngDec->exc_mem_fx, 0, 24 );
		set16_fx( hTdCngDec->exc_mem1_fx, 0, 30 );
		set32_fx( hTdCngDec->old_env_fx, 0, NUM_ENV_CNG );
		#ifdef IVAS_CODE_CNG
		// st->CNG_mode = -1;
		// for (i = 0; i < LPC_SHB_ORDER; i++)
		//{
		// IF (st->element_mode != EVS_MONO)
		// {
		// hTdCngDec->lsp_shb_prev[i] = 0.5f * ((float)(i + 1)) / ((float)(LPC_SHB_ORDER + 1));
		// }
		// else
		// {
		// hTdCngDec->lsp_shb_prev[i] = 0.5f * ((float)i) / ((float)LPC_SHB_ORDER);
		// }
		// hTdCngDec->lsp_shb_prev_prev[i] = hTdCngDec->lsp_shb_prev[i];
		// }

		// hTdCngDec->shb_dtx_count = 0;
		// hTdCngDec->trans_cnt = 0;
		// hTdCngDec->last_shb_ener = 0.001f;
		// set_f(hTdCngDec->interpol_3_2_cng_dec, 0.0f, INTERP_3_2_MEM_LEN);
		#endif
		hTdCngDec->burst_cnt = 0;
		move16();

lib_dec/dec_acelp_tcx_main_fx.c

+3 −19

Original line number	Diff line number	Diff line
		@@ -10,12 +10,7 @@
		#include "stat_com.h"
		#include "prot_fx.h"
		#include "basop_util.h"
		static void decode_frame_type_fx( Decoder_State *st
		#ifdef IVAS_CODE_CNG
		,
		STEREO_CNG_DEC_HANDLE hStereoCng
		#endif
		)
		static void decode_frame_type_fx( Decoder_State *st )
		{
		Word32 L_tmp;
		Word16 num_bits;
		@@ -259,9 +254,7 @@ static void decode_frame_type_fx( Decoder_State *st
		IF( EQ_16( st->m_frame_type, SID_FRAME ) && NE_16( st->hFdCngDec->hFdCngCom->frame_type_previous, ACTIVE_FRAME ) )
		{
		lerp( st->hFdCngDec->hFdCngCom->olapBufferSynth, st->hFdCngDec->hFdCngCom->olapBufferSynth, st->L_frame * 2, st->last_L_frame * 2 );
		#ifdef IVAS_CODE_CNG
		lerp( hStereoCng->olapBufferSynth22, hStereoCng->olapBufferSynth22, st->L_frame * 2, st->last_L_frame * 2 );
		#endif

		IF( EQ_16( st->L_frame, L_FRAME ) )
		{
		FOR( n = 0; n < shl( st->L_frame, 1 ); n++ )
		@@ -311,10 +304,6 @@ Word16 dec_acelp_tcx_frame_fx(
		Word32 bwe_exc_extended[], /* i/o: bandwidth extended excitation Q0 */
		Word16 voice_factors, / o : voicing factors Q15 */
		Word16 pitch_buf[] /* o : floating pitch for each subframe Q6 */
		#ifdef IVAS_CODE_CNG
		,
		STEREO_CNG_DEC_HANDLE hStereoCng /* i : stereo CNG handle */
		#endif
		)
		{
		Word16 num_bits;
		@@ -366,12 +355,7 @@ Word16 dec_acelp_tcx_frame_fx(
		Word32 total_brate = st->last_total_brate;
		move32();

		decode_frame_type_fx( st
		#ifdef IVAS_CODE_CNG
		,
		hStereoCng
		#endif
		);
		decode_frame_type_fx( st );

		st->force_lpd_reset = 0;
		move16();

lib_dec/fd_cng_dec_fx.c

+3 −811

File changed.

Preview size limit exceeded, changes collapsed.

Admin message