[cleanup] accept NCHAN_ISM_PARAMETER (a98eacdc) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_ism_com.c

+0 −13

Original line number	Diff line number	Diff line
		@@ -455,22 +455,13 @@ float ism_dequant_meta(

		void ivas_param_ism_config(
		PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure */
		#ifdef NCHAN_ISM_PARAMETER
		,
		const int16_t nchan_obj /* i : number of ISM channels */
		#endif
		)
		{
		#ifdef NCHAN_ISM_PARAMETER
		int16_t i;

		hParamIsm->nbands = MAX_PARAM_ISM_NBANDS;
		#else
		int16_t i, num_obj;

		hParamIsm->nbands = MAX_PARAM_ISM_NBANDS;
		num_obj = hParamIsm->num_obj;
		#endif

		for ( i = 0; i < hParamIsm->nbands; i++ )
		{
		@@ -478,11 +469,7 @@ void ivas_param_ism_config(
		}

		/* for elevation zero compute the max azi quantization indices */
		#ifdef NCHAN_ISM_PARAMETER
		for ( i = 0; i < nchan_obj; i++ )
		#else
		for ( i = 0; i < num_obj; i++ )
		#endif
		{
		hParamIsm->last_az_diff[i] = 0;
		hParamIsm->last_az_sgn[i] = 1;

lib_com/ivas_prot.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -810,9 +810,7 @@ ivas_error ivas_ism_enc(

		ivas_error ivas_ism_metadata_enc(
		const int32_t ism_total_brate, /* i : ISM total bitrate */
		#ifdef NCHAN_ISM_PARAMETER
		const int16_t nchan_ism, /* i : number of ISM channels */
		#endif
		const int16_t nchan_transport, /* i : number of transport channels */
		ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
		SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */
		@@ -826,9 +824,7 @@ ivas_error ivas_ism_metadata_enc(

		ivas_error ivas_ism_metadata_dec(
		const int32_t ism_total_brate, /* i : ISM total bitrate */
		#ifdef NCHAN_ISM_PARAMETER
		const int16_t nchan_ism, /* i : number of ISM channels */
		#endif
		int16_t nchan_transport, / o : number of transport channels */
		ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
		SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder handles */
		@@ -883,10 +879,8 @@ void ivas_param_ism_stereo_dmx(

		void ivas_param_ism_config(
		PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure */
		#ifdef NCHAN_ISM_PARAMETER
		,
		const int16_t nchan_ism /* i : number of ISM channels */
		#endif
		);

		ivas_error ivas_ism_enc_config(
		@@ -897,9 +891,6 @@ ivas_error ivas_ism_dec_config(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		,
		const ISM_MODE last_ism_mode /* i/o: last ISM mode */
		#ifndef NCHAN_ISM_PARAMETER
		,const int16_t num_obj /* i : number of objects in the bitstream */
		#endif
		);

		ivas_error ivas_param_ism_dec_open(

lib_com/ivas_stat_com.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -158,9 +158,6 @@ typedef struct ivas_param_ism_data_structure
		int16_t nbands;
		int16_t nblocks[MAX_PARAM_ISM_NBANDS];
		int16_t band_grouping[MAX_PARAM_ISM_NBANDS + 1];
		#ifndef NCHAN_ISM_PARAMETER
		int16_t num_obj;
		#endif

		int16_t azi_index[MAX_NUM_OBJECTS];
		int16_t ele_index[MAX_NUM_OBJECTS];

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,6 @@
		#define DISABLE_ADAP_RES_COD_TMP /* temporary fix for IVAS-403, disables adaptive residual coding */
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */

		#define NCHAN_ISM_PARAMETER /* VA: make 'nchan_ism' parameter part of st_ivas/hEncoderConfig */
		#define FIX_382_MASA_META_FRAMING_ASYNC /* Nokia: Issue 382: detect potential MASA metadata framing offset */
		#define FIX_386_CORECODER_RECONFIG /* VA: Issue 386: Resolve ToDo comments in CoreCoder reconfig. */

lib_dec/ivas_dec.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -150,18 +150,10 @@ ivas_error ivas_dec(
		else if ( st_ivas->ism_mode == ISM_MODE_PARAM )
		{
		// VE: call ivas_ism_metadata_dec() with 'st_ivas' - TBD
		#ifdef NCHAN_ISM_PARAMETER
		#ifdef FIX_379_EXT_METADATA
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef FIX_379_EXT_METADATA
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		return error;
		@@ -169,18 +161,10 @@ ivas_error ivas_dec(
		}
		else /* ISM_MODE_DISC */
		{
		#ifdef NCHAN_ISM_PARAMETER
		#ifdef FIX_379_EXT_METADATA
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef FIX_379_EXT_METADATA
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		return error;
		@@ -245,11 +229,7 @@ ivas_error ivas_dec(
		#endif
		{
		/* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */
		#ifdef NCHAN_ISM_PARAMETER
		ivas_ism2sba( output, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_ism, output_frame, st_ivas->hIntSetup.ambisonics_order );
		#else
		ivas_ism2sba( output, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_transport, output_frame, st_ivas->hIntSetup.ambisonics_order );
		#endif
		}

		/* Binaural rendering */