Loading lib_com/rom_com.h +6 −16 Original line number Diff line number Diff line Loading @@ -397,15 +397,9 @@ extern const Word16 CBbits[]; // Q0 extern const Word16 CBbits_p[]; // Q0 extern const Word16 vals_fx[NO_LEADERS][MAX_NO_VALS]; // Q1 extern const Word16 no_vals[NO_LEADERS]; // Q0 // extern const Word16 no_vals_fx[NO_LEADERS]; extern const Word16 no_vals_ind[NO_LEADERS][MAX_NO_VALS]; // Q0 // extern const Word16 no_vals_ind_fx[NO_LEADERS][MAX_NO_VALS]; extern const Word16 C_VQ[LATTICE_DIM + 1][LATTICE_DIM + 1]; // Q0 // extern const Word16 C_VQ_fx[LATTICE_DIM + 1][LATTICE_DIM + 1]; extern const Word16 BitsVQ[]; // Q0 extern const Word16 BitsVQ_p[]; // Q0 Loading @@ -426,21 +420,17 @@ extern const Word16 predmode_tab[][6]; // Q0 extern const Word16 pl_HQ_fx[]; // Q1 extern const Word16 pi0[]; // Q0 // extern const Word16 pi0_fx[]; extern const UWord32 table_no_cv[]; // Q0 extern const Word32 table_no_cv_fx[]; // Q0 extern const Word16 pl_par[]; // Q0 // extern const Word16 pl_par_fx[]; /* 1 if even number of signs */ extern const Word16 *const Quantizers_p_fx[]; // Qlog2(2.56) extern const Word16 *const Quantizers_fx[]; // Qlog2(2.56) extern const Word16 cng_sort[]; // Q0 // extern const Word16 cng_sort_fx[]; extern const Word16 perm_MSLVQ[][4]; // Q0 // extern const Word16 perm_MSLVQ_fx[][4]; extern const Word16 min_lat_bits_SN[]; extern const Word16 min_lat_bits_SN_fx[]; // Q0 Loading Loading @@ -670,6 +660,7 @@ extern const Word16 w_NOR_fx[]; // Q15 extern const Word16 Mean_env_fx[]; // Q8 extern const Word16 Mean_env_fb_fx[]; /*Q8 */ extern const Word16 Mean_env_tr_fx[]; /*Q8 */ /*------------------------------------------------------------------------------* * ACEPL/HQ core switching tables *------------------------------------------------------------------------------*/ Loading @@ -682,8 +673,8 @@ extern const Word16 hp12800_16000_fx[]; // Q15 extern const Word16 cu15_fx[28][3]; // Q13 extern const Word16 cu4_fx[6][3]; // Q13 extern const Word16 ct2[7][13]; // Q0 extern const Word16 ct2_fx[7][14]; // Q13 /*------------------------------------------------------------------------------* * HQ core tables *------------------------------------------------------------------------------*/ Loading Loading @@ -904,6 +895,7 @@ extern const Word16 att_step_fx[4]; // Q13 extern const Word16 gain_cb_size[]; extern const Word16 stab_trans_fx[]; // Q15 extern const Word16 env_stab_tp_fx[2][2]; // Q15 /*----------------------------------------------------------------------------------* * SWB BWE for LR MDCT core *----------------------------------------------------------------------------------*/ Loading Loading @@ -1005,6 +997,7 @@ extern const Word16 hvq_cp_huff_tab[52]; // Q0 /*------------------------------------------------------------------------------* * GSC mode *------------------------------------------------------------------------------*/ extern const Word16 sin_table256_fx[]; // Q15 extern const Word16 gsc_sfm_start[]; // Q0 extern const Word16 gsc_sfm_end[]; // Q0 Loading Loading @@ -1086,6 +1079,7 @@ extern const Word16 Ip_fft4[6]; // Q0 /*----------------------------------------------------------------------------------* * FEC for HQ core *----------------------------------------------------------------------------------*/ extern const Word16 Asr_LP32_fx[41]; // Q15 extern const Word16 Asr_LP16_fx[21]; // Q15 extern const Word16 Asr_LP48_fx[61]; // Q15 Loading Loading @@ -1127,10 +1121,8 @@ extern const Word16 cldfb_anaScale[]; // Q0 extern const Word16 cldfb_synScale[]; // Q0 extern const Word16 cldfb_synGain[]; // Q0 extern const Word16 *cldfb_protoFilter_2_5ms[]; // extern const Word16 *cldfb_protoFilter_5_0ms[]; extern const Word16 cldfb_scale_2_5ms[7]; // Q8 extern const Word32 rot_vec_syn_re_L10_fx[5]; // Q31 extern const Word32 rot_vec_syn_im_L10_fx[5]; // Q31 extern const Word32 rot_vec_syn_re_L16_fx[8]; // Q31 Loading Loading @@ -1405,12 +1397,10 @@ extern const Word32 LastCoefPred_0bit_fx[18]; // Q31 extern const Word32 LastCoefPred_1bit_fx[36]; // Q31 extern const Word16 config_LSF_BWE[]; // Q0 // basops extern const Word32 BASOP_util_normReciprocal[CHEAP_NORM_SIZE]; // Q31 extern const Word16 f_atan_expand_range[MAXSFTAB - ( MINSFTAB - 1 )]; // Q15 extern const Word16 Grid[]; // Q15 extern const Word16 pwAlpha[10]; // Q15 extern const Word8 Ind_Guess[256]; Loading Loading @@ -1456,6 +1446,7 @@ extern const Word16 InvIntTable[65]; // Q15 extern const Word16 TecLowBandTable[]; // Q0 extern const Word16 TecSC_Fx[]; // Q15 extern const Word16 sqrt_table_pitch_search[256 + 1]; // Q11 /* fft_evs.c */ extern const Word16 RotVector_32[2 * 20]; // Q15 extern const Word16 RotVector_256[2 * ( 256 - 32 )]; // Q15 Loading Loading @@ -1497,7 +1488,6 @@ extern const Word16 phs_tbl_dec[]; // Q15 extern const Word16 Low_H_phasedisp[L_SUBFR]; // Q15 extern const Word16 Mid_H_phasedisp[L_SUBFR]; // Q15 // ACcontextMapping_dec_fx.c extern const Word16 Tab_esc_nb[4]; // Q0 extern const Word16 pow2tab[15]; // Q0 Loading lib_com/rom_com_fx.c +0 −27 Original line number Diff line number Diff line Loading @@ -12569,19 +12569,6 @@ const Word16 C_VQ[LATTICE_DIM+1][LATTICE_DIM+1] = {1,8,28,56,70,56,28,8,1} }; const Word16 C_VQ_fx[LATTICE_DIM + 1][LATTICE_DIM + 1] = { {1,0,0,0,0,0,0,0,0}, {1,1,0,0,0,0,0,0,0}, {1,2,1,0,0,0,0,0,0}, {1,3,3,1,0,0,0,0,0}, {1,4,6,4,1,0,0,0,0}, {1,5,10,10,5,1,0,0,0}, {1,6,15,20,15,6,1,0,0}, {1,7,21,35,35,21,7,1,0}, {1,8,28,56,70,56,28,8,1} }; // Q0 const UWord32 table_no_cv[] = //Q0 { 0, 112, 240, 1360, 1376, 2400, 4192, 5536, 9120, 9376, 18336, 18448, 25616, 26640, 33808, 40528, 40752, Loading Loading @@ -19662,20 +19649,6 @@ const Word16 hp16000_48000_fx[49] =//Q15 175, 138, -0, -83, -64, -0, 39, 33, -0 }; const Word16 ct2[7][13] = { /* accepted configurations */ /*input 12.8, output :*/ /*8*/ {30, 22, 30, 16, 25, 30, 19, 30, 30, 0, 8, 4, 15}, /*16*/ {25, 22, 19, 16, 16, 0, 0, 0, 12, 1, 4, 4, 15}, /*32*/ {19, 16, 19, 16, 16, 0, 0, 0, 6, 2, 2, 4, 15}, /*48*/ {17, 14, 15, 16, 16, 0, 0, 0, 4, 3, 4, 4, 15}, /*input 16, output :*/ /*12*/ { 9, 3, 4, 5, 9, 0, 0, 0, 5, 0, 5, 5, 4}, /*32*/ { 4, 4, 4, 4, 4, 0, 0, 0, 2, 1, 1, 4, 4}, /*48*/ {18, 18, 18, 18, 18, 0, 0, 0, 5, 2, 1, 4, 15}, }; // Q0 const Word16 ct2_fx[7][14] = { /* accepted configurations */ Loading
lib_com/rom_com.h +6 −16 Original line number Diff line number Diff line Loading @@ -397,15 +397,9 @@ extern const Word16 CBbits[]; // Q0 extern const Word16 CBbits_p[]; // Q0 extern const Word16 vals_fx[NO_LEADERS][MAX_NO_VALS]; // Q1 extern const Word16 no_vals[NO_LEADERS]; // Q0 // extern const Word16 no_vals_fx[NO_LEADERS]; extern const Word16 no_vals_ind[NO_LEADERS][MAX_NO_VALS]; // Q0 // extern const Word16 no_vals_ind_fx[NO_LEADERS][MAX_NO_VALS]; extern const Word16 C_VQ[LATTICE_DIM + 1][LATTICE_DIM + 1]; // Q0 // extern const Word16 C_VQ_fx[LATTICE_DIM + 1][LATTICE_DIM + 1]; extern const Word16 BitsVQ[]; // Q0 extern const Word16 BitsVQ_p[]; // Q0 Loading @@ -426,21 +420,17 @@ extern const Word16 predmode_tab[][6]; // Q0 extern const Word16 pl_HQ_fx[]; // Q1 extern const Word16 pi0[]; // Q0 // extern const Word16 pi0_fx[]; extern const UWord32 table_no_cv[]; // Q0 extern const Word32 table_no_cv_fx[]; // Q0 extern const Word16 pl_par[]; // Q0 // extern const Word16 pl_par_fx[]; /* 1 if even number of signs */ extern const Word16 *const Quantizers_p_fx[]; // Qlog2(2.56) extern const Word16 *const Quantizers_fx[]; // Qlog2(2.56) extern const Word16 cng_sort[]; // Q0 // extern const Word16 cng_sort_fx[]; extern const Word16 perm_MSLVQ[][4]; // Q0 // extern const Word16 perm_MSLVQ_fx[][4]; extern const Word16 min_lat_bits_SN[]; extern const Word16 min_lat_bits_SN_fx[]; // Q0 Loading Loading @@ -670,6 +660,7 @@ extern const Word16 w_NOR_fx[]; // Q15 extern const Word16 Mean_env_fx[]; // Q8 extern const Word16 Mean_env_fb_fx[]; /*Q8 */ extern const Word16 Mean_env_tr_fx[]; /*Q8 */ /*------------------------------------------------------------------------------* * ACEPL/HQ core switching tables *------------------------------------------------------------------------------*/ Loading @@ -682,8 +673,8 @@ extern const Word16 hp12800_16000_fx[]; // Q15 extern const Word16 cu15_fx[28][3]; // Q13 extern const Word16 cu4_fx[6][3]; // Q13 extern const Word16 ct2[7][13]; // Q0 extern const Word16 ct2_fx[7][14]; // Q13 /*------------------------------------------------------------------------------* * HQ core tables *------------------------------------------------------------------------------*/ Loading Loading @@ -904,6 +895,7 @@ extern const Word16 att_step_fx[4]; // Q13 extern const Word16 gain_cb_size[]; extern const Word16 stab_trans_fx[]; // Q15 extern const Word16 env_stab_tp_fx[2][2]; // Q15 /*----------------------------------------------------------------------------------* * SWB BWE for LR MDCT core *----------------------------------------------------------------------------------*/ Loading Loading @@ -1005,6 +997,7 @@ extern const Word16 hvq_cp_huff_tab[52]; // Q0 /*------------------------------------------------------------------------------* * GSC mode *------------------------------------------------------------------------------*/ extern const Word16 sin_table256_fx[]; // Q15 extern const Word16 gsc_sfm_start[]; // Q0 extern const Word16 gsc_sfm_end[]; // Q0 Loading Loading @@ -1086,6 +1079,7 @@ extern const Word16 Ip_fft4[6]; // Q0 /*----------------------------------------------------------------------------------* * FEC for HQ core *----------------------------------------------------------------------------------*/ extern const Word16 Asr_LP32_fx[41]; // Q15 extern const Word16 Asr_LP16_fx[21]; // Q15 extern const Word16 Asr_LP48_fx[61]; // Q15 Loading Loading @@ -1127,10 +1121,8 @@ extern const Word16 cldfb_anaScale[]; // Q0 extern const Word16 cldfb_synScale[]; // Q0 extern const Word16 cldfb_synGain[]; // Q0 extern const Word16 *cldfb_protoFilter_2_5ms[]; // extern const Word16 *cldfb_protoFilter_5_0ms[]; extern const Word16 cldfb_scale_2_5ms[7]; // Q8 extern const Word32 rot_vec_syn_re_L10_fx[5]; // Q31 extern const Word32 rot_vec_syn_im_L10_fx[5]; // Q31 extern const Word32 rot_vec_syn_re_L16_fx[8]; // Q31 Loading Loading @@ -1405,12 +1397,10 @@ extern const Word32 LastCoefPred_0bit_fx[18]; // Q31 extern const Word32 LastCoefPred_1bit_fx[36]; // Q31 extern const Word16 config_LSF_BWE[]; // Q0 // basops extern const Word32 BASOP_util_normReciprocal[CHEAP_NORM_SIZE]; // Q31 extern const Word16 f_atan_expand_range[MAXSFTAB - ( MINSFTAB - 1 )]; // Q15 extern const Word16 Grid[]; // Q15 extern const Word16 pwAlpha[10]; // Q15 extern const Word8 Ind_Guess[256]; Loading Loading @@ -1456,6 +1446,7 @@ extern const Word16 InvIntTable[65]; // Q15 extern const Word16 TecLowBandTable[]; // Q0 extern const Word16 TecSC_Fx[]; // Q15 extern const Word16 sqrt_table_pitch_search[256 + 1]; // Q11 /* fft_evs.c */ extern const Word16 RotVector_32[2 * 20]; // Q15 extern const Word16 RotVector_256[2 * ( 256 - 32 )]; // Q15 Loading Loading @@ -1497,7 +1488,6 @@ extern const Word16 phs_tbl_dec[]; // Q15 extern const Word16 Low_H_phasedisp[L_SUBFR]; // Q15 extern const Word16 Mid_H_phasedisp[L_SUBFR]; // Q15 // ACcontextMapping_dec_fx.c extern const Word16 Tab_esc_nb[4]; // Q0 extern const Word16 pow2tab[15]; // Q0 Loading
lib_com/rom_com_fx.c +0 −27 Original line number Diff line number Diff line Loading @@ -12569,19 +12569,6 @@ const Word16 C_VQ[LATTICE_DIM+1][LATTICE_DIM+1] = {1,8,28,56,70,56,28,8,1} }; const Word16 C_VQ_fx[LATTICE_DIM + 1][LATTICE_DIM + 1] = { {1,0,0,0,0,0,0,0,0}, {1,1,0,0,0,0,0,0,0}, {1,2,1,0,0,0,0,0,0}, {1,3,3,1,0,0,0,0,0}, {1,4,6,4,1,0,0,0,0}, {1,5,10,10,5,1,0,0,0}, {1,6,15,20,15,6,1,0,0}, {1,7,21,35,35,21,7,1,0}, {1,8,28,56,70,56,28,8,1} }; // Q0 const UWord32 table_no_cv[] = //Q0 { 0, 112, 240, 1360, 1376, 2400, 4192, 5536, 9120, 9376, 18336, 18448, 25616, 26640, 33808, 40528, 40752, Loading Loading @@ -19662,20 +19649,6 @@ const Word16 hp16000_48000_fx[49] =//Q15 175, 138, -0, -83, -64, -0, 39, 33, -0 }; const Word16 ct2[7][13] = { /* accepted configurations */ /*input 12.8, output :*/ /*8*/ {30, 22, 30, 16, 25, 30, 19, 30, 30, 0, 8, 4, 15}, /*16*/ {25, 22, 19, 16, 16, 0, 0, 0, 12, 1, 4, 4, 15}, /*32*/ {19, 16, 19, 16, 16, 0, 0, 0, 6, 2, 2, 4, 15}, /*48*/ {17, 14, 15, 16, 16, 0, 0, 0, 4, 3, 4, 4, 15}, /*input 16, output :*/ /*12*/ { 9, 3, 4, 5, 9, 0, 0, 0, 5, 0, 5, 5, 4}, /*32*/ { 4, 4, 4, 4, 4, 0, 0, 0, 2, 1, 1, 4, 4}, /*48*/ {18, 18, 18, 18, 18, 0, 0, 0, 5, 2, 1, 4, 15}, }; // Q0 const Word16 ct2_fx[7][14] = { /* accepted configurations */