ltv opt-mct-enc-4 03072025 (3e528465) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_masa_com_fx.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -978,7 +978,7 @@ static Word16 quantize_phi_masa_fx(
		Word32 tmp32;
		Word16 tmp_e, delta_phi_e;

		delta_phi_fx = L_deposit_h( BASOP_Util_Divide1616_Scale( 360, n, &delta_phi_e ) );
		delta_phi_fx = BASOP_Util_Divide3232_Scale_newton( 360, n, &delta_phi_e );
		delta_phi_fx = L_shr( delta_phi_fx, sub( sub( 31, delta_phi_e ), 22 ) ); // Q22

		IF( EQ_16( n, 1 ) )
		@@ -1000,8 +1000,8 @@ static Word16 quantize_phi_masa_fx(
		}

		tmp32 = L_add( L_sub( phi_fx, dd_fx ), L_shr( delta_phi_fx, 1 ) );
		id_phi = BASOP_Util_Divide3232_Scale( tmp32, delta_phi_fx, &tmp_e );
		id_phi = shr( id_phi, sub( 15, tmp_e ) ); // Q0
		tmp32 = BASOP_Util_Divide3232_Scale_newton( tmp32, delta_phi_fx, &tmp_e );
		id_phi = extract_l( L_shr( tmp32, sub( 31, tmp_e ) ) ); // Q0

		if ( EQ_16( id_phi, n ) )
		{
		@@ -1014,7 +1014,10 @@ static Word16 quantize_phi_masa_fx(
		id_phi = sub( n, 1 );
		}

		*phi_hat_fx = L_add( L_shl( Mpy_32_16_1( delta_phi_fx, id_phi ), 15 ), dd_fx ); // q22 + q0 - 15 = q7 -> q7 + 15 = q22
		delta_phi_fx = BASOP_Util_Divide3232_Scale_newton( L_mult0( 360, id_phi ), n, &delta_phi_e );
		delta_phi_fx = L_shr( delta_phi_fx, sub( sub( 31, delta_phi_e ), 22 ) ); // Q22

		*phi_hat_fx = L_add( delta_phi_fx, dd_fx ); // Q22
		move32();

		return id_phi; // Q0

+8 −8

Original line number	Diff line number	Diff line
		@@ -485,14 +485,14 @@ const Word32 dft_res_gains_q_fx[][2] = {

		// Q13
		const Word16 McMASA_LFEGain_vectors_fx_q13[64] = {
		3112, 2703, 1556, 1638, -1310, -1802, -2867, -2785,
		4096, 4096, 4096, 4096, -6553, -3276, 8355, 819,
		-4096, -4096, -4096, -4096, -4587, -983, -6389, 11141,
		-8355, 9666, -4669, 2703, 5898, -9256, 7946, -5079,
		-7454, 7618, 8192, -9011, 14172, -1884, -6389, -6881,
		7782, -13107, -2785, 7618, 7127, 3850, -15564, 4259,
		5488, 11632, -7946, -10158, 6799, 4751, 4997, -16711,
		-6553, -12943, 6717, 11632, -17530, 2129, 6881, 8355
		3113, 2703, 1556, 1638, -1311, -1802, -2867, -2785,
		4096, 4096, 4096, 4096, -6554, -3277, 8356, 819,
		-4096, -4096, -4096, -4096, -4588, -983, -6390, 11141,
		-8356, 9667, -4669, 2703, 5898, -9257, 7946, -5079,
		-7455, 7619, 8192, -9011, 14172, -1884, -6390, -6881,
		7782, -13107, -2785, 7619, 7127, 3850, -15565, 4260,
		5489, 11633, -7946, -10158, 6799, 4751, 4997, -16712,
		-6554, -12943, 6717, 11633, -17531, 2130, 6881, 8356
		};

		// Q25

+1 −0

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


		/* Note: each compile switch (FIX_1101_...) is independent from the other ones */
		#define OPT_MCT_ENC_48KB_NBE
		#define OPT_MCH_DEC_V1_BE
		#define OPT_MCT_ENC_V2_NBE
		#define OPT_SBA_DEC_V2_NBE

+27 −0

Original line number	Diff line number	Diff line
		@@ -15654,6 +15654,33 @@ const Word16 wac_swb_l[LPC_SHB_ORDER] =
		30328
		};

		const Word16 wac_swb_ivas_h[LPC_SHB_ORDER] =
		{//Q15
		32749,
		32731,
		32686,
		32622,
		32541,
		32442,
		32325,
		32191,
		32039,
		31870
		};

		const Word16 wac_swb_ivas_l[LPC_SHB_ORDER] =
		{//Q15
		2624,
		20874,
		7850,
		25873,
		12831,
		5927,
		10541,
		239,
		15037,
		30328
		};

		const Word16 lbr_wb_bwe_lsfvq_cbook_2bit_fx[4 * 4] =
		{

+4 −2

Original line number	Diff line number	Diff line
		@@ -618,6 +618,8 @@ extern const Word16 Hilbert_coeffs_fx[4 * NUM_HILBERTS][HILBERT_ORDER1 + 1]; //

		extern const Word16 wac_swb_h[]; // Q15
		extern const Word16 wac_swb_l[]; // Q15
		extern const Word16 wac_swb_ivas_h[]; // Q15
		extern const Word16 wac_swb_ivas_l[]; // Q15

		extern const Word16 wb_bwe_lsfvq_cbook_8bit_fx[]; // Q15
		extern const Word16 lbr_wb_bwe_lsfvq_cbook_2bit_fx[]; // Q15