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

lib_com/options.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@
		#define HARMONIZE_2537_SetTCXModeInfo /* FhG: Harmonize SetTCXModeInfo - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */
		#define HARMONIZE_2537_GetTCXMaxenergyChange /* FhG: Harmonize GetTCXMaxenergyChange */
		#define HARMONIZE_2508_InitTransientDetection /* FhG: harmonize GetAttackForTCXDecision derivates for evs/ivas */
		#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES /* Dolby: remove unused ISAR */

		/* #################### End BE switches ################################## */

lib_dec/ivas_rom_dec.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,8 @@ extern const Word16 dirac_dithering_ele_scale_fx[DIRAC_DIFFUSE_LEVELS];

		extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0;
		extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df;
		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt;
		#endif

		#endif /* IVAS_ROM_DEC_H */

lib_dec/ivas_rom_dec_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -576,11 +576,12 @@ const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df =
		huff_nodes_beta_1D_DF
		};

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt =
		{
		huff_nodes_alpha_1D_DT,
		huff_nodes_beta_1D_DT
		};

		#endif

		/* clang-format on */

lib_isar/isar_rom_lcld_tables.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -294,6 +294,7 @@ const Word32 c_aiQuantMaxValues_fx[ALLOC_TABLE_SIZE] = {
		377487360,
		};

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE] = {
		0,
		3,
		@@ -328,6 +329,7 @@ const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE] = {
		152,
		180,
		};
		#endif

		const Word32 c_aiHuffmanDim_fx[ALLOC_TABLE_SIZE] = {
		2,
		@@ -468,6 +470,8 @@ const Word32 c_aiHuffmanMod[ALLOC_TABLE_SIZE] = {
		1,
		1,
		};

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE] = {
		1,
		16,
		@@ -502,6 +506,7 @@ const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE] = {
		153,
		181,
		};
		#endif

		const UWord32 c_aaiRMSEnvHuffEnc[64][2] = {
		{ 0x0014, 0x0000 },
		@@ -19208,6 +19213,7 @@ const Word16 c_aiLogAddTable_fx[LOG_ADD_TABLE_LENGTH] = {
		0x00,
		};

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH] = {
		0x40,
		0x40,
		@@ -19722,6 +19728,7 @@ const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH] = {
		0x00,
		0x00,
		};
		#endif

		const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48] = {
		0,
		@@ -19749,6 +19756,7 @@ const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48] = {
		213,
		};

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48] = {

		0,
		@@ -19775,6 +19783,7 @@ const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48] = {
		180,
		213,
		};
		#endif

		const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48] = {
		-1787,
		@@ -19802,6 +19811,7 @@ const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48] = {
		-401,
		};

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48] = {
		-1787,
		-1787,
		@@ -19827,6 +19837,7 @@ const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48] = {
		-409,
		-401,
		};
		#endif

		#if PERCEPTUAL_MODEL_SLGAIN_SHIFT == 4
		const Word32 c_aiDefaultTheta48[MAX_BANDS_48] = {
		@@ -20440,6 +20451,7 @@ const Word16 c_aaiSpreadFunction48_fx[MAX_BANDS_48 * MAX_BANDS_48] = {
		-114,
		};

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48] = {
		0,
		-1561,
		@@ -20972,6 +20984,8 @@ const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48] = {
		-114,
		};

		#endif

		const Word32 c_pfMagLUT[8] = /* Q31 */ {
		0, 394599072, 775760576, 1130504448, 1446750336, 1713728896, 1922348544, 2065504896
		};

lib_isar/isar_rom_lcld_tables.h

+10 −9

Original line number	Diff line number	Diff line
		@@ -112,14 +112,12 @@ extern const Word32 c_aiDefaultTheta48[MAX_BANDS_48];

		extern const Word32 c_afInvScaleFactor_fx[ALLOC_TABLE_SIZE];
		extern const Word16 c_afRMSEnvReconstructTable_exp[ENV_RECONSTRUCT_TABLE_SIZE];
		extern const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE];
		extern const Word32 c_aiHuffmanDim[ALLOC_TABLE_SIZE];
		extern const Word32 c_aiHuffmanMod[ALLOC_TABLE_SIZE];
		extern const Word32 c_aiHuffmanDim_fx[ALLOC_TABLE_SIZE];
		extern const Word32 c_aiHuffmanMod_fx[ALLOC_TABLE_SIZE];
		extern const Word32 c_afScaleFactor_fx[ALLOC_TABLE_SIZE];
		extern const Word32 c_aiQuantMaxValues_fx[ALLOC_TABLE_SIZE];
		extern const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE];


		#define LOG_ADD_TABLE_LENGTH ( 512 )
		@@ -127,17 +125,19 @@ extern const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE];
		extern const Word32 c_aiBandwidths48[MAX_BANDS_48];
		extern const Word16 c_aiLogAddTable_fx[LOG_ADD_TABLE_LENGTH];
		extern const Word16 c_aiBandwidthAdjust48_fx[MAX_BANDS_48];
		extern const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH];
		extern const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48];


		extern const Word16 c_aiAbsoluteThresh48_fx[MAX_BANDS_48];
		extern const Word16 c_aiDefaultTheta48_fx[MAX_BANDS_48];
		extern const Word16 c_aaiSpreadFunction48_fx[MAX_BANDS_48 * MAX_BANDS_48];
		extern const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48];
		extern const Word32 c_aiDefaultTheta48[MAX_BANDS_48];
		extern const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48];

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		extern const Word32 c_aiQuantMaxValues[ALLOC_TABLE_SIZE];
		extern const Word32 c_aiLogAddTable[LOG_ADD_TABLE_LENGTH];
		extern const Word32 c_aiHuffmanSize[ALLOC_TABLE_SIZE];
		extern const Word32 c_aiBandwidthAdjust48[MAX_BANDS_48];
		extern const Word32 c_aiAbsoluteThresh48[MAX_BANDS_48];
		extern const Word32 c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48];
		#endif

		#define PRED_QUNAT_FILTER_MAG_BITS ( 3 )
		#define PRED_QUANT_FILTER_PHASE_BITS ( 5 )
		@@ -238,7 +238,8 @@ extern const UWord32 c_aaiRMSEnvHuffDec[13][HUFF_DEC_TABLE_SIZE];
		extern const Word32 c_pfMagLUT[8]; /* Q31 */
		extern const Word32 c_pfP2RRealLUT[32]; /* Q31 */
		extern const Word32 c_pfP2RImagLUT[32]; /* Q31 */
		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		extern const Word32 c_pfWindowLUT[LCLD_PRED_WIN_LEN]; /* Q31 */

		#endif

		#endif /* ISAR_ROM_LCLD_TABLES_H_ */