harmonize HQ struct members + cleaning in stat_dec.h (65c894a0) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot_fx.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -6562,7 +6562,7 @@ void TonalMDCTConceal_SaveFreqSignal_ivas_fx(
		const Word16 gain_tcx_exp,
		const Word16 infoIGFStartLine );

		TONALMDCTCONCEAL_ERROR TonalMDCTConceal_UpdateState(
		void TonalMDCTConceal_UpdateState(
		TonalMDCTConcealPtr self,
		Word16 nNewSamples,
		Word32 pitchLag,
		@@ -9602,7 +9602,7 @@ ivas_error acelp_core_dec_fx(
		ivas_error evs_dec_fx(
		Decoder_State st_fx, / i/o : Decoder state structure */
		Word16 output_sp[], /* o : output synthesis signal */
		frameMode_fx frameMode /* i : Decoder frame mode */
		FRAME_MODE frameMode /* i : Decoder frame mode */
		);

		void fft_cldfb_fx(

+0 −15

Original line number	Diff line number	Diff line
		@@ -693,21 +693,6 @@ typedef enum
		/---------------------------------------------------------------
		* IGF *
		---------------------------------------------------------------/
		/----------------------------------------------------------------------------------
		* NB postfilter / formant postfilter static variables
		----------------------------------------------------------------------------------/
		typedef struct pfstat_structure
		{
		Word16 on; /* On/off flag */
		Word16 reset; /* reset flag */
		Word16 mem_pf_in[L_SUBFR]; /* Input memory Qqmem_pf_in */
		Word16 mem_stp[L_SUBFR]; /* 1/A(gamma1) memory Qqmem_stp*/
		Word16 mem_res2[DECMEM_RES2]; /* A(gamma2) residual Q_syn*/
		Word16 mem_zero[M]; /* null memory to compute i.r. of A(gamma2)/A(gamma1) Q_qmem_zero*/
		Word16 gain_prec; /Q14/ /* for gain adjustment */

		} PFSTAT, *PFSTAT_HANDLE;


		typedef struct
		{

+4 −4

Original line number	Diff line number	Diff line
		@@ -2315,7 +2315,7 @@ ivas_error core_switching_pre_dec_ivas_fx(
		st->hHQ_core->last_max_pos_pulse = 0;
		move16();

		set16_fx( st->hHQ_core->prev_SWB_peak_pos, 0, SPT_SHORTEN_SBNUM );
		set16_fx( st->hHQ_core->prev_SWB_peak_pos_fx, 0, SPT_SHORTEN_SBNUM );
		st->hHQ_core->prev_frm_hfe2 = 0;
		st->hHQ_core->prev_stab_hfe2 = 0;
		move16();
		@@ -2681,7 +2681,7 @@ ivas_error core_switching_pre_dec_ivas_fx(
		st->hHQ_core->last_max_pos_pulse = 0;
		move16();

		set16_fx( st->hHQ_core->prev_SWB_peak_pos, 0, SPT_SHORTEN_SBNUM );
		set16_fx( st->hHQ_core->prev_SWB_peak_pos_fx, 0, SPT_SHORTEN_SBNUM );
		st->hHQ_core->prev_frm_hfe2 = 0;
		st->hHQ_core->prev_stab_hfe2 = 0;
		move16();
		@@ -2702,7 +2702,7 @@ ivas_error core_switching_pre_dec_ivas_fx(
		IF( NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) )
		{
		set16_fx( st->hHQ_core->old_out_fx, 0, output_frame );
		set32_fx( st->hHQ_core->old_outLB_fx, 0, L_FRAME16k );
		set32_fx( st->hHQ_core->old_out_LB_fx32, 0, L_FRAME16k );
		set16_fx( st->hHQ_core->old_out_LB_fx, 0, L_FRAME16k );
		}

		@@ -2724,7 +2724,7 @@ ivas_error core_switching_pre_dec_ivas_fx(
		ELSE
		{
		set16_fx( st->hHQ_core->old_out_fx, 0, output_frame );
		set32_fx( st->hHQ_core->old_outLB_fx, 0, L_FRAME16k );
		set32_fx( st->hHQ_core->old_out_LB_fx32, 0, L_FRAME16k );
		}
		}

+7 −7

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		ivas_error evs_dec_fx(
		Decoder_State st_fx, / i/o : Decoder state structure */
		Word16 output_sp[], /* o : output synthesis signal Q0*/
		frameMode_fx frameMode /* i : Decoder frame mode */
		FRAME_MODE frameMode /* i : Decoder frame mode */
		)
		{
		Word16 i, j, output_frame;
		@@ -863,16 +863,16 @@ ivas_error evs_dec_fx(
		IF( ( EQ_16( st_fx->bwidth, SWB ) \|\| EQ_16( st_fx->bwidth, FB ) ) &&
		( ( EQ_16( st_fx->last_extl, SWB_TBE ) \|\| EQ_16( st_fx->last_extl, FB_TBE ) ) && EQ_16( st_fx->last_codec_mode, MODE2 ) ) )
		{
		GenTransition_fx( st_fx->hBWE_TD, hb_synth_fx, st_fx->output_Fs, st_fx->rf_flag, st_fx->total_brate );
		GenTransition_fx( hBWE_TD, hb_synth_fx, st_fx->output_Fs, st_fx->rf_flag, st_fx->total_brate );

		hb_synth_fx_exp = st_fx->hBWE_TD->prev_Q_bwe_syn2;
		hb_synth_fx_exp = hBWE_TD->prev_Q_bwe_syn2;
		move16();
		}
		ELSE IF( EQ_16( st_fx->bwidth, WB ) && EQ_16( st_fx->last_extl, WB_TBE ) )
		{
		GenTransition_WB_fx( st_fx->hBWE_TD, hb_synth_fx, st_fx->output_Fs );
		GenTransition_WB_fx( hBWE_TD, hb_synth_fx, st_fx->output_Fs );

		hb_synth_fx_exp = st_fx->hBWE_TD->prev_Qx;
		hb_synth_fx_exp = hBWE_TD->prev_Qx;
		move16();
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -1201,17 +1201,15 @@ void HQ_core_dec_init_fx(
		)
		{
		set16_fx( hHQ_core->old_out_fx, 0, L_FRAME48k );
		set32_fx( hHQ_core->old_out_fx32, 0, L_FRAME48k );
		set16_fx( hHQ_core->old_out_LB_fx, 0, L_FRAME32k );
		set32_fx( hHQ_core->oldOut_fx, 0, L_FRAME48k );
		set32_fx( hHQ_core->old_outLB_fx, 0, L_FRAME32k );
		set32_fx( hHQ_core->old_out_LB_fx32, 0, L_FRAME32k );
		hHQ_core->Q_old_wtda = 15;
		hHQ_core->Q_old_postdec = 0;
		hHQ_core->Q_old_wtda_LB = 0;
		move16();
		move16();
		move16();
		move16();
		move16();

		hHQ_core->last_hq_core_type = -1; /* Q0 */
		move16();