Merge branch 'scalings_cleanup_synth_state_buffs' into 'main' (692a0e38) · Commits · SA4 / Audio / IVAS BASOP

lib_com/cldfb.c

+83 −30

Original line number	Diff line number	Diff line
		@@ -400,8 +400,13 @@ void cldfbAnalysis_ts_fx(
		rr12_fx = L_sub( r1_fx, r2_fx ); // q -1
		ri12_fx = L_negate( L_add( i1_fx, i2_fx ) ); // q - 1
		/cplxMult(&rBuffer[2k],&rBuffer[2k+1],rr12,ri12,rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		rBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), ri12_fx, rot_vctr_im_fx[k] ); // q - 3
		rBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), ri12_fx, rot_vctr_re_fx[k] ); // q - 3
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		rBuffer_fx[2 * k] = L_sub( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_im_fx[k] ) ); // q - 3
		rBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_re_fx[k] ) ); // q - 3
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();

		@@ -409,8 +414,13 @@ void cldfbAnalysis_ts_fx(
		ir12_fx = L_add( r1_fx, r2_fx ); // q - 1
		ii12_fx = L_sub( i1_fx, i2_fx ); // q - 1
		/cplxMult(&iBuffer[2k],&iBuffer[2k+1],ir12,ii12,rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		iBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), ii12_fx, rot_vctr_im_fx[k] ); // q - 3
		iBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), ii12_fx, rot_vctr_re_fx[k] ); // q - 3
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		iBuffer_fx[2 * k] = L_sub( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_im_fx[k] ) ); // q - 3
		iBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_re_fx[k] ) ); // q - 3
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();
		}
		@@ -451,8 +461,13 @@ void cldfbAnalysis_ts_fx(
		rr12_fx = L_add( r1_fx, r2_fx ); // q - 1
		ri12_fx = L_sub( i1_fx, i2_fx ); // q - 1
		/cplxMult(&rBuffer[2k],&rBuffer[2k+1],rr12,ri12,rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		rBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), ri12_fx, rot_vctr_im_fx[k] ); // q - 3
		rBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), ri12_fx, rot_vctr_re_fx[k] ); // q - 3
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		rBuffer_fx[2 * k] = L_sub( Mpy_32_32( rr12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_im_fx[k] ) ); // q - 3
		rBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( rr12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ri12_fx, rot_vctr_re_fx[k] ) ); // q - 3
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();

		@@ -460,8 +475,13 @@ void cldfbAnalysis_ts_fx(
		ir12_fx = L_sub( r1_fx, r2_fx ); // q - 1
		ii12_fx = L_add( i1_fx, i2_fx ); // q - 1
		/cplxMult(&iBuffer[2k],&iBuffer[2k+1],ir12,ii12,rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		iBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), ii12_fx, rot_vctr_im_fx[k] ); // q - 3
		iBuffer_fx[2 * k + 1] = Madd_32_32( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), ii12_fx, rot_vctr_re_fx[k] ); // q - 3
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		iBuffer_fx[2 * k] = L_sub( Mpy_32_32( ir12_fx, rot_vctr_re_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_im_fx[k] ) ); // q - 3
		iBuffer_fx[2 * k + 1] = L_add( Mpy_32_32( ir12_fx, rot_vctr_im_fx[k] ), Mpy_32_32( ii12_fx, rot_vctr_re_fx[k] ) ); // q - 3
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();
		}
		@@ -490,8 +510,13 @@ void cldfbAnalysis_ts_fx(
		FOR( k = 0; k < M2; k++ )
		{
		/cplxMult(&realBuffer[M1-1-(2k)],&realBuffer[2k],rBuffer[2k],rBuffer[2k+1],rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		realBuffer_fx[( ( M1 - 1 ) - ( k * 2 ) )] = Msub_32_32( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_re_fx[k] ), rBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ); // q - 5
		realBuffer_fx[2 * k] = Madd_32_32( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_im_fx[k] ), rBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ); // q - 5
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		realBuffer_fx[( ( M1 - 1 ) - ( k * 2 ) )] = L_sub( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_re_fx[k] ), Mpy_32_32( rBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ) ); // q - 5
		realBuffer_fx[2 * k] = L_add( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_im_fx[k] ), Mpy_32_32( rBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ) ); // q - 5
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();
		}
		@@ -520,8 +545,13 @@ void cldfbAnalysis_ts_fx(
		{
		/* do it inplace */
		/cplxMult(&imagBuffer[2k],&imagBuffer[M1-1-(2k)],iBuffer[2k],iBuffer[2k+1],rot_vctr_re[k],rot_vctr_im[k]);/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		imagBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ); // q - 5
		imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = Madd_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ); // q - 5
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		imagBuffer_fx[2 * k] = L_sub( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), Mpy_32_32( iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ) ); // q - 5
		imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = L_add( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), Mpy_32_32( iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ) ); // q - 5
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		move32();
		move32();
		}
		@@ -542,8 +572,13 @@ void cldfbAnalysis_ts_fx(
		/cplxMult(&realBuffer[k], &imagBuffer[k], realBuffer[k], imagBuffer[k], rot_vctr_delay_re[k], rot_vctr_delay_im[k]);/
		/*realBuffer[k] = rBuffer[k];
		imagBuffer[k] = iBuffer[k];*/
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		cplx_aux_fx = Msub_32_32( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_re_fx[k] ), imagBuffer_fx[k], rot_vctr_delay_im_fx[k] ); // q - 5
		imagBuffer_fx[k] = Madd_32_32( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_im_fx[k] ), imagBuffer_fx[k], rot_vctr_delay_re_fx[k] ); // q - 5
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		cplx_aux_fx = L_sub( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_re_fx[k] ), Mpy_32_32( imagBuffer_fx[k], rot_vctr_delay_im_fx[k] ) ); // q - 5
		imagBuffer_fx[k] = L_add( Mpy_32_32( realBuffer_fx[k], rot_vctr_delay_im_fx[k] ), Mpy_32_32( imagBuffer_fx[k], rot_vctr_delay_re_fx[k] ) ); // q - 5
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		realBuffer_fx[k] = cplx_aux_fx;
		move32();
		move32();
		@@ -1091,6 +1126,7 @@ void cldfbAnalysis_ts_fx_fixed_q(

		return;
		}

		/-------------------------------------------------------------------
		* cldfbSynthesis_ivas()
		*
		@@ -1102,6 +1138,9 @@ void cldfbSynthesis_ivas_fx(
		Word32 timeOut_fx, / o : output time domain samples Qx - 1*/
		const Word16 samplesToProcess, /* i : number of processed samples */
		const Word16 shift, /* i : scale for state buffer */
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		const Word16 out_shift, /* i : scale for output buffer */
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		HANDLE_CLDFB_FILTER_BANK h_cldfb /* i : filter bank state */
		)
		{
		@@ -1295,11 +1334,11 @@ void cldfbSynthesis_ivas_fx(
		FOR( i = 0; i < L2; i++ )
		{
		Word32 prod = L_shl_sat( Mpy_32_16_1( new_samples_fx[L2 - 1 - i], p_filter_sf ), shift );
		accu0 = Madd_32_16( synthesisBuffer_fx[i], prod, p_filter[i] ); // Qx - 1
		accu1 = Madd_32_16( synthesisBuffer_fx[1 * L2 + i], prod, p_filter[( 1 * L2 + i )] ); // Qx - 1
		accu2 = Madd_32_16( synthesisBuffer_fx[2 * L2 + i], prod, p_filter[( 2 * L2 + i )] ); // Qx - 1
		accu3 = Madd_32_16( synthesisBuffer_fx[3 * L2 + i], prod, p_filter[( 3 * L2 + i )] ); // Qx - 1
		accu4 = Madd_32_16( synthesisBuffer_fx[4 * L2 + i], prod, p_filter[( 4 * L2 + i )] ); // Qx - 1
		accu0 = Madd_32_16( synthesisBuffer_fx[i], prod, p_filter[i] ); // Qx -1 + shift
		accu1 = Madd_32_16( synthesisBuffer_fx[1 * L2 + i], prod, p_filter[( 1 * L2 + i )] ); // Qx -1 + shift
		accu2 = Madd_32_16( synthesisBuffer_fx[2 * L2 + i], prod, p_filter[( 2 * L2 + i )] ); // Qx -1 + shift
		accu3 = Madd_32_16( synthesisBuffer_fx[3 * L2 + i], prod, p_filter[( 3 * L2 + i )] ); // Qx -1 + shift
		accu4 = Madd_32_16( synthesisBuffer_fx[4 * L2 + i], prod, p_filter[( 4 * L2 + i )] ); // Qx -1 + shift

		synthesisBuffer_fx[i] = accu0;
		move32();
		@@ -1314,11 +1353,26 @@ void cldfbSynthesis_ivas_fx(
		}
		}

		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		IF( 0 == out_shift )
		{
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		FOR( i = 0; i < M1; i++ )
		{
		ptr_time_out_fx[( M1 - 1 ) - i] = synthesisBuffer_fx[4 * L2 + M1 + i];
		move32();
		}
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		}
		ELSE
		{
		FOR( i = 0; i < M1; i++ )
		{
		ptr_time_out_fx[( M1 - 1 ) - i] = L_shl_sat( synthesisBuffer_fx[4 * L2 + M1 + i], out_shift );
		move32();
		}
		}
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */

		ptr_time_out_fx += M1;

		@@ -1333,7 +1387,6 @@ void cldfbSynthesis_ivas_fx(
		return;
		}


		void configureCldfb_ivas_enc_fx(
		HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i/o: filter bank handle */
		const Word32 sampling_rate /* i : sampling rate */

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@

		/* Note: each compile switch (FIX_1101_...) is independent from the other ones */
		//#define OPT_STEREO_32KBPS_V1 /* Optimization made in stereo decoding path for 32kbps decoding */
		#define OPT_AVOID_STATE_BUF_RESCALE /* Optimization made to avoid rescale of synth state buffer */
		#define FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx /FhG: WMOPS tuning, nonbe/
		#define FIX_1310_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot /FhG: WMOPS tuning, nonbe/
		#endif

lib_com/prot_fx.h

+8 −5

Original line number	Diff line number	Diff line
		@@ -9745,6 +9745,9 @@ void cldfbSynthesis_ivas_fx(
		Word32 timeOut_fx, / o : output time domain samples Qx - 1*/
		const Word16 samplesToProcess, /* i : number of processed samples */
		const Word16 shift, /* i : scale for state buffer */
		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		const Word16 out_shift, /* i : scale for output buffer */
		#endif
		HANDLE_CLDFB_FILTER_BANK h_cldfb /* i : filter bank state */
		);

lib_dec/acelp_core_dec_ivas_fx.c

+28 −1

Original line number	Diff line number	Diff line
		@@ -1807,6 +1807,7 @@ ivas_error acelp_core_dec_ivas_fx(
		scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
		scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_imag ); // Q_imag
		}
		#ifndef OPT_AVOID_STATE_BUF_RESCALE
		#ifdef OPT_STEREO_32KBPS_V1
		scale_sig32( st->cldfbSynHB->cldfb_state_fx, st->cldfbSynHB->p_filter_length, sub( Q_real, Q11 ) ); // Q10 - > (Q_real-1)
		#else /* OPT_STEREO_32KBPS_V1 */
		@@ -1814,6 +1815,7 @@ ivas_error acelp_core_dec_ivas_fx(
		#endif /* OPT_STEREO_32KBPS_V1 */
		st->cldfbSynHB->Q_cldfb_state = sub( Q_real, 1 );
		move16();
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */

		FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
		{
		@@ -1833,12 +1835,18 @@ ivas_error acelp_core_dec_ivas_fx(
		}
		}

		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, save_hb_synth_fx, -1, sub( Q11, Q_real ), -10, st->cldfbSynHB );
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, save_hb_synth_fx, -1, 0, st->cldfbSynHB );
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */

		#ifndef OPT_AVOID_STATE_BUF_RESCALE
		Scale_sig32( save_hb_synth_fx, L_FRAME48k, negate( ( sub( Q_real, 1 ) ) ) ); // Q0
		Scale_sig32( st->cldfbSynHB->cldfb_state_fx, st->cldfbSynHB->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
		st->cldfbSynHB->Q_cldfb_state = Q10;
		move16();
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		/* restore lowband */
		FOR( j = 0; j < CLDFB_NO_CHANNELS_MAX; j++ )
		{
		@@ -1850,14 +1858,21 @@ ivas_error acelp_core_dec_ivas_fx(
		move32();
		}
		}
		#ifndef OPT_AVOID_STATE_BUF_RESCALE
		Scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( sub( Q_real, 1 ), Q10 ) ); // Q_real-1
		st->cldfbSynHB->Q_cldfb_state = sub( Q_real, 1 );
		move16();
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */

		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		cldfbSynthesis_ivas_fx( pRealSave_fx, pImagSave_fx, synth_fx, -1, sub( Q11, Q_real ), -10, st->cldfbSyn );
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		cldfbSynthesis_ivas_fx( pRealSave_fx, pImagSave_fx, synth_fx, -1, 0, st->cldfbSyn );
		Scale_sig32( synth_fx, L_FRAME48k, negate( sub( Q_real, 1 ) ) ); // Q0
		Scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
		st->cldfbSynHB->Q_cldfb_state = Q10;
		move16();
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		}
		ELSE
		{
		@@ -1897,7 +1912,11 @@ ivas_error acelp_core_dec_ivas_fx(
		st->cldfbSyn->Q_cldfb_state = sub( Q_real, 1 );
		move16();

		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx, -1, 0, 0, st->cldfbSyn );
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx, -1, 0, st->cldfbSyn );
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		scale_sig32( synth_fx, output_frame, negate( sub( Q_real, 1 ) ) ); // Q0
		scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
		st->cldfbSyn->Q_cldfb_state = Q10;
		@@ -1985,18 +2004,26 @@ ivas_error acelp_core_dec_ivas_fx(
		scale_sig32( realBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
		scale_sig32( imagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX, Q_real ); // Q_real
		}
		#ifndef OPT_AVOID_STATE_BUF_RESCALE
		#ifdef OPT_STEREO_32KBPS_V1
		scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q_real, Q11 ) ); // Q10 - > (Q_real-1)
		#else /* OPT_STEREO_32KBPS_V1 */
		scale_sig32_r( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( sub( Q_real, 1 ), Q10 ) ); //(Q_real - 1)
		#endif /* OPT_STEREO_32KBPS_V1 */
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */

		#ifdef OPT_AVOID_STATE_BUF_RESCALE
		cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx /dummy/, NS2SA_FX2( st->output_Fs, FRAME_SIZE_NS /DELAY_CLDFB_NS/ ), sub( Q10, sub( Q_real, 1 ) ), -10, st->cldfbSyn );
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		cldfbSynthesis_ivas_fx( realBuffer_fx, imagBuffer_fx, synth_fx /dummy/, NS2SA_FX2( st->output_Fs, FRAME_SIZE_NS /DELAY_CLDFB_NS/ ), 0, st->cldfbSyn );
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */

		#ifndef OPT_AVOID_STATE_BUF_RESCALE
		Scale_sig32( synth_fx, output_frame, negate( sub( Q_real, 1 ) ) ); // Q0
		Scale_sig32( st->cldfbSyn->cldfb_state_fx, st->cldfbSyn->p_filter_length, sub( Q10, sub( Q_real, 1 ) ) ); // Q10
		st->cldfbSyn->Q_cldfb_state = Q10;
		move16();
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */
		IF( st->p_bpf_noise_buf_32 )
		{
		Copy_Scale_sig_16_32_DEPREC( bpf_error_signal_16fx, bpf_error_signal_fx, st->L_frame, -1 ); // Q_syn-1

lib_dec/acelp_core_switch_dec_fx.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -832,16 +832,25 @@ ivas_error acelp_core_switch_dec_bfi_ivas_fx(
		}
		/*cldfbSynthesis_fx( st_fx->cldfbSyn, realBuffer, imagBuffer, &scaleFactor, synth_out,
		negate(st_fx->Q_syn), CLDFB_NO_COL_MAX_SWITCH_BFI, workBuffer );*/
		#ifndef OPT_AVOID_STATE_BUF_RESCALE
		Scale_sig32( st_fx->cldfbSyn->cldfb_state_fx, st_fx->cldfbSyn->cldfb_state_length, 1 ); // Q_cldfb_state+1
		st_fx->cldfbSyn->Q_cldfb_state = add( st_fx->cldfbSyn->Q_cldfb_state, 1 );
		move16();
		Copy_Scale_sig_16_32_DEPREC( synth_out, synth32, L_FRAME48k, 5 ); /11-5-1/

		cldfbSynthesis_ivas_fx( realBuffer, imagBuffer, synth32, extract_l( Mpy_32_16_1( st_fx->output_Fs, 328 ) ), 0, st_fx->cldfbSyn );
		#else /* OPT_AVOID_STATE_BUF_RESCALE */
		Word16 out_len = extract_l( Mpy_32_16_1( st_fx->output_Fs, 328 ) );
		cldfbSynthesis_ivas_fx( realBuffer, imagBuffer, synth32, out_len, -1, 0, st_fx->cldfbSyn );
		Copy_Scale_sig_32_16( synth32, synth_out, out_len, -4 );
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */

		#ifndef OPT_AVOID_STATE_BUF_RESCALE
		Scale_sig32( st_fx->cldfbSyn->cldfb_state_fx, st_fx->cldfbSyn->cldfb_state_length, -1 ); // Q_cldfb_state-1
		st_fx->cldfbSyn->Q_cldfb_state = sub( st_fx->cldfbSyn->Q_cldfb_state, 1 );
		move16();
		Copy_Scale_sig_32_16( synth32, synth_out, L_FRAME48k, -5 ); // 11-5-1 -> 11
		#endif /* OPT_AVOID_STATE_BUF_RESCALE */

		// Scale_sig( synth_out, L_FRAME48k, negate( st_fx->Q_syn ) );

Admin message