rename the swicthes to be inline with the ticket number and split between BE... (ce0691f4) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_pca_tools_fx.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1375,7 +1375,7 @@ void pca_enc_s3_fx(

	q_ang_2surv_fx( ph1_fx, n1, ph1_q_fx, ind1 );		q_ang_2surv_fx( ph1_fx, n1, ph1_q_fx, ind1 );

	#ifdef IMPROV_PRECISION		#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
	tmp = mac_r( L_mac( L_mult( q_fx[1], q_fx[1] ), q_fx[2], q_fx[2] ), q_fx[3], q_fx[3] ); // Q15 + Q15 - Q15 -> Q15		tmp = mac_r( L_mac( L_mult( q_fx[1], q_fx[1] ), q_fx[2], q_fx[2] ), q_fx[3], q_fx[3] ); // Q15 + Q15 - Q15 -> Q15
	#else		#else
	tmp = add( add( mult( q_fx[1], q_fx[1] ), mult( q_fx[2], q_fx[2] ) ), mult( q_fx[3], q_fx[3] ) ); // Q15 + Q15 - Q15 -> Q15		tmp = add( add( mult( q_fx[1], q_fx[1] ), mult( q_fx[2], q_fx[2] ) ), mult( q_fx[3], q_fx[3] ) ); // Q15 + Q15 - Q15 -> Q15
	@@ -1433,7 +1433,7 @@ void pca_enc_s3_fx(
	q_ang_2surv_fx( ph2_fx, n2[i], ph2_q_fx + 2 * i, ind2 + 2 * i );		q_ang_2surv_fx( ph2_fx, n2[i], ph2_q_fx + 2 * i, ind2 + 2 * i );
	}		}

	#ifdef IMPROV_PRECISION		#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
	r_fx = Sqrt16( mac_r( L_mult( q_fx[2], q_fx[2] ), q_fx[3], q_fx[3] ), &r_e );		r_fx = Sqrt16( mac_r( L_mult( q_fx[2], q_fx[2] ), q_fx[3], q_fx[3] ), &r_e );
	#else		#else
	r_fx = Sqrt16( add( mult( q_fx[2], q_fx[2] ), mult( q_fx[3], q_fx[3] ) ), &r_e );		r_fx = Sqrt16( add( mult( q_fx[2], q_fx[2] ), mult( q_fx[3], q_fx[3] ) ), &r_e );

lib_com/options.h

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,7 @@
	#define FIX_2245_INIT_FD_CNG_EVS /* Dolby/VA: Issue 2245: initialize FD CNG with EVS-type of init function */		#define FIX_2245_INIT_FD_CNG_EVS /* Dolby/VA: Issue 2245: initialize FD CNG with EVS-type of init function */
	#define FIX_2252_SCALING_SAVE_HB_SYNTH /* VA: issue 2252: fix use-of-uninit-value in save_hb_synth_fx[] scaling in FOA decoding with bitstream that starts with an SID */		#define FIX_2252_SCALING_SAVE_HB_SYNTH /* VA: issue 2252: fix use-of-uninit-value in save_hb_synth_fx[] scaling in FOA decoding with bitstream that starts with an SID */
	#define FIX_2248_EVS_ASSERT /* VA: Include _sat in an EVS related part of the code */		#define FIX_2248_EVS_ASSERT /* VA: Include _sat in an EVS related part of the code */
			#define FIX_2254_IMPROV_COMPLEXITY_BE /* VA: BE small complexity reduction */

	/* #################### End BE switches ################################## */		/* #################### End BE switches ################################## */

	@@ -103,6 +104,7 @@
	#define FIX_1461_CNG_BW_SWITCHING /* Eri: float issue 1461: Stereo parameters are not updated when SID/NODATA forces BW to stay the same */		#define FIX_1461_CNG_BW_SWITCHING /* Eri: float issue 1461: Stereo parameters are not updated when SID/NODATA forces BW to stay the same */
	#define FIX_2041_SPECTRAL_GAPS_FOR_INACTIVE_FRAMES /* FhG: Using rounding in multiplication to improve precision in cngNoiseLevel[] */		#define FIX_2041_SPECTRAL_GAPS_FOR_INACTIVE_FRAMES /* FhG: Using rounding in multiplication to improve precision in cngNoiseLevel[] */
	#define FIX_2264_OUT_OF_BOUND_READING_IN_LOG2_NORM_LC /* VA: Fix issue 2264 by adding a proper safeguard in log2 and by adding a missing normalization in swb_pre_proc_ivas_fx()*/		#define FIX_2264_OUT_OF_BOUND_READING_IN_LOG2_NORM_LC /* VA: Fix issue 2264 by adding a proper safeguard in log2 and by adding a missing normalization in swb_pre_proc_ivas_fx()*/
			//#define FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE /* VA: Precision improvement without increasing complexity, or complexity reduction that might be not BE on the LSB */

	/* ##################### End NON-BE switches ########################### */		/* ##################### End NON-BE switches ########################### */

	@@ -122,7 +124,4 @@
	/* #################### End BASOP optimization switches ############################ */		/* #################### End BASOP optimization switches ############################ */


	#define IMPROV_PRECISION /* Places where precision can be improved without increasing complexity */
	#define IMPROV_COMPLEX /* Places where complexity is reduced, coudl be non-BE */
	#define IMPROV_COMPLEX_BE /* Places where complexity is reduced, BE (no big impact on complexity) */
	#endif		#endif

