formatting; add "const" to function input parameter (6093927c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3906,7 +3906,7 @@ ivas_error ivas_spar_md_enc_process(
		float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
		float *cov_dtx_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
		BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */
		int16_t dtx_vad,
		const int16_t dtx_vad,
		const int16_t nchan_inp,
		const int16_t sba_order /* i : Ambisonic (SBA) order */
		);

lib_com/ivas_spar_com.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -912,7 +912,6 @@ static void ivas_calc_post_pred_per_band(
		{
		for ( k = 0; k < num_ch; k++ )
		{

		IVAS_RMULT_FLOAT( mixer_mat[i][k][band_idx], temp_mat[k][j], tmp_re );
		postpred_cov_re[i][j] += tmp_re;
		}
		@@ -1213,6 +1212,7 @@ static void ivas_calc_c_coeffs_per_band(
		else
		{
		ivas_calc_mat_inv( cov_dd_re, num_dmx - 1, cov_dd_re_inv );

		for ( i = 0; i < num_ch - num_dmx; i++ )
		{
		for ( j = 0; j < num_dmx - 1; j++ )
		@@ -1390,6 +1390,7 @@ static void ivas_get_mat_cofactor(
		*
		* Calculate Invert of a matrix
		-----------------------------------------------------------------------------------------/

		static void ivas_calc_mat_inv(
		float in_re[MAX_MAT_DIM][MAX_MAT_DIM],
		const int16_t dim,
		@@ -1489,6 +1490,7 @@ static void ivas_calc_mat_inv(
		*
		* Check if matrix is invertible or not by checking if determinant is 0 or very close to 0
		-----------------------------------------------------------------------------------------/

		static int16_t ivas_is_mat_inv(
		float in_re[MAX_MAT_DIM][MAX_MAT_DIM],
		const int16_t dim )
		@@ -1624,7 +1626,6 @@ void ivas_compute_spar_params(
		}
		}


		return;
		}

lib_dec/ivas_spar_md_dec.c

+13 −20

Original line number	Diff line number	Diff line
		@@ -82,7 +82,9 @@ static void ivas_spar_md_fill_invalid_bands( ivas_spar_dec_matrices_t *pSpar_coe
		static ivas_error ivas_spar_set_dec_config( ivas_spar_md_dec_state_t hMdDec, const int16_t nchan_transport, float pFC );

		static void ivas_parse_parameter_bitstream_dtx( ivas_spar_md_t pSpar_md, Decoder_State st, const int16_t bw, const int16_t num_bands, int16_t num_dmx_per_band, int16_t num_dec_per_band );

		static ivas_error ivas_deindex_real_index( const int16_t index, const int16_t q_levels, const float min_value, const float max_value, float quant, const int16_t num_ch_dim2 );

		static void ivas_spar_dec_parse_md_bs( ivas_spar_md_dec_state_t hMdDec, Decoder_State st, int16_t nB, int16_t bands_bw, int16_t *dtx_vad, const int32_t ivas_total_brate, const int16_t use_planar_coeff, const int16_t sba_inactive_mode );


		@@ -443,8 +445,7 @@ ivas_error ivas_spar_md_dec_init(

		hMdDec->spar_md.num_bands = ( hMdDec->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND );

		ivas_spar_set_bitrate_config( &hMdDec->spar_md_cfg, hMdDec->table_idx,
		hMdDec->spar_md.num_bands );
		ivas_spar_set_bitrate_config( &hMdDec->spar_md_cfg, hMdDec->table_idx, hMdDec->spar_md.num_bands );

		nchan_transport = hMdDec->spar_md_cfg.nchan_transport;

		@@ -1207,7 +1208,6 @@ static void ivas_get_spar_matrices(
		for ( j = 1; j < numch_out; j++ )
		{
		for ( k = dmx_ch; k < numch_out; k++ )

		{
		for ( m = 0; m < numch_out; m++ )
		{
		@@ -1513,8 +1513,7 @@ static void ivas_spar_dec_parse_md_bs(
		}
		}

		ivas_parse_parameter_bitstream_dtx( &hMdDec->spar_md, st0, bands_bw, nB,
		hMdDec->spar_md_cfg.num_dmx_chans_per_band, hMdDec->spar_md_cfg.num_decorr_per_band );
		ivas_parse_parameter_bitstream_dtx( &hMdDec->spar_md, st0, bands_bw, nB, hMdDec->spar_md_cfg.num_dmx_chans_per_band, hMdDec->spar_md_cfg.num_decorr_per_band );
		{
		int16_t ndec, b, idx;
		for ( i = *nB - 1; i >= 0; i-- )
		@@ -1608,6 +1607,7 @@ static void ivas_spar_dec_parse_md_bs(
		int16_t ndec = hMdDec->spar_md_cfg.num_decorr_per_band[( bands_bw ) i];
		int16_t ndm = hMdDec->spar_md_cfg.num_dmx_chans_per_band[( bands_bw ) i];
		float quant[IVAS_SPAR_MAX_C_COEFF];

		ivas_deindex_real_index( hMdDec->spar_md.band_coeffs_idx[i].pred_index_re, qs.PR.q_levels[0], qs.PR.min, qs.PR.max, hMdDec->spar_md.band_coeffs[i].pred_re, ndm + ndec - 1 );

		j = 0;
		@@ -1620,6 +1620,7 @@ static void ivas_spar_dec_parse_md_bs(
		}
		}
		ivas_deindex_real_index( hMdDec->spar_md.band_coeffs_idx[i].drct_index_re, qs.C.q_levels[0], qs.C.min, qs.C.max, quant, ndec * ( ndm - 1 ) );

		j = 0;
		for ( ii = 0; ii < ndec; ii++ )
		{
		@@ -1630,6 +1631,7 @@ static void ivas_spar_dec_parse_md_bs(
		}
		}
		ivas_deindex_real_index( hMdDec->spar_md.band_coeffs_idx[i].decd_index_re, qs.P_r.q_levels[0], qs.P_r.min, qs.P_r.max, hMdDec->spar_md.band_coeffs[i].P_re, ndm + ndec - 1 );

		/* Store prior coefficient indices */
		for ( j = 0; j < ndm + ndec - 1; j++ )
		{
		@@ -1749,7 +1751,7 @@ static void ivas_decode_arith_bs(
		const int16_t freq_diff,
		const int16_t planarCP )
		{
		int16_t i, ndm, ndec;
		int16_t i, j, ndm, ndec;
		ivas_cell_dim_t pred_cell_dims[IVAS_MAX_NUM_BANDS];
		ivas_cell_dim_t drct_cell_dims[IVAS_MAX_NUM_BANDS];
		ivas_cell_dim_t decd_cell_dims[IVAS_MAX_NUM_BANDS];
		@@ -1793,7 +1795,6 @@ static void ivas_decode_arith_bs(
		{
		if ( hMdDec->spar_hoa_md_flag )
		{
		int16_t j;
		for ( i = 0; i < nB; i++ )
		{
		if ( i >= SPAR_DIRAC_SPLIT_START_BAND )
		@@ -1816,7 +1817,6 @@ static void ivas_decode_arith_bs(

		if ( hMdDec->spar_hoa_md_flag )
		{
		int16_t j;
		for ( i = 0; i < nB; i++ )
		{
		if ( i >= SPAR_DIRAC_SPLIT_START_BAND )
		@@ -2092,8 +2092,7 @@ static void ivas_decode_huffman_bs(

		for ( j = pred_offset; j < pred_dim; j++ )
		{
		ivas_huffman_decode( &hMdDec->huff_coeffs.pred_huff_re[qsi], st0,
		&hMdDec->spar_md.band_coeffs_idx[i].pred_index_re[j] );
		ivas_huffman_decode( &hMdDec->huff_coeffs.pred_huff_re[qsi], st0, &hMdDec->spar_md.band_coeffs_idx[i].pred_index_re[j] );
		}

		if ( hMdDec->spar_hoa_md_flag )
		@@ -2115,8 +2114,7 @@ static void ivas_decode_huffman_bs(
		}
		else
		{
		ivas_huffman_decode( &hMdDec->huff_coeffs.drct_huff_re[qsi], st0,
		&hMdDec->spar_md.band_coeffs_idx[i].drct_index_re[j] );
		ivas_huffman_decode( &hMdDec->huff_coeffs.drct_huff_re[qsi], st0, &hMdDec->spar_md.band_coeffs_idx[i].drct_index_re[j] );
		}
		}

		@@ -2128,8 +2126,7 @@ static void ivas_decode_huffman_bs(
		}
		else
		{
		ivas_huffman_decode( &hMdDec->huff_coeffs.decd_huff_re[qsi], st0,
		&hMdDec->spar_md.band_coeffs_idx[i].decd_index_re[j] );
		ivas_huffman_decode( &hMdDec->huff_coeffs.decd_huff_re[qsi], st0, &hMdDec->spar_md.band_coeffs_idx[i].decd_index_re[j] );
		}
		}
		}
		@@ -2758,9 +2755,7 @@ void ivas_spar_to_dirac(
		if ( hMdDec->spar_md_cfg.nchan_transport > 1 )
		{
		ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, 1, NULL, &hMdDec->spar_md, &hMdDec->spar_md_cfg,
		end_band, num_bands_out,
		( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal,
		dtx_vad, NULL );
		end_band, num_bands_out, ( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal, dtx_vad, NULL );

		/* temporarily copy frame-wise prediction coefficients in DirAC bands*/
		for ( pred_idx = 0; pred_idx < FOA_CHANNELS - 1; pred_idx++ )
		@@ -2773,9 +2768,7 @@ void ivas_spar_to_dirac(
		}

		ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, MAX_PARAM_SPATIAL_SUBFRAMES, NULL, &hMdDec->spar_md, &hMdDec->spar_md_cfg,
		end_band, num_bands_out,
		( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal,
		dtx_vad, NULL );
		end_band, num_bands_out, ( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal, dtx_vad, NULL );

		/* expand DirAC TC 20ms MD for residual channels to all subframes*/
		for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ )

lib_enc/ivas_dirac_enc.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -334,8 +334,8 @@ void ivas_dirac_enc(
		set_zero( data_f[2], input_frame );
		}

		ivas_dirac_param_est_enc( hDirAC, &( hQMetaData->q_direction[0] ), hQMetaData->useLowerRes, data_f, NULL, NULL, input_frame,
		SBA_MODE_DIRAC );
		ivas_dirac_param_est_enc( hDirAC, &( hQMetaData->q_direction[0] ), hQMetaData->useLowerRes, data_f, NULL, NULL, input_frame, SBA_MODE_DIRAC );

		/* encode parameters */
		if ( sba_planar \|\| hQMetaData->useLowerRes )
		{
		@@ -427,6 +427,7 @@ void ivas_dirac_enc(
		{
		/indicate whether SPAR or DiRAC mode/
		push_next_indice( hMetaData, 0, 1 );

		/* encode SID parameters */
		ivas_qmetadata_enc_sid_encode( hMetaData, hQMetaData, -1, SBA_FORMAT, SBA_MODE_DIRAC );
		}
		@@ -889,6 +890,7 @@ static void computeIntensityVector_enc(
		int16_t i, j;
		float real, img;
		int16_t brange[2];

		for ( i = 0; i < num_frequency_bands; i++ )
		{
		brange[0] = hDirAC->band_grouping[i + enc_param_start_band];

lib_enc/ivas_spar_encoder.c

+3 −11

Original line number	Diff line number	Diff line
		@@ -233,7 +233,6 @@ void ivas_spar_enc_close(
		hSpar->hFrontVad = NULL;
		}


		num_chans = hSpar->hFbMixer->fb_cfg->num_in_chans;
		assert( num_chans <= nchan_inp );

		@@ -436,10 +435,7 @@ static ivas_error ivas_spar_enc_process(
		* DirAC encoding
		-----------------------------------------------------------------------------------------/

		ivas_dirac_param_est_enc( st_ivas->hDirAC, hQMetaData->q_direction, hQMetaData->useLowerRes,
		data_f, ppIn_FR_real, ppIn_FR_imag, input_frame,
		st_ivas->sba_mode );

		ivas_dirac_param_est_enc( st_ivas->hDirAC, hQMetaData->q_direction, hQMetaData->useLowerRes, data_f, ppIn_FR_real, ppIn_FR_imag, input_frame, st_ivas->sba_mode );

		if ( hQMetaData->q_direction->cfg.nbands > 0 )
		{
		@@ -502,7 +498,6 @@ static ivas_error ivas_spar_enc_process(

		if ( dtx_vad == 0 )
		{

		for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
		{
		hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].azimuth[i] = hQMetaData->q_direction[0].band_data[1].azimuth[0];
		@@ -549,8 +544,7 @@ static ivas_error ivas_spar_enc_process(
		if ( hSpar->hMdEnc->table_idx != table_idx )
		{
		hSpar->hMdEnc->table_idx = table_idx;
		ivas_spar_set_bitrate_config( &hSpar->hMdEnc->spar_md_cfg, table_idx,
		( hSpar->hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND );
		ivas_spar_set_bitrate_config( &hSpar->hMdEnc->spar_md_cfg, table_idx, ( hSpar->hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND );
		}

		nchan_transport = st_ivas->nchan_transport;
		@@ -604,9 +598,7 @@ static ivas_error ivas_spar_enc_process(
		}

		ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, 1, hSpar->hMdEnc->mixer_mat, &hSpar->hMdEnc->spar_md, &hSpar->hMdEnc->spar_md_cfg,
		d_start_band, d_end_band,
		( hSpar->hMdEnc->spar_hoa_md_flag ) ? 1 : sba_order,
		dtx_vad, Wscale_d );
		d_start_band, d_end_band, ( hSpar->hMdEnc->spar_hoa_md_flag ) ? 1 : sba_order, dtx_vad, Wscale_d );
		}

		if ( hSpar->hMdEnc->spar_hoa_md_flag )