REMOVE_EVS_DUPLICATES3 (94c98bdb) · Commits · SA4 / Audio / IVAS BASOP

lib_com/bits_alloc_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -761,6 +761,7 @@ static ivas_error acelp_FCB_allocator_ivas(
		* - per channel bitrate minimum is 13250 kbps for ACELP@16kHz
		--------------------------------------------------------------------/

		#ifndef REMOVE_EVS_DUPLICATES
		ivas_error config_acelp1(
		const Word16 enc_dec, /* i : encoder/decoder flag */
		const Word32 total_brate, /* i : total bitrate */
		@@ -1875,7 +1876,7 @@ ivas_error config_acelp1(
		* - should be in range of <6700; 24350> for ACELP@12.8kHz
		* - per channel bitrate minimum is 13250 kbps for ACELP@16kHz
		--------------------------------------------------------------------/

		#endif
		ivas_error config_acelp1_IVAS(
		const Word16 enc_dec, /* i : encoder/decoder flag */
		const Word32 total_brate, /* i : total bitrate */

lib_com/gs_inact_switching_fx.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@
		/* RETURN ARGUMENTS : */
		/* _ None */
		/========================================================================/

		#ifndef REMOVE_EVS_DUPLICATES
		void Inac_swtch_ematch_fx(
		Word16 exc2[], /* i/o: CELP/GSC excitation buffer Q_exc*/
		Word16 dct_exc_tmp[], /* i : GSC excitation in DCT domain */
		@@ -155,8 +157,7 @@ void Inac_swtch_ematch_fx(

		return;
		}


		#endif
		void Inac_switch_ematch_ivas_fx(
		Word16 exc2[], /* i/o: CELP/GSC excitation buffer Q_exc*/
		Word16 dct_exc_tmp[], /* i : GSC excitation in DCT domain */

lib_com/prot_fx.h

+22 −10

Original line number	Diff line number	Diff line
		@@ -4776,6 +4776,7 @@ Word16 BITS_ALLOC_config_acelp(
		const Word16 narrowband,
		const Word16 nb_subfr );

		#ifndef REMOVE_EVS_DUPLICATES3
		ivas_error config_acelp1(
		const Word16 enc_dec, /* i : encoder/decoder flag */
		const Word32 total_brate, /* i : total bitrate */
		@@ -4802,7 +4803,7 @@ ivas_error config_acelp1(
		const Word16 tdm_LRTD_flag, /* i : LRTD stereo mode flag */
		const Word16 GSC_IVAS_mode /* i : GSC IVAS mode */
		);

		#endif
		Word16 set_ACELP_flag(
		const Word16 element_mode, /* i : element mode */
		const Word32 element_brate, /* i : element bitrate */
		@@ -5762,6 +5763,7 @@ void tcx_ltp_post32(
		Word32 tcx_buf, / sig_q */
		Word16 sig_q );

		#ifndef REMOVE_EVS_DUPLICATES3
		// gs_inact_switching_fx.c
		void Inac_swtch_ematch_fx(
		Word16 exc2[], /* i/o: CELP/GSC excitation buffer Q_exc*/
		@@ -5777,6 +5779,7 @@ void Inac_swtch_ematch_fx(
		const short last_core, /* i : Last core used */
		const short last_codec_mode /* i : Last codec mode */
		);
		#endif

		void Inac_switch_ematch_ivas_fx(
		Word16 exc2[], /* i/o: CELP/GSC excitation buffer Q_exc*/
		@@ -6035,6 +6038,7 @@ void td_bwe_dec_init_fx(
		const Word32 output_Fs /* i : output sampling rate */
		);

		#ifndef REMOVE_EVS_DUPLICATES3
		// lsf_dec_fx.c
		void lsf_dec_fx(
		Decoder_State st_fx, / i/o: State structure */
		@@ -6048,7 +6052,7 @@ void lsf_dec_fx(
		,
		const Word16 tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel Qx*/
		);

		#endif
		void lsf_dec_ivas_fx(
		Decoder_State st_fx, / i/o: State structure */
		const Word16 tc_subfr, /* i : TC subframe index Q0*/
		@@ -6204,6 +6208,7 @@ void lsf_mid_dec_fx(
		Word16 lsp_mid[] /* o : quantized LSPs Q15*/
		);

		#ifndef REMOVE_EVS_DUPLICATES3
		// cng_dec_fx.c
		void CNG_dec_fx(
		Decoder_State st_fx, / i/o: State structure */
		@@ -6214,7 +6219,7 @@ void CNG_dec_fx(
		Word16 allow_cn_step, / o : allow CN step Q0 */
		Word16 sid_bw, / i : 0-NB/WB, 1-SWB SID Q0 */
		Word32 *q_env );

		#endif
		void CNG_dec_ivas_fx(
		Decoder_State st_fx, / i/o: State structure */
		const Word16 last_element_mode, /* i : last element mode Q0 */
		@@ -6819,6 +6824,7 @@ void PulseResynchronization_fx(
		Word32 /float/ const pitchEnd /i Q16/
		);

		#ifndef REMOVE_EVS_DUPLICATES3
		// gs_dec_fx.c
		void decod_audio_fx(
		Decoder_State st_fx, / i/o: decoder static memory */
		@@ -6833,7 +6839,7 @@ void decod_audio_fx(
		,
		Word16 gain_buf /Q14*/
		);

		#endif
		void decod_audio_ivas_fx(
		Decoder_State st_fx, / i/o: decoder static memory */
		Word16 dct_epit[], /* o : GSC excitation in DCT domain Qx*/
		@@ -6852,6 +6858,7 @@ void decod_audio_ivas_fx(
		const Word16 tdm_Pri_pitch_buf[] /* i : primary channel pitch buffer Q6*/
		);

		#ifndef REMOVE_EVS_DUPLICATES3
		void gsc_dec_fx(
		Decoder_State st_fx, / i/o: State structure */
		Word16 exc_dct_in[], /* i/o: dct of pitch-only excitation / total excitation Q_exc*/
		@@ -6864,7 +6871,7 @@ void gsc_dec_fx(
		const Word16 lsf_new, / i : ISFs at the end of the frame Qx*/
		Word16 exc_wo_nf, / o : excitation (in f domain) without noisefill Q_exc*/
		Word16 Q_exc );

		#endif
		void gsc_dec_ivas_fx(
		Decoder_State st_fx, / i/o: State structure */
		Word16 exc_dct_in[], /* i/o: dct of pitch-only excitation / total excitation Q_exc*/
		@@ -7080,6 +7087,7 @@ void re8_PPV_fx(
		Word16 y[] /* o : point in RE8 (8-dimensional integer vector) Q0 */
		);

		#ifndef REMOVE_EVS_DUPLICATES3
		// dec_pit_exc_fx.c
		void dec_pit_exc_fx(
		Decoder_State st_fx, / i/o: decoder static memory */
		@@ -7099,7 +7107,7 @@ void dec_pit_exc_fx(
		const Word16 tdm_Pri_pitch_buf[] /* i : primary channel pitch buffer */
		#endif
		);

		#endif
		void dec_pit_exc_ivas_fx(
		Decoder_State st_fx, / i/o: decoder static memory */
		const Word16 Aq_fx, / i : LP filter coefficient */
		@@ -7539,6 +7547,7 @@ void configureFdCngDec_fx(
		const Word16 Last_L_frame,
		const Word16 element_mode );

		#ifndef REMOVE_EVS_DUPLICATES3
		/* Apply the CLDFB-based CNG */
		Word16 ApplyFdCng_fx(
		Word16 timeDomainInput, / i : pointer to time domain i */
		@@ -7552,7 +7561,7 @@ Word16 ApplyFdCng_fx(
		Decoder_State *st,
		const Word16 concealWholeFrame, /* i : binary flag indicating frame loss */
		Word16 is_music );

		#endif
		Word16 ApplyFdCng_ivas_fx(
		Word16 timeDomainInput, / i : pointer to time domain input */
		Word16 Q,
		@@ -8185,6 +8194,7 @@ void FEC_pitch_estim_fx(
		Word16 element_mode /* i : element mode */
		);

		#ifndef REMOVE_EVS_DUPLICATES3
		// FEC_scale_sync_fx.c
		void FEC_scale_syn_fx(
		const Word16 L_frame, /* i : length of the frame */
		@@ -8215,7 +8225,7 @@ void FEC_scale_syn_fx(
		const Word16 avoid_lpc_burst_on_recovery, /* i : if true the excitation energy is limited if LP has big gain */
		const Word16 force_scaling /* i: force scaling */
		);

		#endif
		void FEC_scale_syn_ivas_fx(
		const Word16 L_frame, /* i : length of the frame */
		Word16 update_flg, / o: flag indicating re-synthesis after scaling*/
		@@ -8532,6 +8542,7 @@ Word16 FEC_synchro_exc_fx( /* o : do_WI flag
		const Word16 Old_pitch /* i : Pitch use to create temporary adaptive codebook */
		);

		#ifndef REMOVE_EVS_DUPLICATES3
		// dec_uv_fx.c
		void decod_unvoiced_fx(
		Decoder_State st_fx, / i/o: decoder static memory */
		@@ -8544,7 +8555,7 @@ void decod_unvoiced_fx(
		Word16 exc2_fx, / Q_X o : adapt. excitation/total exc */
		Word16 bwe_exc_fx, / Q_X i/o: excitation for SWB TBE */
		Word16 *gain_buf );

		#endif
		void decod_unvoiced_ivas_fx(
		Decoder_State st_fx, / i/o: decoder static memory */
		const Word16 Aq_fx, / Q12 i : LP filter coefficient */
		@@ -8588,6 +8599,7 @@ void gaus_L2_dec(
		Word16 seed_acelp /i/o : random seed Q0 */
		);

		#ifndef REMOVE_EVS_DUPLICATES3
		// dec_gen_voic_fx.c
		ivas_error decod_gen_voic_fx(
		Decoder_State st_fx, / i/o: decoder static memory */
		@@ -8604,7 +8616,7 @@ ivas_error decod_gen_voic_fx(
		Word16 unbits, / number of unused bits */
		Word16 gain_buf /Q14*/
		);

		#endif
		ivas_error decod_gen_voic_ivas_fx(
		Decoder_State st_fx, / i/o: decoder static memory */
		const Word16 L_frame, /* i : length of the frame */

lib_dec/FEC_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -511,6 +511,9 @@ void FEC_exc_estim_fx(
		/* st_fx->L_frame / L_SUBFR */
		tmp = shr( st_fx->L_frame, 6 );
		/* Replication of the last spectrum, with a slight downscaling of its dynamic */
		#ifdef REMOVE_EVS_DUPLICATES
		gsc_dec_ivas_fx( st_fx, exc_dct_in, hGSCDec->Last_GSC_pit_band_idx, Diff_len, 0, tmp, st_fx->last_coder_type, &last_bin_fx, lsf_new, NULL, &st_fx->Q_exc );
		#else
		IF( st_fx->element_mode == EVS_MONO )
		{
		gsc_dec_fx( st_fx, exc_dct_in, hGSCDec->Last_GSC_pit_band_idx, Diff_len, 0, tmp, st_fx->last_coder_type, &last_bin_fx, lsf_new, NULL, st_fx->Q_exc );
		@@ -519,6 +522,7 @@ void FEC_exc_estim_fx(
		{
		gsc_dec_ivas_fx( st_fx, exc_dct_in, hGSCDec->Last_GSC_pit_band_idx, Diff_len, 0, tmp, st_fx->last_coder_type, &last_bin_fx, lsf_new, NULL, &st_fx->Q_exc );
		}
		#endif
		tmp_noise = shr_r( st_fx->lp_gainc_fx, 3 ); /Q0*/
		move16();
		/* Transform back to time domain */

lib_dec/FEC_scale_syn_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		/* _ None */
		/========================================================================/

		#ifndef REMOVE_EVS_DUPLICATES
		void FEC_scale_syn_fx(
		const Word16 L_frame, /* i : length of the frame */
		Word16 update_flg, / o: flag indicating re-synthesis after scaling*/
		@@ -614,7 +615,7 @@ void FEC_scale_syn_fx(

		return;
		}

		#endif
		void FEC_scale_syn_ivas_fx(
		const Word16 L_frame, /* i : length of the frame */
		Word16 update_flg, / o: flag indicating re-synthesis after scaling*/