Added line spacing that was removed (e9bfe105) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_spar_com.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1273,6 +1273,7 @@ void ivas_calc_c_p_coeffs(
		{
		ivas_calc_c_coeffs_per_band( pSparMd, i_ts, postpred_cov_re, num_ch, num_dmx, band_idx, dtx_vad );
		}

		#ifndef FIX_280_PLANAR_CP
		if ( planarCP )
		{
		@@ -1288,10 +1289,12 @@ void ivas_calc_c_p_coeffs(
		}
		}
		#endif

		if ( compute_p_flag == 1 )
		{
		ivas_calc_p_coeffs_per_band( pSparMd, i_ts, postpred_cov_re, num_ch, dtx_vad, num_dmx, band_idx );
		}

		#ifndef FIX_280_PLANAR_CP
		if ( planarCP )
		{

lib_dec/ivas_spar_md_dec.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ static const int16_t ivas_spar_dec_plc_spatial_target[IVAS_SPAR_MAX_CH] = { 1, 0
		------------------------------------------------------------------------------------------/

		static void ivas_get_spar_matrices( ivas_spar_md_dec_state_t *hMdDec, const int16_t num_bands_out, const int16_t n_ts, const int16_t bw, const int16_t dtx_vad, const int16_t nB, const int16_t numch_out, const int16_t active_w_vlbr );

		#ifndef FIX_280_PLANAR_CP
		static void ivas_decode_arith_bs( ivas_spar_md_dec_state_t hMdDec, Decoder_State st, const uint16_t qsi, const int16_t nB, const int16_t bands_bw, int16_t *pDo_diff, const int16_t freq_diff, const int16_t planarCP, const int16_t strat, const int32_t ivas_total_brate );

		@@ -1838,6 +1839,7 @@ static void ivas_spar_dec_parse_md_bs(
		}

		qs = hMdDec->spar_md_cfg.quant_strat[qsi];

		#ifndef FIX_280_PLANAR_CP
		planarCP = 0;
		if ( ( qsi == 2 ) && ( use_planar_coeff ) )
		@@ -2187,6 +2189,7 @@ static void ivas_decode_arith_bs(
		#endif
		);
		}

		#ifndef FIX_280_PLANAR_CP
		if ( planarCP )
		{
		@@ -2196,6 +2199,7 @@ static void ivas_decode_arith_bs(
		}
		}
		#endif

		ivas_arith_decode_cmplx_cell_array( &hMdDec->arith_coeffs.drct_arith_re[qsi], &hMdDec->arith_coeffs.drct_arith_re_diff[qsi],
		st0, drct_cell_dims, pDo_diff, nB, symbol_arr_re, symbol_arr_old_re );

		@@ -2215,6 +2219,7 @@ static void ivas_decode_arith_bs(
		#endif
		);
		}

		#ifndef FIX_280_PLANAR_CP
		if ( planarCP )
		{

lib_enc/ivas_spar_md_enc.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ static void ivas_band_mixer( float *cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
		#ifndef FIX_383_CLEAN_UP
		static void ivas_get_band_differential_index( ivas_band_coeffs_ind_t *pBand_idx, const int16_t q_levels[2], const int16_t one_sided, const int16_t nB, const int16_t complex_cov, const int16_t dim, const ivas_coeffs_type_t coeff_type );
		#endif

		static int16_t ivas_get_huffman_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi,
		#ifndef FIX_280_PLANAR_CP
		const int16_t planarCP,
		@@ -89,11 +90,13 @@ static ivas_error ivas_spar_set_enc_config( ivas_spar_md_enc_state_t *hMdEnc, in
		static void ivas_select_next_strat( ivas_strats_t prior_strat, ivas_strats_t cs[MAX_QUANT_STRATS], const int16_t dmx_switch, const int16_t dtx_vad );

		static void ivas_store_prior_coeffs( ivas_spar_md_enc_state_t *hMdEnc, const int16_t num_bands, const int16_t strat, const int16_t dtx_vad, const int16_t qsi );

		#ifndef FIX_280_PLANAR_CP
		static void ivas_write_spar_md_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t strat, const int16_t qsi, const int16_t planarCP );
		#else
		static void ivas_write_spar_md_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t strat, const int16_t qsi );
		#endif

		static void ivas_spar_quant_pred_coeffs_dtx( ivas_spar_md_t pSpar_md, const float pValues, const int16_t ndm, int16_t pIndex, const int16_t dim1, float pQuant );

		static void ivas_quant_p_per_band_dtx( float pP_mat, const int16_t num_dec, const int16_t num_dmx, int16_t ppIdx_pd, float *pP_out, const int16_t num_ch );
		@@ -786,6 +789,7 @@ ivas_error ivas_spar_md_enc_process(
		fprintf(stderr, "\n\n"); */
		#endif


		#ifndef FIX_280_PLANAR_CP
		if ( planarCP )
		{
		@@ -949,6 +953,7 @@ ivas_error ivas_spar_md_enc_process(
		#endif
		}
		#endif

		ivas_quant_c_per_band( &hMdEnc->spar_md.band_coeffs[b], &hMdEnc->spar_md.band_coeffs_idx[b],
		&hMdEnc->spar_md_cfg.quant_strat[qsi], ndec, ndm );
		#ifdef SPAR_HOA_DBG
		@@ -1522,6 +1527,7 @@ static int16_t ivas_get_huffman_coded_bs(
		pred_offset = DIRAC_TO_SPAR_HBR_PRED_CHS;
		}
		}

		#ifndef FIX_280_PLANAR_CP
		if ( planarCP )
		{
		@@ -1761,6 +1767,7 @@ static int16_t ivas_get_arith_coded_bs(
		#endif
		);
		}

		#ifndef FIX_280_PLANAR_CP
		if ( planarCP )
		{
		@@ -1770,6 +1777,7 @@ static int16_t ivas_get_arith_coded_bs(
		}
		}
		#endif

		arith_result = ivas_arith_encode_cmplx_cell_array( &hMdEnc->arith_coeffs.drct_arith_re[qsi], &hMdEnc->arith_coeffs.drct_arith_re_diff[qsi], pDo_diff, nB,
		symbol_arr_re, symbol_arr_old_re, drct_cell_dims, hMetaData, any_diff, hMdEnc->spar_md_cfg.max_bits_per_blk );
		if ( arith_result < 0 )
		@@ -1793,6 +1801,7 @@ static int16_t ivas_get_arith_coded_bs(
		#endif
		);
		}

		#ifndef FIX_280_PLANAR_CP
		if ( planarCP )
		{