formatting + put ROM tables at one common place (75cf366d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -1366,7 +1366,6 @@ typedef struct {
		float data[35];
		} ACPL_QUANT_TABLE;
		#ifdef FIX_891_PARAMUPMIX_CLEANUP

		typedef struct
		{
		const int16_t (*alpha)[2];

+6 −7

Original line number	Diff line number	Diff line
		@@ -2518,17 +2518,11 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_
		1, 1, 1, 2, 24, 69, 122, 194, 285, 487, 690, 1173, 2255, 4709, 10599, 24635, 10862, 4709, 2204, 1059, 566, 330, 221, 150, 95, 59, 28, 2, 1, 1, 1
		};


		#ifndef FIX_891_PARAMUPMIX_CLEANUP
		/----------------------------------------------------------------------------------
		* Parametric Upmix MC ROM tables
		----------------------------------------------------------------------------------/

		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		const int16_t ivas_param_upmx_mx_qmap[33] =
		{
		0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0
		};
		#else
		const int16_t ivas_param_upmx_mx_qmap[2][33] =
		{
		{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
		@@ -6446,6 +6440,11 @@ const int16_t sns_1st_means_32k[2][16] =
		-----------------------------------------------------------------------/

		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		const int16_t ivas_param_upmx_mx_qmap[33] =
		{
		0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0
		};

		const ACPL_QUANT_TABLE ivas_mc_paramupmix_alpha_quant_table =
		{
		33, /* nquant */

+2 −4

Original line number	Diff line number	Diff line
		@@ -259,16 +259,13 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_combined_48_16bits[PARAM_MC_SZ_
		extern const uint16_t ivas_param_mc_cum_freq_icc_delta_combined_48_16bits[2 * PARAM_MC_SZ_ICC_QUANTIZER];
		extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PARAM_MC_SZ_ICC_QUANTIZER - 1];

		#ifndef FIX_891_PARAMUPMIX_CLEANUP
		/----------------------------------------------------------------------------------
		* Parametric Upmix MC ROM tables
		----------------------------------------------------------------------------------/
		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		extern const int16_t ivas_param_upmx_mx_qmap[33];
		#else
		extern const int16_t ivas_param_upmx_mx_qmap[2][33];
		#endif


		/----------------------------------------------------------------------------------
		* MASA ROM tables
		----------------------------------------------------------------------------------/
		@@ -458,6 +455,7 @@ extern const int16_t sns_1st_means_32k[2][16];
		-----------------------------------------------------------------------/
		#ifdef FIX_891_PARAMUPMIX_CLEANUP

		extern const int16_t ivas_param_upmx_mx_qmap[33];
		extern const ACPL_QUANT_TABLE ivas_mc_paramupmix_alpha_quant_table;
		extern const ACPL_QUANT_TABLE ivas_mc_paramupmix_beta_quant_table[9];
		#else

+2 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ static void ivas_param_upmix_dec_decorr_subframes( Decoder_Struct *st_ivas, cons
		static void paramupmix_td_decorr_process( ivas_td_decorr_state_t hTdDecorr[], float pcm_in[], float **pp_out_pcm, const int16_t output_frame );

		static int16_t huff_read( Decoder_State st, const int16_t ( ht )[2] );

		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		static void huffman_decode( Decoder_State st, const PAR_TYPE parType, int32_t vq );

		@@ -97,6 +98,7 @@ static void dequant_beta( const int16_t nv, const int16_t ivStart, const QUANT_T
		static void get_ec_data( Decoder_State st, const PAR_TYPE parType, const QUANT_TYPE quant_type, const int16_t nParBand, const int16_t parBandStart, int32_t parQ, int32_t *alphaQEnv, float ab[IVAS_MAX_NUM_BANDS] );
		#endif


		/*-------------------------------------------------------------------------
		* ivas_mc_paramupmix_dec_read_BS()
		*

+7 −5

Original line number	Diff line number	Diff line
		@@ -745,8 +745,8 @@ static const int16_t huff_nodes_first_band_alpha_coarse[16][2] =
		{ -2, -16 },
		{ -1, -17 }
		};
		#endif

		#endif
		/* Alpha Fine Huffman table df */
		static const int16_t huff_nodes_alpha_1D_DF[64][2] =
		{
		@@ -853,8 +853,8 @@ static const int16_t huff_nodes_alpha_1D_DF_coarse[32][2] =
		{ -3, -4 },
		{ -2, -32 }
		};
		#endif

		#endif
		/* Alpha Fine Huffman table dt */
		static const int16_t huff_nodes_alpha_1D_DT[64][2] =
		{
		@@ -961,8 +961,8 @@ static const int16_t huff_nodes_alpha_1D_DT_coarse[32][2] =
		{ -4, -30 },
		{ -2, -32 }
		};
		#endif

		#endif
		/* Beta Fine Huffman table df0 */
		static const int16_t huff_nodes_first_band_beta[8][2] =
		{
		@@ -975,8 +975,8 @@ static const int16_t huff_nodes_first_band_beta_coarse[4][2] =
		{
		{ -1, 1 }, { -2, 2 }, { -3, 3 }, { -4, -5 }
		};
		#endif

		#endif
		/* Beta Fine Huffman table df */
		static const int16_t huff_nodes_beta_1D_DF[16][2] =
		{
		@@ -989,8 +989,8 @@ static const int16_t huff_nodes_beta_1D_DF_coarse[8][2] =
		{
		{ -5, 1 }, { -6, 2 }, { -4, 3 }, { -3, 4 }, { -7, 5 }, { -2, 6 }, { -8, 7 }, { -1, -9 }
		};
		#endif

		#endif
		/* Beta Fine Huffman table dt */
		static const int16_t huff_nodes_beta_1D_DT[16][2] =
		{
		@@ -1011,11 +1011,13 @@ const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0 =
		huff_nodes_first_band_alpha,
		huff_nodes_first_band_beta
		};

		const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df =
		{
		huff_nodes_alpha_1D_DF,
		huff_nodes_beta_1D_DF
		};

		const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt =
		{
		huff_nodes_alpha_1D_DT,