remove unused tables (8bce57b0) · Commits · SA4 / Audio / IVAS BASOP

lib_com/rom_com.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -422,7 +422,6 @@ extern const Word16 scales_fx[][MAX_NO_SCALES * 2]; // Q11
		extern const Word16 scales_ivas_fx[][MAX_NO_SCALES * 2]; // Q11
		extern const Word16 scales_p_ivas_fx[][MAX_NO_SCALES * 2]; // Q11
		extern const Word16 scales_p_fx[][MAX_NO_SCALES * 2]; // Q11
		extern const Word16 predmode_tab_float[][6];
		extern const Word16 predmode_tab[][6]; // Q0
		extern const Word16 pl_HQ_fx[]; // Q1

		@@ -656,9 +655,7 @@ extern const Word16 fb_bwe_sm_subband[]; // Q0
		extern const Word16 swb_inv_bwe_subband_width_fx[]; // Q15
		extern const Word16 swb_bwe_sm_subband[]; // Q0
		extern const Word16 smooth_factor_fx[]; // Q15
		extern const Word16 fb_bwe_subband_float[]; // Q0
		extern const Word16 fb_inv_bwe_subband_width_fx[]; // Q15
		extern const Word16 fb_bwe_sm_subband_float[]; // Q0
		extern const Word16 fb_smooth_factor_fx[]; // Q15
		extern const Word16 EnvCdbk11_fx[]; /Q8 /
		extern const Word16 EnvCdbk1st_fx[]; /Q8 /
		@@ -709,7 +706,6 @@ extern const Word16 band_end_HQ[]; // Q0
		extern const Word16 band_len_wb[]; // Q0
		extern const Word16 band_start_wb[]; // Q0
		extern const Word16 band_end_wb[]; // Q0
		extern const Word16 band_len_harm_float[];
		extern const Word16 band_start_harm[]; // Q0
		extern const Word16 band_end_harm[]; // Q0
		extern const Word16 rat_fx[SFM_N_WB]; // Q14
		@@ -731,7 +727,6 @@ extern const Word32 thren_pg_fx[44];
		extern const Word32 dicn_fx[40]; /Q14 /

		extern const Word32 thren_HQ_fx[39]; /Q14 /
		extern const Word16 dicnlg2_float[40]; // Q0
		extern const Word16 huffnorm[32]; // Q0
		extern const Word16 huffsizn[32]; // Q0
		extern const Word16 huffcoef[60]; // Q0
		@@ -1174,11 +1169,9 @@ extern const SCALE_SETUP scaleTableMono[SIZE_SCALE_TABLE_MONO];
		extern const SCALE_SETUP scaleTable_cn_only[SIZE_SCALE_TABLE_CN]; // Q14
		extern const SCALE_SETUP scaleTable_cn_dirac[15]; // Q14
		extern const Word16 scaleTable_cn_only_amrwbio[SIZE_SCALE_TABLE_CN_AMRWB][2]; // Q14
		extern const Word32 scaleTable_cn_only_amrwbio_fx_by_10f[SIZE_SCALE_TABLE_CN_AMRWB][2]; // Q29

		extern const Word16 sidparts_encoder_noise_est[SIZE_SIDPARTS_ENC_NOISE_EST]; // Q0


		extern const FD_CNG_SETUP FdCngSetup_nb;
		extern const FD_CNG_SETUP FdCngSetup_wb1;
		extern const FD_CNG_SETUP FdCngSetup_wb2;
		@@ -1214,7 +1207,6 @@ extern const Word16 *stage1_dct_col_syn_shift[]; // Q0
		extern const Word16 cdk1r_tr_midQ_truncQ_fx[]; // Q10
		extern const Word32 fdcng_dct_scaleF_fx[]; // Q31


		extern const Word16 unique_idctT2_24coeffsQ16[]; // Q16
		extern const Word8 idctT2_24_compressed_idx[];

