[cleanup] accept OPT_MCT_ENC_V3_NBE, OPT_MCT_ENC_V2_BE (4124906b) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_sns_com_fx.c

+0 −39

Original line number	Diff line number	Diff line
		@@ -376,14 +376,6 @@ void sns_shape_spectrum_fx(
		{
		L64_tmp[k] = W_mult_32_32( spectrum[k], scf_int[i] ); // Q = q_spectrum + q_scf_int + 1
		move64();
		#ifndef OPT_MCT_ENC_V3_NBE
		shift = W_norm( L64_tmp[k] );
		if ( LT_16( shift, min_shift ) )
		{
		min_shift = shift;
		move16();
		}
		#endif
		}
		}
		tmp_k = k;
		@@ -393,29 +385,18 @@ void sns_shape_spectrum_fx(
		*length = k;
		move16();
		}
		#ifdef OPT_MCT_ENC_V3_NBE
		min_shift = W_norm_arr( L64_tmp, k );
		#endif
		q_tmp = sub( add( add( *q_spectrum, q_scf_int ), min_shift ), 32 );
		if ( GT_16( q_tmp, 30 ) )
		{
		q_tmp = 30;
		move16();
		}
		#ifdef OPT_MCT_ENC_V3_NBE
		shift = sub( q_tmp, add( *q_spectrum, q_scf_int ) );
		FOR( k = 0; k < tmp_k; k++ )
		{
		spectrum[k] = W_shl_sat_l( L64_tmp[k], shift ); // q_tmp+1
		move32();
		#else
		FOR( k = 0; k < tmp_k; k++ )
		{
		L64_tmp[k] = W_shr( L64_tmp[k], sub( add( *q_spectrum, q_scf_int ), q_tmp ) ); // Q = q_tmp+1
		move64();
		spectrum[k] = W_sat_l( L64_tmp[k] ); // Q = q_tmp+1
		move64();
		#endif
		}
		*q_spectrum = q_tmp;
		move16();
		@@ -431,15 +412,6 @@ void sns_shape_spectrum_fx(
		{
		L64_tmp[k] = W_mult_32_32( spectrum[k], scf_int[i] ); // Q = q_spectrum + q_scf_int + 1
		move64();
		#ifndef OPT_MCT_ENC_V3_NBE
		shift = W_norm( L64_tmp[k] );
		test();
		if ( LT_16( shift, min_shift ) && NE_64( L64_tmp[k], 0 ) )
		{
		min_shift = shift;
		move16();
		}
		#endif
		}
		}
		tmp_k = k;
		@@ -449,29 +421,18 @@ void sns_shape_spectrum_fx(
		*length = k;
		move16();
		}
		#ifdef OPT_MCT_ENC_V3_NBE
		min_shift = W_norm_arr( L64_tmp, k );
		#endif
		q_tmp = sub( add( add( *q_spectrum, q_scf_int ), min_shift ), 32 );
		if ( GT_16( q_tmp, 30 ) )
		{
		q_tmp = 30;
		move16();
		}
		#ifdef OPT_MCT_ENC_V3_NBE
		shift = sub( q_tmp, add( *q_spectrum, q_scf_int ) );
		FOR( k = 0; k < tmp_k; k++ )
		{
		spectrum[k] = W_shl_sat_l( L64_tmp[k], shift ); // q_tmp+1
		move32();
		#else
		FOR( k = 0; k < tmp_k; k++ )
		{
		L64_tmp[k] = W_shr( L64_tmp[k], sub( add( *q_spectrum, q_scf_int ), q_tmp ) ); // q_tmp+1
		move64();
		spectrum[k] = W_sat_l( L64_tmp[k] ); // Q = q_tmp+1
		move64();
		#endif
		}
		*q_spectrum = q_tmp;
		move16();

lib_com/options.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -76,8 +76,6 @@

		/* Note: each compile switch (FIX_1101_...) is independent from the other ones */
		#define OPT_MCT_ENC_V3_BE
		#define OPT_MCT_ENC_V3_NBE
		#define OPT_MCT_ENC_V2_BE
		#define OPT_BIN_REND_V2_NBE
		#define OPT_MCH_DEC_V1_NBE
		#define OPT_MASA_DEC_V1_NBE

lib_com/tools.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -687,11 +687,7 @@ Word32 dotp_fixed_o(
		move16();
		test();
		test();
		#ifdef OPT_MCT_ENC_V2_BE
		FOR( ; ( suma > MAX_32 ) \|\| ( suma < MIN_32 ) \|\| ( *res_q > 31 ); )
		#else
		WHILE( GT_64( suma, MAX_32 ) \|\| LT_64( suma, MIN_32 ) \|\| GT_16( *res_q, 31 ) )
		#endif
		{
		suma = W_shr( suma, 1 );
		res_q = sub( res_q, 1 );
		@@ -721,11 +717,7 @@ Word32 dotp_fixed_32(
		move16();
		test();
		test();
		#ifdef OPT_MCT_ENC_V2_BE
		FOR( ; ( suma > MAX_32 ) \|\| ( suma < MIN_32 ) \|\| ( *res_q > 31 ); )
		#else
		WHILE( GT_64( suma, MAX_32 ) \|\| LT_64( suma, MIN_32 ) \|\| GT_16( *res_q, 31 ) )
		#endif
		{
		suma = W_shr( suma, 1 );
		res_q = sub( res_q, 1 );

lib_enc/cod_tcx_fx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -3203,11 +3203,9 @@ void QuantizeTCXSpectrum_fx(

		IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )
		{
		#ifdef OPT_MCT_ENC_V3_NBE
		Word16 scale = sub( L_norm_arr( spectrum_fx, L_spec ), 2 );
		scale_sig32( spectrum_fx, L_spec, scale );
		spectrum_e = sub( spectrum_e, scale );
		#endif
		sqGain_fx = SQ_gain_estimate_fx( spectrum_fx, *spectrum_e, shl( mult( hTcxEnc->tcx_target_bits_fac, sqTargetBits ), 1 ), L_spec, &sqGain_e );
		}
		ELSE

lib_enc/ivas_stereo_mdct_stereo_enc_fx.c

+0 −18

Original line number	Diff line number	Diff line
		@@ -911,9 +911,7 @@ static Word32 SQ_gain_estimate_stereo_fx( // e_res
		offset_fx = fac_fx; /* Q25 */
		move32();

		#ifdef OPT_MCT_ENC_V2_BE
		Word64 target_64_fx = W_shl( target_fx, 7 ); // Q25
		#endif
		/* find offset (0 to 128 dB with step of 0.125dB) */
		FOR( iter = 0; iter < 10; iter++ )
		{
		@@ -926,7 +924,6 @@ static Word32 SQ_gain_estimate_stereo_fx( // e_res
		{
		tmp_32 = L_sub( en_fx[i], offset_fx ); /* Q25 */

		#ifdef OPT_MCT_ENC_V2_BE
		/* avoid SV with 1 bin of amp < 0.5f */
		if ( GT_32( tmp_32, 10066329 /0.3 Q25/ ) )
		{
		@@ -938,21 +935,6 @@ static Word32 SQ_gain_estimate_stereo_fx( // e_res
		offset_fx = L_add( offset_fx, fac_fx ); /* Q25 */
		BREAK;
		}
		#else

		/* avoid SV with 1 bin of amp < 0.5f */
		IF( GT_32( tmp_32, 10066329 /0.3 Q25/ ) )
		{
		W_tmp = W_add( W_tmp, W_deposit32_l( tmp_32 ) ); /* Q25 */

		/* if ener is above target -> break and increase offset */
		IF( GT_64( W_tmp, W_shl( W_deposit32_l( target_fx ), 7 ) ) )
		{
		offset_fx = L_add( offset_fx, fac_fx ); /* Q25 */
		BREAK;
		}
		}
		#endif
		}
		}