formatting of empty lines (dc1087e0) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_mc_param_com.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,7 @@ void ivas_param_mc_metadata_open(
		{
		assert( 0 && "nbands must be 20 or 14!" );
		}

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		/* create map of all possible ICCs */
		ivas_param_mc_create_full_icc_mapping( nchan_setup, lfe_index, hMetadataPMC->icc_map_full, &hMetadataPMC->icc_map_size_full );

lib_com/ivas_prot.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3897,8 +3897,8 @@ void ivas_param_mc_default_icc_map(
		const PARAM_MC_ICC_MAPPING * hIccMapping, /* i : handle to ICC mapping configuration */
		int16_t icc_map[PARAM_MC_SZ_ICC_MAP][2] /* o : copy of map from the configuration */
		);
		#endif

		#endif
		/! r: number of cldfb synthesis instances /
		int16_t param_mc_get_num_cldfb_syntheses(
		Decoder_Struct st_ivas / i : IVAS decoder structure */

lib_com/ivas_rom_com.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1989,8 +1989,8 @@ const float ivas_param_mc_ild_fac_CICP19_4tc[12] =
		0.5f,
		0.2f,
		};
		#endif

		#endif
		const PARAM_MC_ILD_MAPPING ivas_param_mc_ild_mapping_CICP6_2tc =
		{
		5,
		@@ -2063,8 +2063,8 @@ const PARAM_MC_ILD_MAPPING ivas_param_mc_ild_mapping_CICP19_4tc =
		{1,1,2,1,1,1,1,1,1,1,1,2},
		{{0},{1},{0,1},{0},{1},{0},{1},{2},{3},{2},{3},{0,1}}
		};
		#endif

		#endif
		const PARAM_MC_ICC_MAPPING ivas_param_mc_icc_mapping_CICP6_2tc =
		{
		4,
		@@ -2181,8 +2181,8 @@ const PARAM_MC_ICC_MAPPING ivas_param_mc_icc_mapping_CICP19_4tc =
		{ 2, 3 } /* C/LFE */
		}
		};
		#endif

		#endif
		const PARAM_MC_CONF ivas_param_mc_conf[PARAM_MC_NUM_CONFIGS] =
		{
		/* CICP6 48000 */

lib_dec/ivas_mc_param_dec.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -649,9 +649,10 @@ ivas_error ivas_param_mc_dec_reconfig(
		hParamMC->hMetadataPMC->icc_map_full[k] = NULL;
		}
		}
		#endif

		#endif
		mvs2s( hParamMC->band_grouping, band_grouping_old, hParamMC->hMetadataPMC->num_parameter_bands + 1 );

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		ivas_param_mc_metadata_open( mc_ls_setup, hTransportSetup.index_lfe[0], ivas_total_brate, hParamMC->hMetadataPMC );
		#else
		@@ -1382,8 +1383,8 @@ void ivas_param_mc_dec_read_BS(
		ivas_param_mc_default_icc_map( hMetadataPMC->icc_mapping_conf, hMetadataPMC->icc_mapping[hMetadataPMC->param_frame_idx] );
		}
		}
		#endif

		#endif
		ivas_param_mc_bs_decode_parameter_values( bit_buffer, &bit_pos, bits_to_copy, &st->BER_detect, hMetadataPMC, &hMetadataPMC->icc_coding,
		icc_map_size_wo_lfe, icc_map_size, num_lfe_bands, band_step, num_param_bands, hParamMC->icc_q );
		if ( !st->BER_detect )

lib_enc/ivas_mc_param_enc.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -64,8 +64,8 @@ static void ivas_param_mc_transient_detection( PARAM_MC_ENC_HANDLE hParamMC, TRA

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		static void ivas_param_mc_enc_find_icc_map( PARAM_MC_ENC_HANDLE hParamMC, float Cx_sum[][PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_TRANSPORT_CHANS], float Cy_sum[][MAX_CICP_CHANNELS][MAX_CICP_CHANNELS], float ILD_q[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_SZ_ILD_MAP], const int16_t nchan_input, const int16_t nchan_transport );
		#endif

		#endif
		static void ivas_param_mc_quantize_iccs( PARAM_MC_ENC_HANDLE hParamMC, float Cy[MAX_CICP_CHANNELS][MAX_CICP_CHANNELS], const int16_t freq_idx, const int16_t nchan_input, int16_t *ICC_idx_out );

		static void ivas_param_mc_quantize_ilds( PARAM_MC_ENC_HANDLE hParamMC, float Cy[MAX_CICP_CHANNELS][MAX_CICP_CHANNELS], float Cx[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_TRANSPORT_CHANS], const int16_t freq_idx, const int16_t nchan_input, const int16_t nchan_transport, int16_t *ILD_idx_out, float ILD_q[PARAM_MC_SZ_ILD_MAP] );
		@@ -306,8 +306,8 @@ ivas_error ivas_param_mc_enc_reconfig(
		hParamMC->hMetadataPMC.icc_map_full[i] = NULL;
		}
		}
		#endif

		#endif
		/* open/init parameter coding */
		#ifndef FIX_901_PARAMMC_DEAD_CODE
		ivas_param_mc_metadata_open( mc_input_setup, hParamMC->lfe_index, ivas_total_brate, &hParamMC->hMetadataPMC );
		@@ -332,8 +332,8 @@ ivas_error ivas_param_mc_enc_reconfig(
		}
		}
		}
		#endif

		#endif
		/* Band Grouping */
		if ( hParamMC->hMetadataPMC.num_parameter_bands == 20 )
		{
		@@ -395,6 +395,7 @@ void ivas_param_mc_enc_close(
		{
		return;
		}

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		ivas_param_mc_metadata_close( &( *hParamMC )->hMetadataPMC );
		#endif
		@@ -541,8 +542,8 @@ void ivas_param_mc_enc(
		{
		ivas_param_mc_default_icc_map( hParamMC->hMetadataPMC.icc_mapping_conf, hParamMC->hMetadataPMC.icc_mapping[hParamMC->hMetadataPMC.param_frame_idx] );
		}
		#endif

		#endif
		/* ICC parameter quantization */
		for ( k = 0; k < hParamMC->hMetadataPMC.nbands_coded; k += band_step )
		{
		@@ -1672,8 +1673,8 @@ static void ivas_param_mc_write_bs(

		*bit_pos += hParamMC->hMetadataPMC.icc_map_size_full - 1;
		}
		#endif

		#endif
		ivas_param_mc_encode_parameter( ICC_idx, &hParamMC->hMetadataPMC, &hParamMC->hMetadataPMC.icc_coding,
		nbands, band_step, icc_map_size_wo_lfe, icc_map_size, bit_buffer, bit_pos );