lib_com/rom_com_fx.c

+0 −29

Original line number	Diff line number	Diff line
		@@ -7016,12 +7016,6 @@ const Word16 scaleTable_cn_only_amrwbio[3][2] =
		{ ACELP_8k85, 16306/0.9952622652 Q14/ },
		{ ACELP_12k65, 9583/0.5848932266 Q14/ },
		};
		const Word32 scaleTable_cn_only_amrwbio_fx_by_10f[SIZE_SCALE_TABLE_CN_AMRWB][2] =//Q29
		{
		{ ACELP_6k60, 858993459 },
		{ ACELP_8k85, 644245094 },
		{ ACELP_12k65, 429496729 }
		};

		const Word16 sidparts_encoder_noise_est[SIZE_SIDPARTS_ENC_NOISE_EST] = { 4, 8, 12, 16, 20, 24, 30, 36, 42, 50, 58, 68, 80, 92, 108, 126, 148, 176, 212, 255, 259, 264, 269, 279 }; // Q0

		@@ -11874,14 +11868,6 @@ const Word16 BitsVQ_p[]=
		}; // Q0


		const Word16 predmode_tab_float[][6] =
		{
		{1,1,2,2,0,2},
		{1,1,2,2,0,2},
		{1,-1,2,1,0,1},
		{1,1,2,1,0,1} /* should check how is the cb for audio mode at 13.2*/
		};

		const Word16 predmode_tab[][6] =
		{
		{1,1,2,2,0,2},
		@@ -15557,10 +15543,7 @@ const Word16 fb_bwe_sm_subband[DIM_FB] = { 656, 696, 760 }; // Q0
		const Word16 swb_inv_bwe_subband_width_fx[SWB_FENV] = { 2048,1365,2048,1365,2048,1365,2048,1365,1365,1365,1365,1365,1024,1024 };//Q15
		const Word16 swb_bwe_sm_subband[SWB_FENV] = {248, 268, 288, 308, 328, 348, 368, 388, 412, 436, 460, 484, 512, 544}; // Q0
		const Word16 smooth_factor_fx[SWB_FENV - 1] = { 1638, 1638, 1638, 1638, 1638, 1638, 1638, 1366, 1366, 1366, 1366, 1024, 1024 };//Q15

		const Word16 fb_bwe_subband_float[DIM_FB+1] = {640, 680, 720, 800}; // Q0
		const Word16 fb_inv_bwe_subband_width_fx[DIM_FB] = { 819, 819, 409 };//Q15
		const Word16 fb_bwe_sm_subband_float[DIM_FB] = {656, 696, 760}; // Q0
		const Word16 fb_smooth_factor_fx[DIM_FB] = { 1024, 819, 512 };//Q15


		@@ -16381,13 +16364,6 @@ const Word16 pgain_huffsizn[32] =
		4, 4, 4, 4, 4, 4, 5, 5, 6, 7, 7, 8, 10, 10, 12, 12
		}; // Q0

		const Word16 dicnlg2_float[40] =
		{
		34, 33, 32, 31, 30, 29, 28, 27, 26, 25,
		24, 23, 22, 21, 20, 19, 18, 17, 16, 15,
		14, 13, 12, 11, 10, 9, 8, 7, 6, 5,
		4, 3, 2, 1, 0, -1, -2, -3, -4, -5
		}; // Q0

		/* Table for quantization of MLT coefficients */
		const Word16 norm_order_48[NB_SFM] =
		@@ -16460,11 +16436,6 @@ const Word16 band_len_wb[26] =
		8, 8, 8, 8, 16, 16, 16, 16, 16, 16, 16, 16,
		32, 32
		}; // Q0
		const Word16 band_len_harm_float[SFM_N_HARM_FB] = // Q0
		{
		8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
		16, 16, 16, 16, 16, 16, 32, 32, 32, 48, 48, 48, 48, 64, 64, 64, 96
		};

		const Word16 band_start_harm[SFM_N_HARM_FB] =//Q0
		{

lib_dec/rom_dec.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ extern const Word16 lsf_tab_fx[LPC_SHB_ORDER]; // Q15
		extern const Word16 POW_ATT_TABLE0[]; // Q15
		extern const Word16 POW_ATT_TABLE1[]; // Q15
		extern const Word16 gw[LGW_MAX]; // Q0
		extern const Word16 gw_fx[LGW_MAX]; // Q0
		extern const Word16 gw_len_inv_fx[LGW_MAX - 1]; // Q15
		extern const Word16 GR_POW_HEADROOM[];
		extern const Word16 ivas_gwlpr[LGW_MAX];
		@@ -66,7 +65,6 @@ extern const Word16 w_hamm16k_2_fx[]; // Q15
		extern const Word16 swb_hr_inv_frm_len[4]; /* in Q19 */
		extern const Word16 inv_tbl_2n_minus1[];


		extern const Word16 w_hamm_sana48k_2_fx[]; // Q15
		extern const Word16 w_hamm_sana32k_2_fx[]; // Q15
		extern const Word16 w_hamm_sana16k_2_fx[]; // Q15

lib_dec/rom_dec_fx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -149,8 +149,6 @@ const Word16 POW_ATT_TABLE1[OFF_FRAMES_LIMIT + 1] = /* Q15 */
		/* 125 375 750 1250 2000 4000 8000 16000 24000 */
		const Word16 gw[LGW_MAX] = { 1, 3, 6, 10, 16, 32, 64, 128, 192 };

		const Word16 gw_fx[LGW_MAX] = { 1, 3, 6, 10, 16, 32, 64, 128, 192 }; /* Q0 frequency group start bins for transient analysis */

		const Word16 gw_len_inv_fx[LGW_MAX - 1] = /* Q15 */
		{
		16384, 10923, 8192, 5461,

lib_enc/pitch_ol_fx.c

+15 −41

Original line number	Diff line number	Diff line
		@@ -422,38 +422,6 @@ static void pitch_ol_resolve_fx(
		* For each section, the length of the vectors to correlate is
		* greater/equal to the longest pitch delay. */
		/----------------------------------------------------------------------------------/
		/* INPUT ARGUMENTS : */
		/* _ (Word16[]) old_pitch : OL pitch of the 2nd half-frame of the last frame Q0 */
		/* _ (Word16[]) old_corr_fx : correlation Q15 */
		/* _ (Word16[]) corr_shift_fx : normalized correlation correction Q15 */
		/* _ (Word16[]) old_thres_fx : maximum correlation weighting with respect */
		/* to past frame pitch Q15 */
		/* _ (Word16[]) delta_pit : old pitch extrapolation correction Q0 */
		/* _ (Word16[]) st_old_wsp2_fx: weighted speech memory qwsp */
		/* _ (Word16[]) wsp_fx : weighted speech for current frame & look-ahead qwsp */
		/* _ (Word16[]) mem_decim2_fx : wsp decimation filter memory qwsp */
		/* _ (Word16[]) relE_fx : relative frame energy Q8 */
		/* _ (Word16[]) L_look : look-ahead Q0 */
		/* _ (Word16[]) Opt_SC_VBR : SC-VBR flag Q0 */
		/* _ (Word16) qwsp : wsp & filter memory Qformat /
		/----------------------------------------------------------------------------------/
		/* OUTPUT ARGUMENTS : */
		/* _ (Word16[]) pitch : open loop pitch lag for each half-frame Q0 */
		/* _ (Word16[]) T_op : open loop pitch lag for each half-frm for quant Q0 */
		/* _ (Word16[]) voicing_fx : max normalized correlation for each half-frame QIn */
		/* _ (Word16[]) old_pitch : OL pitch of the 2nd half-frame of the last frame Q0 */
		/* _ (Word16[]) old_corr_fx : correlation Q15 */
		/* _ (Word16[]) old_thres_fx : maximum correlation weighting with respect */
		/* to past frame pitch Q15 */
		/* _ (Word16[]) delta_pit : old pitch extrapolation correction Q0 */
		/* _ (Word16[]) st_old_wsp2_fx: weighted speech memory qwsp */
		/* _ (Word16[]) mem_decim2_fx : wsp decimation filter memory qwsp */
		/----------------------------------------------------------------------------------/

		/----------------------------------------------------------------------------------/
		/* RETURN ARGUMENTS : */
		/* _ None */
		/==================================================================================/

		void pitch_ol_fx(
		Word16 pitch[3], /* o : open loop pitch lag for each half-frame in range [29,231] Q0 */
		@@ -491,13 +459,16 @@ void pitch_ol_fx(
		Word16 tmp16, tmp16_2;
		Word16 qCorX, qScaledX;
		Word16 scaledX[NHFR][2 * NSECT], corX[NHFR][2 * NSECT];
		const Word16 len, len1, sublen, sublen1, pit_max, sec_length, *sec_length1;

		const Word16 nb_sect, nb_subsect, len, len1, sublen, sublen1, pit_max, sec_length, *sec_length1;
		Word16 pit_min_coding;

		/--------------------------------------------------------------
		* Initialization
		--------------------------------------------------------------/

		nb_sect = nb_sect_12k8;
		nb_subsect = nb_subsect_12k8;

		len = len_12k8;
		len1 = len1_12k8;
		sublen = sublen_12k8;
		@@ -643,12 +614,15 @@ void pitch_ol_fx(
		pt_exp3 = scaled_buf_exp + 2 * ( DELTA_COH - 1 ) + len_x;
		pt_exp4 = pt_exp3;

		IF( LT_16( i, NHFR - 1 ) ) /* First two half-frames (current frame) */
		/-----------------------------------------------------------------
		* First two half-frames (corresponding to current frame)
		-----------------------------------------------------------------/
		IF( LT_16( i, NHFR - 1 ) )
		{
		pt3 = pt1;
		pt5 = pt1;

		FOR( j = sect0; j < NSECT; j++ ) /* loop for each section */
		FOR( j = sect0; j < nb_sect[i]; j++ ) /* loop for each section */
		{
		/-----------------------------------------------------------------
		* Find fixed vector energy
		@@ -729,7 +703,7 @@ void pitch_ol_fx(
		* For each subsection, find the correlation
		----------------------------------------------------------/

		FOR( j = subsect0; j < NSUBSECT; j++ )
		FOR( j = subsect0; j < nb_subsect[i]; j++ )
		{
		len_temp = sublen[j];
		move16();
		@@ -786,7 +760,7 @@ void pitch_ol_fx(
		* For each section in both sets, find fixed vector energy
		-----------------------------------------------------------------/

		FOR( j = sect0; j < NSECT; j++ ) /* loop for each section */
		FOR( j = sect0; j < nb_sect[i]; j++ ) /* loop for each section */
		{
		/* 1st set */
		k = (Word16) ( pt3 - pt6 );
		@@ -888,7 +862,7 @@ void pitch_ol_fx(
		* For each subsection, find the correlation (overlapping pitch lag values)
		-----------------------------------------------------------------/

		FOR( j = subsect0; j < NSUBSECT; j++ )
		FOR( j = subsect0; j < nb_subsect[i]; j++ )
		{
		exp_sect[j + 1] = 0;
		move16();
		@@ -1025,7 +999,7 @@ void pitch_ol_fx(
		offset1 = 0;
		move16();

		FOR( j = sect0; j < NSECT; j++ ) /* loop for each section */
		FOR( j = sect0; j < nb_sect[i]; j++ ) /* loop for each section */
		{
		/* 1st set */
		offset_la = 0;