REMOVE_EVS_DUPLICATES2 (ba6f7e27) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -156,4 +156,5 @@
		#define SVD_WMOPS_OPT /* Ittiam : SVD related optimizations */

		#define REMOVE_EVS_DUPLICATES /* remove core-coder duplicated functions */
		#define REMOVE_EVS_DUPLICATES2
		#endif

lib_dec/acelp_core_dec_fx.c

+14 −1

Original line number	Diff line number	Diff line
		@@ -432,7 +432,11 @@ ivas_error acelp_core_dec_fx(
		}

		/* update synthesis filter memories */
		#ifdef REMOVE_EVS_DUPLICATES2
		ivas_synth_mem_updt2_fx( st_fx->L_frame, st_fx->last_L_frame, st_fx->old_exc_fx, st_fx->mem_syn_r, st_fx->mem_syn2_fx, NULL, dec );
		#else
		synth_mem_updt2( st_fx->L_frame, st_fx->last_L_frame, st_fx->old_exc_fx, st_fx->mem_syn_r, st_fx->mem_syn2_fx, NULL, dec );
		#endif
		#else
		synth_mem_updt2( st_fx->L_frame, st_fx->last_L_frame, st_fx->old_exc_fx, st_fx->mem_syn_r, st_fx->mem_syn2_fx, NULL, DEC );
		#endif
		@@ -630,8 +634,11 @@ ivas_error acelp_core_dec_fx(
		/* decode CNG parameters */
		IF( st_fx->cng_type == LP_CNG )
		{

		#ifdef REMOVE_EVS_DUPLICATES2
		CNG_dec_ivas_fx( st_fx, st_fx->last_element_mode, Aq_fx, lsp_new_fx, lsf_new_fx, &allow_cn_step_fx, sid_bw, q_env );
		#else
		CNG_dec_fx( st_fx, st_fx->last_element_mode, Aq_fx, lsp_new_fx, lsf_new_fx, &allow_cn_step_fx, sid_bw, q_env );
		#endif
		#ifdef IVAS_CODE
		local_element_mode = st_fx->element_mode;
		move16();
		@@ -684,6 +691,7 @@ ivas_error acelp_core_dec_fx(
		}
		}
		#endif
		//generate_comfort_noise_dec_ivas_fx( NULL, NULL, NULL, st_fx, &( st_fx->Q_exc ), 1, nchan_out );
		generate_comfort_noise_dec_fx( NULL, NULL, NULL, st_fx, &( st_fx->Q_exc ), 2, -1 );

		FdCng_exc( st_fx->hFdCngDec->hFdCngCom, &st_fx->CNG_mode, st_fx->L_frame, st_fx->lsp_old_fx, st_fx->first_CNG, st_fx->lspCNG_fx, Aq_fx, lsp_new_fx, lsf_new_fx, exc_fx, exc2_fx, bwe_exc_fx );
		@@ -1556,12 +1564,17 @@ ivas_error acelp_core_dec_fx(
		move32();
		}
		/Noise estimate/
		#ifdef REMOVE_EVS_DUPLICATES2
		IF( NE_16( st_fx->element_mode, IVAS_CPE_TD ) && !st_fx->cng_ism_flag )
		#else
		IF( NE_16( st_fx->element_mode, IVAS_CPE_TD ) /* && !st->cng_ism_flag IVAS_CODE */ )
		#endif
		{
		#ifdef IVAS_CODE_CNG_FIX185_PLC_FADEOUT
		PMT( "Code for IVAS_CODE_CNG_FIX185_PLC_FADEOUT not done" )
		ApplyFdCng_fx( syn, st_fx->Q_syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
		#else
		//ApplyFdCng_ivas_fx( syn_fx, st_fx->Q_syn, NULL, 0, realBuffer, imagBuffer, NULL, st_fx, 0, ( st_fx->coder_type == AUDIO && !st_fx->GSC_noisy_speech ) );
		ApplyFdCng_fx( syn_fx, st_fx->Q_syn, realBuffer, imagBuffer, NULL, st_fx, 0, ( EQ_16( st_fx->coder_type, AUDIO ) && st_fx->GSC_noisy_speech == 0 ) );
		#endif
		}

lib_dec/fd_cng_dec_fx.c

+15 −0

Original line number	Diff line number	Diff line
		@@ -955,7 +955,12 @@ Word16 ApplyFdCng_fx(
		test();
		IF( NE_16( st->element_mode, IVAS_CPE_TD ) && NE_16( st->element_mode, IVAS_CPE_DFT ) )
		{
		#ifdef REMOVE_EVS_DUPLICATES2
		scalebands_fx( hFdCngDec->msNoiseEst, hFdCngDec->part_shaping, hFdCngDec->nFFTpart_shaping, hFdCngDec->midband_shaping, hFdCngDec->nFFTpart_shaping, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), hFdCngDec->bandNoiseShape, 1 );

		#else
		scalebands( hFdCngDec->msNoiseEst, hFdCngDec->part_shaping, hFdCngDec->nFFTpart_shaping, hFdCngDec->midband_shaping, hFdCngDec->nFFTpart_shaping, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), hFdCngDec->bandNoiseShape, 1 );
		#endif
		}
		hFdCngDec->bandNoiseShape_exp = hFdCngDec->msNoiseEst_exp;
		move16();
		@@ -1037,8 +1042,13 @@ Word16 ApplyFdCng_fx(
		IF( LT_32( hFdCngCom->msFrCnt_init_counter, L_deposit_l( hFdCngCom->msFrCnt_init_thresh ) ) )
		{
		/* At initialization, interpolate the bin/band-wise levels from the partition levels */
		#ifdef REMOVE_EVS_DUPLICATES2
		scalebands_fx( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,
		hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 1 );
		#else
		scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,
		hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 1 );
		#endif
		*cngNoiseLevel_exp = hFdCngCom->sidNoiseEstExp;
		move16();
		}
		@@ -1054,8 +1064,13 @@ Word16 ApplyFdCng_fx(
		/* Interpolate the CLDFB band levels from the SID (partition) levels */
		IF( GT_16( hFdCngCom->regularStopBand, hFdCngCom->numCoreBands ) )
		{
		#ifdef REMOVE_EVS_DUPLICATES2
		scalebands_fx( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,
		hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 0 );
		#else
		scalebands( hFdCngCom->sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband,
		hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), cngNoiseLevel, 0 );
		#endif

		*cngNoiseLevel_exp = hFdCngCom->sidNoiseEstExp;
		move16();