[cleanup] accept FIX_901_PARAMMC_DEAD_CODE (5c7128e0) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -1390,17 +1390,9 @@ typedef enum
		#define PARAM_MC_ICC_ERROR_BIAS_FAC (1.15f) /* factor for favouring past ICC maps in the adaptive ICC map decision */
		#define PARAM_MC_TRANSIENT_BAND_STEP 2 /* Number of parameter bands combined in case of a transient frame*/
		#define PARAM_MC_MAX_DECORR_CLDFB_BANDS 20 /* Maximum number of CLDFB bands with decorrelation */
		#ifdef FIX_901_PARAMMC_DEAD_CODE
		#define PARAM_MC_MAX_TRANSPORT_CHANS 3 /* Number of down mix channels */
		#else
		#define PARAM_MC_MAX_TRANSPORT_CHANS 4 /* Number of down mix channels */
		#endif
		#define PARAM_MC_MAX_ILD_REF_CHANNELS 2 /* Maximum number of reference channels for a coded ILD */
		#ifdef FIX_901_PARAMMC_DEAD_CODE
		#define PARAM_MC_NUM_CONFIGS 14 /* Number of available Parametric MC configurations */
		#else
		#define PARAM_MC_NUM_CONFIGS 15 /* Number of available Parametric MC configurations */
		#endif
		#define PARAM_MC_MAX_BAND_LFE 1 /* Number of parameter bands for LFE coding */
		#define PARAM_MC_SZ_ICC_MAP 11 /* Maximum number of transmitted ICCs per parameter band */
		#define PARAM_MC_SZ_ILD_MAP 12 /* Maximum number of transmitted channel energies per band*/

lib_com/ivas_mc_param_com.c

+0 −135

