swb_tbe_com: coments (2294ff5f) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot_fx.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -3285,7 +3285,11 @@ void synthesise_fb_high_band_fx(
		Word16 prev_fbbwe_ratio, / o : previous frame energy for FEC */
		Word32 bpf_memory[][4], /* i/o: memory for elliptic bpf 48k */
		Word16 bpf_memory_Q[],
		Word16 Qout );
		Word16 Qout
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		, Word16 isIVAS
		#endif
		);

		void prep_tbe_exc_fx(
		const Word16 L_frame_fx, /* i : length of the frame */

lib_com/swb_tbe_com_fx.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -6926,9 +6926,9 @@ void elliptic_bpf_48k_generic_fx(

		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		L_tmpMax = L_add( 0, 0 );
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1 /use subfunc/
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1
		elliptic_bpf_48k_generic_func1( input_fx, L_tmp, &full_band_bpf_fx[0], IsUpsampled3, 0 );
		#else
		#else /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1/
		IF( !IsUpsampled3 )
		{
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		@@ -7103,9 +7103,9 @@ void elliptic_bpf_48k_generic_fx(

		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		L_tmpMax = L_add( 0, 0 );
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1 /use subfunc/
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1
		elliptic_bpf_48k_generic_func1( L_tmp, L_tmp2, &full_band_bpf_fx[1], 0, &L_tmpMax );
		#else
		#else /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1/
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		FOR( i = 0; i < L_FRAME48k; i++ )
		{
		@@ -7226,7 +7226,7 @@ void elliptic_bpf_48k_generic_fx(
		L_tmpMax = L_add( 0, 0 );
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1 /use subfunc/
		elliptic_bpf_48k_generic_func1( L_tmp2, L_output, &full_band_bpf_fx[2], 0, &L_tmpMax );
		#else
		#else /FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1/
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		FOR( i = 0; i < L_FRAME48k; i++ )
		{
		@@ -7396,7 +7396,11 @@ void synthesise_fb_high_band_fx(
		Word16 prev_fbbwe_ratio, / o : previous frame energy for FEC */
		Word32 bpf_memory[][4], /* i/o: memory for elliptic bpf 48k */
		Word16 bpf_memory_Q[],
		Word16 Qout )
		Word16 Qout
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		, Word16 isIVAS
		#endif
		)
		{
		Word16 i, j;
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		@@ -7431,7 +7435,7 @@ void synthesise_fb_high_band_fx(
		/* for 16kHz ACELP core */
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1 // isIVAS
		isIVAS
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		1, // IsUpsampled3
		@@ -7445,7 +7449,7 @@ void synthesise_fb_high_band_fx(
		/* for 12.8kHz ACELP core */
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1 // isIVAS
		isIVAS
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		1, // IsUpsampled3

lib_dec/swb_tbe_dec_fx.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -4644,7 +4644,11 @@ void fb_tbe_dec_fx(
		fb_exc_energy = sum2_fx_mod( fb_exc, L_FRAME16k );

		/* FB TBE synthesis */
		synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp );
		synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		,0 /isIVAS/
		#endif
		);

		/* add the fb_synth component to the hb_synth component */
		/* v_add_fx( hb_synth, fb_synth, hb_synth, L_FRAME48k );*/
		@@ -4713,7 +4717,11 @@ void fb_tbe_dec_ivas_fx(
		fb_exc_energy = sum2_fx_mod( fb_exc, L_FRAME16k );

		/* FB TBE synthesis */
		synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp );
		synthesise_fb_high_band_fx( fb_exc, Q_fb_exc, fb_synth, fb_exc_energy, ratio, st->L_frame, st->bfi, &( hBWE_TD->prev_fbbwe_ratio_fx ), hBWE_TD->fbbwe_hpf_mem_fx, hBWE_TD->fbbwe_hpf_mem_fx_Q, hb_synth_exp
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		, Word16 1 /isIVAS/
		#endif
		);

		test();
		IF( GE_16( st->element_mode, IVAS_CPE_DFT ) && ( st->idchan == 0 ) )

lib_enc/swb_tbe_enc_fx.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -7332,7 +7332,7 @@ void fb_tbe_enc_fx(

		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1 // isIVAS
		0 // isIVAS - is this correct?
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		0, // IsUpsampled3
		@@ -7468,7 +7468,7 @@ void fb_tbe_enc_ivas_fx(
		{
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1 // isIVAS
		1 // isIVAS - is this corret?
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		0, // IsUpsampled3
		@@ -7479,7 +7479,7 @@ void fb_tbe_enc_ivas_fx(
		{
		elliptic_bpf_48k_generic_fx(
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2
		1 // isIVAS
		1 // isIVAS - is this correct?
		#endif
		#ifdef FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic
		0, // IsUpsampled3