Accept FIX_BASOP_2095_REMOVE_TABLES_PT01 (bfadc8f1) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_rom_com.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -338,9 +338,6 @@ extern const Word32 ls_azimuth_CICP16_fx[9];
		extern const Word32 ls_elevation_CICP16_fx[9];
		extern const Word32 ls_azimuth_CICP19_fx[11];
		extern const Word32 ls_elevation_CICP19_fx[11];
		#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01
		extern const Word16 pow_10_q11[128];
		#endif
		extern const Word32 pow_10_q23[14];
		extern const Word16 ivas_sin_az_fx[361];
		extern const Word16 ivas_sine_panning_tbl_fx[601];

lib_com/ivas_rom_com_fx.c

+0 −176

Original line number	Diff line number	Diff line
		@@ -82,173 +82,6 @@ const Word16 dft_band_res_cod[3][4] =
		{0,5,6,7}
		};

		#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01
		// Q31
		const Word32 dft_res_gains_q_Q31[][2] =
		{
		/* quantization points for joint quantization of prediction gain and residual energy */

		/* column 1 (\|ILD\| = 0): */
		{0, 0 },
		{0, 251216928 },
		{0, 487459456 },
		{0, 731632640 },
		{0, 997611392 },
		{0, 1299397248 },
		{0, 1666984192 },
		{0, 2147483647 },

		/* column 2 (\|ILD\| = 2): */
		{246151024, 0 },
		{249475328, 247871152 },
		{258660112, 480729248 },
		{274304544, 720918848 },
		{298427200, 981720000 },
		{334663840, 1276185088 },
		{391374592, 1632160640 },
		{485919712, 2091786496 },

		/* column 3 (\|ILD\| = 4): */
		{485919712, 0 },
		{492224736, 238188144 },
		{509610752, 461283776 },
		{539117184, 690072384 },
		{584326016, 936189056 },
		{651608832, 1210182144 },
		{755411712, 1534299776 },
		{924504576, 1938292992 },

		/* column 4 (\|ILD\| = 6): */
		{713563712, 0 },
		{722237376, 223142880 },
		{746085184, 431184640 },
		{786311872, 642617280 },
		{847364864, 866812416 },
		{936938496, 1111020032 },
		{1072199936, 1390431232 },
		{1285225984, 1720430720 },

		/* column 5 (\|ILD\| = 8): */
		{924504576, 0 },
		{934784576, 204139792 },
		{962942400, 393358880 },
		{1010083968, 583482048 },
		{1080789888, 781462848 },
		{1182728704, 991308544 },
		{1332741248, 1221608960 },
		{1559902080, 1475937536 },

		/* column 6 (\|ILD\| = 10): */
		{1115604864, 0 },
		{1126709504, 182744416 },
		{1156997632, 351025536 },
		{1207276672, 517958016 },
		{1281710592, 688294272 },
		{1387005952, 863412992 },
		{1537761536, 1046870336 },
		{1757032448, 1234717184 },

		/* column 7 (\|ILD\| = 13): */
		{1361843968, 0 },
		{1372924928, 149366080 },
		{1402942464, 285507936 },
		{1452130560, 417893888 },
		{1523515136, 548787328 },
		{1621670144, 677135936 },
		{1756740352, 802203264 },
		{1942499840, 915633344 },

		/* column 8 (\|ILD\| = 16): */
		{1559902080, 0 },
		{1569913600, 117815248 },
		{1596862336, 224162928 },
		{1640492800, 325650848 },
		{1702660352, 423060736 },
		{1785997696, 514412544 },
		{1896788608, 597466432 },
		{2042241920, 664027712 },

		/* column 9 (\|ILD\| = 19): */
		{1714196608, 0 },
		{1722634112, 90359672 },
		{1745223424, 171238192 },
		{1781415040, 247171072 },
		{1832190080, 318199104 },
		{1898830848, 382271424 },
		{1984989952, 437025792 },
		{2094086528, 475912448 },

		/* column 10 (\|ILD\| = 22): */
		{1831427712, 0 },
		{1838194432, 67828272 },
		{1856228992, 128123168 },
		{1884882944, 183977072 },
		{1924581248, 235132272 },
		{1975822336, 279821408 },
		{2040659200, 316058048 },
		{2120554240, 339023232 },

		/* column 11 (\|ILD\| = 25): */
		{1918819584, 0 },
		{1924055168, 50102940 },
		{1937964416, 94399088 },
		{1959916032, 135003712 },
		{1990038784, 171579648 },
		{2028424960, 202728896 },
		{2076217216, 226931040 },
		{2133943808, 240762976 },

		/* column 12 (\|ILD\| = 30): */
		{2015827840, 0 },
		{2019068416, 29502130 },
		{2027636864, 55420112 },
		{2041056512, 78889960 },
		{2059271424, 99626064 },
		{2082150784, 116769424 },
		{2110128128, 129415952 },
		{2143192960, 135682304 },

		/* column 13 (\|ILD\| = 35): */
		{2072441984, 0 },
		{2074364032, 17033840 },
		{2079438464, 31939524 },
		{2087347712, 45337676 },
		{2098012032, 57039312 },
		{2111296384, 66537632 },
		{2127368192, 73321536 },
		{2146126464, 76351632 },

		/* column 14 (\|ILD\| = 40): */
		{2104959232, 0 },
		{2106073728, 9723806 },
		{2109011456, 18212808 },
		{2113579136, 25810606 },
		{2119712384, 32401234 },
		{2127314432, 37692632 },
		{2136458496, 41399188 },
		{2147054208, 42945376 },

		/* column 15 (\|ILD\| = 45): */
		{2123466240, 0 },
		{2124103936, 5514738 },
		{2125783296, 10322954 },
		{2128390400, 14615774 },
		{2131882240, 18322330 },
		{2136200832, 21283710 },
		{2141376256, 23332410 },
		{2147348352, 24150602 },

		/* column 16 (\|ILD\| = 50): */
		{2133943808, 0 },
		{2134306688, 3115998 },
		{2135260160, 5830418 },
		{2136737664, 8250632 },
		{2138715520, 10335839 },
		{2141157120, 11995844 },
		{2144077696, 13136157 },
		{2147440640, 13580687 }
		};
		#endif

		/* tables for adaptive Golomb-Rice coding of DFT stereo parameters */
		const Word16 dft_code_itd[] =
		@@ -3403,15 +3236,6 @@ const Word32 ls_azimuth_CICP19_fx[11] = { 125829120, -125829120, 0, 566231040, -
		/* Q22 */
		const Word32 ls_elevation_CICP19_fx[11] = { 0, 0, 0, 0, 0, 0, 0, 146800640, 146800640, 146800640, 146800640 };

		#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01
		const Word16 pow_10_q11[128] = {
		2048, 2085, 2123, 2161, 2200, 2240, 2281, 2322, 2364, 2407, 2451, 2496, 2541, 2587, 2634, 2682, 2731, 2780, 2831, 2882, 2934, 2988, 3042, 3097, 3153, 3211, 3269,
		3328, 3389, 3450, 3513, 3576, 3641, 3708, 3775, 3843, 3913, 3984, 4056, 4130, 4205, 4281, 4359, 4438, 4519, 4601, 4684, 4769, 4856, 4944, 5034, 5125, 5218, 5313,
		5410, 5508, 5608, 5710, 5813, 5919, 6026, 6136, 6247, 6360, 6476, 6593, 6713, 6835, 6959, 7085, 7214, 7345, 7478, 7614, 7752, 7893, 8036, 8182, 8331, 8482, 8636,
		8793, 8952, 9115, 9280, 9449, 9620, 9795, 9973, 10154, 10338, 10526, 10717, 10911, 11109, 11311, 11516, 11725, 11938, 12155, 12375, 12600, 12829, 13062, 13299,
		13540, 13786, 14036, 14291, 14550, 14815, 15084, 15357, 15636, 15920, 16209, 16503, 16803, 17108, 17418, 17734, 18056, 18384, 18718, 19058, 19404, 19756, 20114
		};
		#endif
		// Q12
		const Word16 icbwe_gsMapping_tbl_fx[16] = {
		-8192, -5527, -3935, -2907, -2289, -1824, -1404, -1035, -692, -404, -286, -204, -81, 0, 163, 327

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,6 @@
		#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */
		#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527 /* Fix crash from issue #2527 */
		#define FIX_FLOAT_1539_G192_FORMAT_SWITCH /* VA/Nokia: reintroduce format switching for g192 bitstreams */
		#define FIX_BASOP_2095_REMOVE_TABLES_PT01 /* FhG: BASOP issue 2095: remove unused tables, part 01 */
		#define FIX_2346_DUPLICATED_IGF_FUNCTIONS_2 /* FhG: part 2 of basop issue 2346: Review potentially duplicated IGF functions */
		#define FIX_BASOP_2563_CRASH_HQ_GENERIC_DEC /* Eri: BASOP issue 2563: Crash in hq_generic decoding. EVS code --> solve with _sat operator */
		#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES /* Dolby: remove unused ISAR */

lib_com/rom_com.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -1136,9 +1136,6 @@ extern const Word32 rot_vec_syn_re_L60_fx[30]; // Q31
		extern const Word32 rot_vec_syn_im_L60_fx[30]; // Q31

		extern const Word16 bpf_weights_16_Fx[16]; // Q15
		#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01
		extern const Word16 bpf_weights_16_ivas_fx[16]; // Q15
		#endif
		extern const Word32 bpf_weights_16_ivas_fx_32[16]; // Q30

		extern const Word16 CNG_details_codebook_fx[64][NUM_ENV_CNG]; // Q6
		@@ -1606,8 +1603,5 @@ extern const Word32 rot_vec_ana_re_L60_fx[30]; // Q29
		extern const Word32 rot_vec_ana_im_L60_fx[30]; // Q29

		extern const Word16 LP_assym_window_fx[]; /* Assymetric window for LP analysis @12.8kHz (Q15) */
		#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01
		extern const Word16 LP_assym_window_16k_fx[]; /* Assymetric window for LP analysis @16kHz (Q15) */
		#endif

		#endif

lib_com/rom_com_fx.c

+0 −414

Original line number	Diff line number	Diff line
		@@ -6822,15 +6822,6 @@ const Word16 bpf_weights_16_Fx[16] =
		3/0.000081f Q15/, 2/0.000052f Q15/, 1/0.000017f Q15/, 1/0.000016f Q15/
		};

		#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01
		const Word16 bpf_weights_16_ivas_fx[16] =
		{
		32767/0.999969f Q15/, 23022/0.702561f Q15/, 6843/0.208838f Q15/, 51/0.001553f Q15/,
		58/0.001777f Q15/, 45/0.001370f Q15/, 30/0.000926f Q15/, 18/0.000554f Q15/,
		9/0.000270f Q15/, 3/0.000080f Q15/, 1/0.000030f Q15/, 3/0.000082f Q15/,
		3/0.000081f Q15/, 2/0.000052f Q15/, 1/0.000017f Q15/, 1/0.000016f Q15/
		};
		#endif
		const Word32 bpf_weights_16_ivas_fx_32[16] =
		{
		1073784774/1.000040f Q30/, 754369130/0.702561f Q30/, 224238095/0.208838f Q30/, 1667521/0.001553f Q30/,
		@@ -36533,411 +36524,6 @@ const Word16 LP_assym_window_fx[L_LP] = {
		0x0b0f, 0x0ad8, 0x0aa8, 0x0a82, 0x0a64, 0x0a4e, 0x0a41, 0x0a3d
		};

		#ifndef FIX_BASOP_2095_REMOVE_TABLES_PT01
		/* LP analysis window (length of the window is 25ms which is 400 samples at 16kHz (Q15) */
		const Word16 LP_assym_window_16k_fx[L_LP_16k] = {
		0x0a3d,
		0x0a3e,
		0x0a42,
		0x0a49,
		0x0a53,
		0x0a5f,
		0x0a6e,
		0x0a7f,
		0x0a93,
		0x0aaa,
		0x0ac4,
		0x0ae0,
		0x0aff,
		0x0b21,
		0x0b45,
		0x0b6c,
		0x0b96,
		0x0bc2,
		0x0bf1,
		0x0c23,
		0x0c57,
		0x0c8e,
		0x0cc7,
		0x0d03,
		0x0d41,
		0x0d82,
		0x0dc6,
		0x0e0c,
		0x0e55,
		0x0ea0,
		0x0eee,
		0x0f3e,
		0x0f91,
		0x0fe6,
		0x103e,
		0x1098,
		0x10f4,
		0x1153,
		0x11b4,
		0x1218,
		0x127e,
		0x12e6,
		0x1351,
		0x13be,
		0x142d,
		0x149e,
		0x1512,
		0x1588,
		0x1600,
		0x167a,
		0x16f6,
		0x1774,
		0x17f5,
		0x1878,
		0x18fc,
		0x1983,
		0x1a0c,
		0x1a96,
		0x1b23,
		0x1bb1,
		0x1c42,
		0x1cd4,
		0x1d68,
		0x1dfe,
		0x1e96,
		0x1f30,
		0x1fcb,
		0x2068,
		0x2107,
		0x21a7,
		0x2249,
		0x22ed,
		0x2392,
		0x2439,
		0x24e1,
		0x258b,
		0x2636,
		0x26e2,
		0x2790,
		0x2840,
		0x28f0,
		0x29a2,
		0x2a56,
		0x2b0a,
		0x2bc0,
		0x2c77,
		0x2d2e,
		0x2de7,
		0x2ea2,
		0x2f5d,
		0x3019,
		0x30d6,
		0x3194,
		0x3253,
		0x3313,
		0x33d3,
		0x3495,
		0x3557,
		0x361a,
		0x36dd,
		0x37a2,
		0x3867,
		0x392c,
		0x39f2,
		0x3ab9,
		0x3b80,
		0x3c47,
		0x3d0f,
		0x3dd7,
		0x3ea0,
		0x3f68,
		0x4032,
		0x40fb,
		0x41c4,
		0x428e,
		0x4358,
		0x4422,
		0x44ec,
		0x45b6,
		0x4680,
		0x4749,
		0x4813,
		0x48dd,
		0x49a6,
		0x4a6f,
		0x4b38,
		0x4c01,
		0x4cca,
		0x4d92,
		0x4e59,
		0x4f20,
		0x4fe7,
		0x50ad,
		0x5173,
		0x5238,
		0x52fd,
		0x53c1,
		0x5484,
		0x5547,
		0x5608,
		0x56c9,
		0x578a,
		0x5849,
		0x5908,
		0x59c5,
		0x5a82,
		0x5b3d,
		0x5bf8,
		0x5cb2,
		0x5d6a,
		0x5e21,
		0x5ed8,
		0x5f8d,
		0x6041,
		0x60f3,
		0x61a5,
		0x6255,
		0x6303,
		0x63b0,
		0x645c,
		0x6507,
		0x65b0,
		0x6657,
		0x66fd,
		0x67a2,
		0x6844,
		0x68e6,
		0x6985,
		0x6a23,
		0x6abf,
		0x6b5a,
		0x6bf2,
		0x6c89,
		0x6d1e,
		0x6db2,
		0x6e43,
		0x6ed2,
		0x6f60,
		0x6fec,
		0x7075,
		0x70fd,
		0x7183,
		0x7206,
		0x7288,
		0x7307,
		0x7385,
		0x7400,
		0x7479,
		0x74f0,
		0x7565,
		0x75d7,
		0x7648,
		0x76b6,
		0x7721,
		0x778b,
		0x77f2,
		0x7857,
		0x78b9,
		0x7919,
		0x7977,
		0x79d2,
		0x7a2b,
		0x7a81,
		0x7ad5,
		0x7b27,
		0x7b76,
		0x7bc2,
		0x7c0c,
		0x7c54,
		0x7c98,
		0x7cdb,
		0x7d1b,
		0x7d58,
		0x7d93,
		0x7dcb,
		0x7e00,
		0x7e33,
		0x7e63,
		0x7e91,
		0x7ebc,
		0x7ee4,
		0x7f0a,
		0x7f2d,
		0x7f4d,
		0x7f6b,
		0x7f86,
		0x7f9e,
		0x7fb3,
		0x7fc6,
		0x7fd7,
		0x7fe4,
		0x7fef,
		0x7ff7,
		0x7ffc,
		0x7fff,
		0x7fff,
		0x7ff9,
		0x7fee,
		0x7fde,
		0x7fc8,
		0x7fac,
		0x7f8c,
		0x7f65,
		0x7f39,
		0x7f08,
		0x7ed1,
		0x7e95,
		0x7e54,
		0x7e0d,
		0x7dc1,
		0x7d70,
		0x7d19,
		0x7cbd,
		0x7c5c,
		0x7bf6,
		0x7b8b,
		0x7b1b,
		0x7aa5,
		0x7a2b,
		0x79ab,
		0x7927,
		0x789e,
		0x7810,
		0x777d,
		0x76e6,
		0x764a,
		0x75a9,
		0x7504,
		0x745a,
		0x73ac,
		0x72fa,
		0x7243,
		0x7188,
		0x70c9,
		0x7006,
		0x6f3f,
		0x6e74,
		0x6da5,
		0x6cd2,
		0x6bfc,
		0x6b22,
		0x6a44,
		0x6963,
		0x687f,
		0x6797,
		0x66ac,
		0x65be,
		0x64cd,
		0x63d9,
		0x62e2,
		0x61e8,
		0x60ec,
		0x5fed,
		0x5eeb,
		0x5de7,
		0x5ce1,
		0x5bd8,
		0x5ace,
		0x59c1,
		0x58b3,
		0x57a2,
		0x5690,
		0x557c,
		0x5467,
		0x5350,
		0x5238,
		0x511f,
		0x5005,
		0x4ee9,
		0x4dcd,
		0x4cb0,
		0x4b92,
		0x4a74,
		0x4955,
		0x4836,
		0x4716,
		0x45f6,
		0x44d6,
		0x43b6,
		0x4297,
		0x4177,
		0x4058,
		0x3f39,
		0x3e1b,
		0x3cfe,
		0x3be1,
		0x3ac5,
		0x39aa,
		0x3891,
		0x3778,
		0x3661,
		0x354b,
		0x3436,
		0x3323,
		0x3212,
		0x3102,
		0x2ff5,
		0x2ee9,
		0x2de0,
		0x2cd8,
		0x2bd3,
		0x2ad0,
		0x29d0,
		0x28d2,
		0x27d7,
		0x26df,
		0x25e9,
		0x24f7,
		0x2407,
		0x231a,
		0x2231,
		0x214b,
		0x2068,
		0x1f89,
		0x1ead,
		0x1dd5,
		0x1d00,
		0x1c2f,
		0x1b62,
		0x1a99,
		0x19d4,
		0x1913,
		0x1856,
		0x179d,
		0x16e9,
		0x1638,
		0x158d,
		0x14e5,
		0x1442,
		0x13a4,
		0x130a,
		0x1275,
		0x11e5,
		0x1159,
		0x10d3,
		0x1051,
		0x0fd4,
		0x0f5c,
		0x0ee9,
		0x0e7b,
		0x0e12,
		0x0daf,
		0x0d50,
		0x0cf7,
		0x0ca3,
		0x0c55,
		0x0c0b,
		0x0bc7,
		0x0b88,
		0x0b4f,
		0x0b1b,
		0x0aed,
		0x0ac3,
		0x0aa0,
		0x0a82,
		0x0a69,
		0x0a56,
		0x0a48,
		0x0a40,
		0x0a3d,
		};
		#endif

		/* 4-bit/3-bit TD SWB BWE differential LSF scalar quantizer tables */
		/Q15/