Original line number	Diff line number	Diff line
		@@ -87,22 +87,11 @@ uint16_t ivas_param_mc_get_configuration_index(

		void ivas_param_mc_metadata_open(
		const MC_LS_SETUP mc_ls_setup, /* i : MC ls setup */
		#ifndef FIX_901_PARAMMC_DEAD_CODE
		const int16_t lfe_index, /* i : channel index of LFE */
		#endif
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */
		HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* o : handle for the Parametric MC parameter coding state */
		)
		{
		#ifndef FIX_901_PARAMMC_DEAD_CODE
		int16_t i;
		#endif
		uint16_t config_index;
		#ifndef FIX_901_PARAMMC_DEAD_CODE
		int16_t nchan_setup;

		nchan_setup = ivas_mc_ls_setup_get_num_channels( mc_ls_setup );
		#endif

		/* get coding band mappings */
		set_s( hMetadataPMC->coding_band_mapping, 0, PARAM_MC_MAX_PARAMETER_BANDS );
		@@ -135,26 +124,12 @@ 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 );
		#endif
		hMetadataPMC->icc_mapping_conf = ivas_param_mc_conf[config_index].icc_mapping_conf;
		hMetadataPMC->ild_mapping_conf = ivas_param_mc_conf[config_index].ild_mapping_conf;
		hMetadataPMC->ild_factors = ivas_param_mc_conf[config_index].ild_factors;

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		/* set default ICC maps */
		for ( i = 0; i < PARAM_MC_PARAMETER_FRAMES; i++ )
		{
		ivas_param_mc_default_icc_map( hMetadataPMC->icc_mapping_conf, hMetadataPMC->icc_mapping[i] );
		}
		#endif
		/* init remaining flags and indices */
		hMetadataPMC->param_frame_idx = 0;
		#ifndef FIX_901_PARAMMC_DEAD_CODE
		hMetadataPMC->flag_use_adaptive_icc_map = 0;
		#endif
		hMetadataPMC->bAttackPresent = 0;
		hMetadataPMC->attackIndex = 0;
		hMetadataPMC->lfe_on = 1;
		@@ -209,32 +184,6 @@ void ivas_param_mc_set_coded_bands(
		return;
		}

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		/*-------------------------------------------------------------------------
		* ivas_param_mc_metadata_close()
		*
		* Parametric MC parameter coding state close function
		------------------------------------------------------------------------/

		void ivas_param_mc_metadata_close(
		HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* i/o: handle for the Parametric MC parameter coding state */
		)
		{
		uint16_t i;

		/* adaptive ICC mapping */
		for ( i = 0; i < 2; i++ )
		{
		if ( hMetadataPMC->icc_map_full[i] )
		{
		free( hMetadataPMC->icc_map_full[i] );
		hMetadataPMC->icc_map_full[i] = NULL;
		}
		}

		return;
		}
		#endif

		/*-------------------------------------------------------------------------
		* ivas_param_mc_getNumTransportChannels()
		@@ -258,85 +207,6 @@ int16_t ivas_param_mc_getNumTransportChannels(
		return nchan_transport;
		}

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		/*-------------------------------------------------------------------------
		* ivas_param_mc_create_full_icc_mapping()
		*
		* create the map of all possible ICCs for a certain internal setup
		* indicated by the number of channels and LFE index
		------------------------------------------------------------------------/

		void ivas_param_mc_create_full_icc_mapping(
		const int16_t n_channels, /* i : number of channels with LFE for the internal setup */
		const int16_t lfe_index, /* i : channel index of the LFE */
		int16_t icc_map[2], / o : map of all possible ICCs */
		int16_t icc_map_size_full / o : number of all possible ICCs */
		)
		{
		int16_t i, k, l;

		l = 0;

		/* number of all possible ICCs is the number of non-diagonal upper elements of a
		* ICC matrix for all channels not including the LFE plus one static ICC for the
		* combination (LFE/center) */
		icc_map_size_full = ( n_channels - 2 ) ( n_channels - 1 ) / 2 + 1;

		/* allocate memory for the map */
		for ( i = 0; i < 2; i++ )
		{
		icc_map[i] = (int16_t ) malloc( icc_map_size_full * sizeof( int16_t ) );
		}

		/* create map (non-LFE ICCs) */
		for ( i = 0; i < n_channels; i++ )
		{
		if ( i != lfe_index )
		{
		for ( k = i + 1; k < n_channels; k++ )
		{
		if ( k != lfe_index )
		{
		icc_map[0][l] = i;
		icc_map[1][l] = k;
		l++;
		}
		}
		}
		}

		/* last one is the fixed mapping center -> LFE */
		assert( l == *icc_map_size_full - 1 );

		icc_map[0][l] = 2;
		icc_map[1][l] = lfe_index;

		return;
		}

		/*-------------------------------------------------------------------------
		* ivas_param_mc_default_icc_map()
		*
		* get the default ICC map for a certain internal setup
		* indicated by the number of channels from the table ROM
		------------------------------------------------------------------------/

		void ivas_param_mc_default_icc_map(
		const PARAM_MC_ICC_MAPPING hIccMapping, / i : ICC mapping table */
		int16_t icc_map[PARAM_MC_SZ_ICC_MAP][2] /* o : copy of map from ROM table */
		)
		{
		int16_t i;

		for ( i = 0; i < hIccMapping->icc_map_size_lfe; i++ )
		{
		icc_map[i][0] = hIccMapping->icc_mapping[i][0];
		icc_map[i][1] = hIccMapping->icc_mapping[i][1];
		}

		return;
		}
		#endif


		/*-------------------------------------------------------------------------
		@@ -419,11 +289,6 @@ static int16_t ivas_param_mc_get_num_param_bands(
		case IVAS_128k:
		num_parameter_bands = 14;
		break;
		#ifndef FIX_901_PARAMMC_DEAD_CODE
		case IVAS_160k:
		num_parameter_bands = 20;
		break;
		#endif
		}
		break;
		default:

lib_com/ivas_prot.h

+0 −22

Original line number	Diff line number	Diff line
		@@ -3808,9 +3808,6 @@ void ivas_mc_paramupmix_dec_render(

		void ivas_param_mc_metadata_open(
		const MC_LS_SETUP mc_ls_setup, /* i : MC ls setup */
		#ifndef FIX_901_PARAMMC_DEAD_CODE
		const int16_t lfe_index, /* i : channel index of LFE */
		#endif
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */
		HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* o : handle for the Parametric MC parameter coding state */
		);
		@@ -3819,18 +3816,6 @@ void ivas_param_mc_set_coded_bands(
		HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* i/o: handle for the Parametric MC parameter coding state */
		);

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		void ivas_param_mc_metadata_close(
		HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* i/o: handle for the Parametric MC parameter coding state */
		);

		void ivas_param_mc_create_full_icc_mapping(
		const int16_t n_channels, /* i : number of channels with LFE for the internal setup */
		const int16_t lfe_index, /* i : channel index of the LFE */
		int16_t icc_map[2], / o : map of all possible ICCs */
		int16_t icc_map_size_full / o : number of all possible ICCs */
		);
		#endif
		/! r: number of IVAS transport channels /
		int16_t ivas_param_mc_getNumTransportChannels(
		const int32_t ivas_total_bitrate, /* i : IVAS total bitrate */
		@@ -3895,13 +3880,6 @@ void ivas_param_mc_dec(
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		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
		/! 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

+0 −61

Original line number	Diff line number	Diff line
		@@ -1973,24 +1973,6 @@ const float ivas_param_mc_ild_fac_CICP19_3tc[12] =
		0.5f
		};

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		const float ivas_param_mc_ild_fac_CICP19_4tc[12] =
		{
		0.35f,
		0.35f,
		0.17f,
		0.22f,
		0.2f,
		0.2f,
		0.2f,
		0.5f,
		0.5f,
		0.5f,
		0.5f,
		0.2f,
		};

		#endif
		const PARAM_MC_ILD_MAPPING ivas_param_mc_ild_mapping_CICP6_2tc =
		{
		5,
		@@ -2054,17 +2036,6 @@ const PARAM_MC_ILD_MAPPING ivas_param_mc_ild_mapping_CICP19_3tc =
		{{0},{1},{0},{1},{0},{1},{0},{1},{0},{1},{2},{2}}
		};

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		const PARAM_MC_ILD_MAPPING ivas_param_mc_ild_mapping_CICP19_4tc =
		{
		11,
		12,
		{0,1,2,4,5,6,7,8,9,10,11,3},
		{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
		const PARAM_MC_ICC_MAPPING ivas_param_mc_icc_mapping_CICP6_2tc =
		{
		4,
		@@ -2165,24 +2136,6 @@ const PARAM_MC_ICC_MAPPING ivas_param_mc_icc_mapping_CICP19_3tc =
		}
		};

		#ifndef FIX_901_PARAMMC_DEAD_CODE
		const PARAM_MC_ICC_MAPPING ivas_param_mc_icc_mapping_CICP19_4tc =
		{
		8,
		9,
		{ { 0, 4 }, /* L/LS */
		{ 1, 5 }, /* R/RS */
		{ 0, 2 }, /* L/C */
		{ 1, 2 }, /* R/C */
		{ 0, 6 }, /* L/LBS */
		{ 1, 7 }, /* R/RBS */
		{ 8, 10 }, /UFL/UBL /
		{ 9, 11 }, /UFR/UBR /
		{ 2, 3 } /* C/LFE */
		}
		};

		#endif
		const PARAM_MC_CONF ivas_param_mc_conf[PARAM_MC_NUM_CONFIGS] =
		{
		/* CICP6 48000 */
		@@ -2339,20 +2292,6 @@ const PARAM_MC_CONF ivas_param_mc_conf[PARAM_MC_NUM_CONFIGS] =
		&ivas_param_mc_dmx_fac_CICP19_3tc[0],
		&ivas_param_mc_ild_fac_CICP19_3tc[0]
		}
		#ifndef FIX_901_PARAMMC_DEAD_CODE
		,
		/* CICP19 160000 */
		{
		MC_LS_SETUP_7_1_4,
		12,
		4,
		IVAS_160k,
		&ivas_param_mc_ild_mapping_CICP19_4tc,
		&ivas_param_mc_icc_mapping_CICP19_4tc,
		&ivas_param_mc_dmx_fac_CICP19_4tc[0],
		&ivas_param_mc_ild_fac_CICP19_4tc[0]
		}
		#endif
		};

		const float ivas_param_mc_quant_ild_5d1_48[PARAM_MC_SZ_ILD_QUANTIZER_4BITS] =

lib_com/ivas_stat_com.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -595,15 +595,8 @@ typedef struct ivas_parametric_mc_metadata_struct
		{
		const PARAM_MC_ILD_MAPPING *ild_mapping_conf;
		const PARAM_MC_ICC_MAPPING *icc_mapping_conf;
		#ifndef FIX_901_PARAMMC_DEAD_CODE
		int16_t icc_mapping[PARAM_MC_PARAMETER_FRAMES][PARAM_MC_SZ_ICC_MAP][2];
		int16_t *icc_map_full[2];
		#endif
		int16_t icc_map_size_full;
		int16_t param_frame_idx;
		#ifndef FIX_901_PARAMMC_DEAD_CODE
		int16_t flag_use_adaptive_icc_map;
		#endif
		const float *ild_factors;
		int16_t coding_band_mapping[PARAM_MC_MAX_PARAMETER_BANDS];
		int16_t nbands_in_param_frame[PARAM_MC_PARAMETER_FRAMES];