lib_com/pred_lt4_fx.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,7 @@ void pred_lt4_ivas_fx(
	FOR( i = 0; i < nb_coef; i++ )		FOR( i = 0; i < nb_coef; i++ )
	{		{
	/s += (x1--) * (c1) + (x2++) * (c2);/		/s += (x1--) * (c1) + (x2++) * (c2);/
	#ifdef IMPROV_COMPLEX_BE		#ifdef FIX_2254_IMPROV_COMPLEXITY_BE
	s64 = W_mac_32_16( s64, ( c1 ), x1-- ); /* Q_exc + Q32 */		s64 = W_mac_32_16( s64, ( c1 ), x1-- ); /* Q_exc + Q32 */
	s64 = W_mac_32_16( s64, ( c2 ), x2++ ); /* Q_exc + Q32 */		s64 = W_mac_32_16( s64, ( c2 ), x2++ ); /* Q_exc + Q32 */
	#else		#else

lib_dec/bass_psfilter_fx.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1041,7 +1041,7 @@ Word16 res_bpf_adapt_ivas_fx(
	bpf_error_ratio = ONE_IN_Q14; // Q13		bpf_error_ratio = ONE_IN_Q14; // Q13
	move16();		move16();
	}		}
	#ifdef IMPROV_PRECISION		#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
	bpf_error_ratio = mac_r( L_mult( STEREO_DFT_BPF_ADAPT_BETA_FX, bpf_error_ratio ), ( MAX_16 - STEREO_DFT_BPF_ADAPT_BETA_FX ), hStereoDft->bpf_error_ratio_mem_fx );		bpf_error_ratio = mac_r( L_mult( STEREO_DFT_BPF_ADAPT_BETA_FX, bpf_error_ratio ), ( MAX_16 - STEREO_DFT_BPF_ADAPT_BETA_FX ), hStereoDft->bpf_error_ratio_mem_fx );
	#else		#else
	bpf_error_ratio = add( mult( STEREO_DFT_BPF_ADAPT_BETA_FX, bpf_error_ratio ), mult( ( MAX_16 - STEREO_DFT_BPF_ADAPT_BETA_FX ), hStereoDft->bpf_error_ratio_mem_fx ) );		bpf_error_ratio = add( mult( STEREO_DFT_BPF_ADAPT_BETA_FX, bpf_error_ratio ), mult( ( MAX_16 - STEREO_DFT_BPF_ADAPT_BETA_FX ), hStereoDft->bpf_error_ratio_mem_fx ) );

lib_dec/ivas_sns_dec_fx.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,7 @@ static void sns_1st_dec_fx(

	FOR( i = 0; i < M / 2; i++ )		FOR( i = 0; i < M / 2; i++ )
	{		{
	#ifdef IMPROV_COMPLEX_BE		#ifdef FIX_2254_IMPROV_COMPLEXITY_BE
	snsq_fx[i] = L_mac( L_mult( ( *p_dico++ ), cdbk_fix ), means[i], means_fix ); // Q16		snsq_fx[i] = L_mac( L_mult( ( *p_dico++ ), cdbk_fix ), means[i], means_fix ); // Q16
	#else		#else
	snsq_fx[i] = L_add( L_mult( ( *p_dico++ ), cdbk_fix ), L_mult( means[i], means_fix ) ); // Q16		snsq_fx[i] = L_add( L_mult( ( *p_dico++ ), cdbk_fix ), L_mult( means[i], means_fix ) ); // Q16
	@@ -93,7 +93,7 @@ static void sns_1st_dec_fx(

	FOR( i = M / 2; i < M; i++ )		FOR( i = M / 2; i < M; i++ )
	{		{
	#ifdef IMPROV_COMPLEX_BE		#ifdef FIX_2254_IMPROV_COMPLEXITY_BE
	snsq_fx[i] = L_mac( L_mult( ( p_dico++ ), cdbk_fix ), means[i], means_fix ); /Q16*/		snsq_fx[i] = L_mac( L_mult( ( p_dico++ ), cdbk_fix ), means[i], means_fix ); /Q16*/
	#else		#else
	snsq_fx[i] = L_add( L_mult( ( p_dico++ ), cdbk_fix ), L_mult( means[i], means_fix ) ); /Q16*/		snsq_fx[i] = L_add( L_mult( ( p_dico++ ), cdbk_fix ), L_mult( means[i], means_fix ) ); /Q16*/