Improved spacing (0dbeb47b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -1358,14 +1358,15 @@ typedef enum {
		FINE,
		COARSE
		} QUANT_TYPE;
		#endif

		#endif
		typedef struct {
		int16_t nquant;
		int16_t offset;
		float data[35];
		} ACPL_QUANT_TABLE;
		#ifdef FIX_891_PARAMUPMIX_CLEANUP

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

lib_com/ivas_rom_com.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2522,6 +2522,7 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_
		/----------------------------------------------------------------------------------
		* Parametric Upmix MC ROM tables
		----------------------------------------------------------------------------------/

		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		const int16_t ivas_param_upmx_mx_qmap[33] =
		{
		@@ -6443,6 +6444,7 @@ const int16_t sns_1st_means_32k[2][16] =
		/----------------------------------------------------------------------
		* MC ParamUpmix ROM tables
		-----------------------------------------------------------------------/

		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		const ACPL_QUANT_TABLE ivas_mc_paramupmix_alpha_quant_table =
		{
		@@ -6602,4 +6604,5 @@ const ACPL_QUANT_TABLE ivas_mc_paramupmix_beta_quant_table[2][9] =
		}
		};
		#endif

		/* clang-format on */

lib_com/ivas_rom_com.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -457,6 +457,7 @@ extern const int16_t sns_1st_means_32k[2][16];
		* MC ParamUpmix ROM tables
		-----------------------------------------------------------------------/
		#ifdef FIX_891_PARAMUPMIX_CLEANUP

		extern const ACPL_QUANT_TABLE ivas_mc_paramupmix_alpha_quant_table;
		extern const ACPL_QUANT_TABLE ivas_mc_paramupmix_beta_quant_table[9];
		#else

lib_dec/ivas_mc_paramupmix_dec.c

+4 −12

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ static void paramupmix_td_decorr_process( ivas_td_decorr_state_t *hTdDecorr[], f

		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, PAR_TYPE parType, int32_t vq );
		static void huffman_decode( Decoder_State st, const PAR_TYPE parType, int32_t vq );

		static void dequant_alpha( int32_t vq, float v );

		@@ -1360,9 +1360,9 @@ static void huffman_decode(
		int32_t *vq )
		{
		const int16_t( *huff_node_table )[2];

		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		int16_t iv, nquant, offset;

		nquant = 0;
		switch ( parType )
		{
		@@ -1511,15 +1511,11 @@ static void dequant_alpha(
		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		const ACPL_QUANT_TABLE *quant_table = &ivas_mc_paramupmix_alpha_quant_table;

		for ( iv = 0; iv < 0; iv++ )
		{
		v[iv] = 0;
		}

		for ( iv = 0; iv < IVAS_MAX_NUM_BANDS; iv++ )
		{
		v[iv] = quant_table->data[vq[iv]];
		}

		#else
		const ACPL_QUANT_TABLE *quant_table = &ivas_mc_paramupmix_alpha_quant_table[quant_type];

		@@ -1551,16 +1547,12 @@ static void dequant_beta(
		const ACPL_QUANT_TABLE *quant_table;

		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		for ( iv = 0; iv < 0; iv++ )
		{
		beta[iv] = 0;
		}

		for ( iv = 0; iv < IVAS_MAX_NUM_BANDS; iv++ )
		{
		quant_table = &ivas_mc_paramupmix_beta_quant_table[ivas_param_upmx_mx_qmap[aq[iv]]];
		beta[iv] = quant_table->data[bq[iv]];
		}

		#else
		for ( iv = 0; iv < ivStart; iv++ )
		{

lib_enc/ivas_mc_paramupmix_enc.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ static void ivas_mc_paramupmix_dmx( MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, floa

		static void ivas_mc_paramupmix_param_est_enc( MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, float *input_frame_t[], const int16_t input_frame, float alphas[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS], float betas[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS] );
		#ifdef FIX_891_PARAMUPMIX_CLEANUP

		static void get_huff_table( const PAR_TYPE par_type, HUFF_TAB df0, HUFF_TAB df );
		#else
		static void get_huff_table( const PAR_TYPE par_type, const QUANT_TYPE quant_type, HUFF_TAB df0, HUFF_TAB df, HUFF_TAB *dt );
		@@ -74,6 +75,7 @@ static void put_ec_data( MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, const int16_t c

		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		static void quantize_alpha( const float alpha, int16_t pnq, int32_t aq[IVAS_MAX_NUM_BANDS], float *adeq );

		static void quantize_pars( const float v, const int16_t nq, const float data, int32_t vq[IVAS_MAX_NUM_BANDS], float *vdeq );
		#else
		static void quantize_alpha( const int16_t nv, const float alpha, const QUANT_TYPE quant_type, int16_t pnq, int32_t aq[IVAS_MAX_NUM_BANDS], float *adeq );
		@@ -81,8 +83,8 @@ static void quantize_alpha( const int16_t nv, const float *alpha, const QUANT_TY
		static void quantize_pars( const int16_t nv, const float v, const int16_t nq, const float data, int32_t vq[IVAS_MAX_NUM_BANDS], float *vdeq );

		static void quantize_pars( const int16_t nv, const float v, const int16_t nq, const float data, int32_t vq[IVAS_MAX_NUM_BANDS], float *vdeq );
		#endif

		#endif

		/*-------------------------------------------------------------------------
		* ivas_mc_paramupmix_enc()
		@@ -517,8 +519,8 @@ static void huffman_encode(
		{
		ndt = ndf + 1;
		}
		#endif

		#endif
		/* Write the bitstream */
		#ifdef FIX_891_PARAMUPMIX_CLEANUP
		bit_buffer[( *bit_pos )++] = (uint16_t) 0 & 1;