formatting (7ccb98d8) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+6 −9

Original line number	Diff line number	Diff line
		@@ -115,10 +115,10 @@ typedef enum
		RENDERER_PARAM_ISM,
		RENDERER_BINAURAL_MIXER_CONV,
		RENDERER_BINAURAL_MIXER_CONV_ROOM,
		RENDERER_NON_DIEGETIC_DOWNMIX
		, RENDERER_OSBA_STEREO
		, RENDERER_OSBA_AMBI
		, RENDERER_OSBA_LS
		RENDERER_NON_DIEGETIC_DOWNMIX,
		RENDERER_OSBA_STEREO,
		RENDERER_OSBA_AMBI,
		RENDERER_OSBA_LS
		} RENDERER_TYPE;

		#ifdef DEBUGGING
		@@ -127,7 +127,6 @@ typedef enum
		RENDER_TYPE_OVERRIDE_NONE,
		RENDER_TYPE_OVERRIDE_CREND,
		RENDER_TYPE_OVERRIDE_FASTCONV

		} ivas_renderTypeOverride;
		#endif

		@@ -367,12 +366,10 @@ typedef enum
		{
		ISM_MODE_NONE,
		ISM_MODE_DISC, /* discrete ISM */
		ISM_MODE_PARAM /* parametric ISM */
		,
		ISM_MODE_PARAM, /* parametric ISM */
		ISM_MASA_MODE_MASA_ONE_OBJ, /* MASA ISM mode when one object is encoded separately and remainder using MASA parameters */
		ISM_MASA_MODE_PARAM_ONE_OBJ, /* MASA ISM mode when one object is encoded separately and remainder using parametric object model */
		ISM_MASA_MODE_DISC /* MASA ISM mode when all objects are encoded separarately */
		,
		ISM_MASA_MODE_DISC, /* MASA ISM mode when all objects are encoded separarately */
		ISM_SBA_MODE_DISC /* MASA ISM mode when all objects are encoded separarately */
		} ISM_MODE;

lib_com/ivas_ism_com.c

+13 −15

Original line number	Diff line number	Diff line
		@@ -96,8 +96,7 @@ ivas_error ivas_ism_config(
		const int16_t ism_imp[], /* i : ISM importance flags */
		int32_t element_brate[], /* o : element bitrate per object */
		int32_t total_brate[], /* o : total bitrate per object */
		int16_t nb_bits_metadata[] /* i/o: number of metadata bits */
		,
		int16_t nb_bits_metadata[], /* i/o: number of metadata bits */
		const int16_t combined_format_flag /* i : flag indicating combined format */
		)
		{
		@@ -596,8 +595,7 @@ ISM_MODE ivas_ism_mode_select(
		* ---------------------------------------------------------------*/

		void ivas_ism_metadata_close(
		ISM_METADATA_HANDLE hIsmMetaData[] /* i/o : object metadata handles */
		,
		ISM_METADATA_HANDLE hIsmMetaData[], /* i/o : object metadata handles */
		const int16_t first_idx /* i : index of first handle to deallocate */
		)
		{

lib_com/ivas_masa_com.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -75,8 +75,7 @@ void ivas_masa_set_elements(
		IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
		int16_t element_mode, / o : element mode */
		int16_t nSCE, / o : number of SCEs */
		int16_t nCPE / o : number of CPEs */
		,
		int16_t nCPE, / o : number of CPEs */
		const int16_t ivas_format, /* i : IVAS format */
		const ISM_MODE ism_mode, /* i : ISM mode */
		const int32_t ism_total_brate /* i : initial ISM total bitrate */

lib_com/ivas_prot.h

+14 −23

Original line number	Diff line number	Diff line
		@@ -886,8 +886,8 @@ ivas_error ivas_ism_config(
		const int16_t ism_imp[], /* i : ISM importance flags */
		int32_t element_brate[], /* o : element bitrate per object */
		int32_t total_brate[], /* o : total bitrate per object */
		int16_t nb_bits_metadata[] /* i/o: number of metadata bits */
		, const int16_t combined_format_flag /* i : flag indicating combined format */
		int16_t nb_bits_metadata[], /* i/o: number of metadata bits */
		const int16_t combined_format_flag /* i : flag indicating combined format */
		);

		void bitbudget_to_brate(
		@@ -949,8 +949,7 @@ ivas_error ivas_ism_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		float data[MAX_NUM_OBJECTS], / i : input signal */
		const int16_t input_frame, /* i : input frame length per channel */
		int16_t nb_bits_metadata / i : number of metadata bits */
		,
		int16_t nb_bits_metadata, / i : number of metadata bits */
		const int16_t flag_omasa_ener_brate /* i : less bitrate for objects in OMASA flag */
		);

		@@ -965,12 +964,10 @@ ivas_error ivas_ism_metadata_enc(
		const int16_t localVAD[], /* i : VAD flag */
		const int16_t ism_mode, /* i : ISM mode */
		const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
		const int16_t ism_extended_metadata_flag /* i : Extended metadata flag */
		,
		const int16_t ism_extended_metadata_flag, /* i : Extended metadata flag */
		const float lp_noise_CPE, /* i : LP filtered total noise estimation */
		const int16_t flag_omasa_ener_brate, /* i : less bitrate for objects in OMASA flag */
		int16_t *omasa_stereo_sw_cnt
		,
		int16_t *omasa_stereo_sw_cnt,
		const int16_t ini_frame
		);

		@@ -986,8 +983,8 @@ ivas_error ivas_ism_metadata_dec(
		ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */
		const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
		int16_t ism_extended_metadata_flag, / i/o: Extended metadata active in renderer */
		int16_t ism_extmeta_cnt / i/o: Number of change frames observed */
		, DEC_CORE_HANDLE st0 /* i : core-coder handle */
		int16_t ism_extmeta_cnt, / i/o: Number of change frames observed */
		DEC_CORE_HANDLE st0 /* i : core-coder handle */
		);


		@@ -1017,8 +1014,7 @@ void ivas_param_ism_enc_close(
		);

		void ivas_ism_metadata_close(
		ISM_METADATA_HANDLE hIsmMetaData[] /* i/o : object metadata handles */
		,
		ISM_METADATA_HANDLE hIsmMetaData[], /* i/o : object metadata handles */
		const int16_t first_idx /* i : index of first handle to deallocate */
		);

		@@ -4955,8 +4951,7 @@ ivas_error ivas_masa_encode(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */
		const int16_t Opt_DTX_ON, /* i : DTX on flag */
		const int16_t element_mode /* i : element mode */
		,
		const int16_t element_mode, /* i : element mode */
		const ISM_MODE ism_mode, /* i : ISM format mode */
		const int16_t nchan_ism, /* i : number of ISM channels */
		ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS], /* i : ISM metadata handle */
		@@ -4984,8 +4979,7 @@ void ivas_masa_set_elements(
		IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
		int16_t element_mode, / o : element mode */
		int16_t nSCE, / o : number of SCEs */
		int16_t nCPE / o : number of CPEs */
		,
		int16_t nCPE, / o : number of CPEs */
		const int16_t ivas_format, /* i : IVAS format */
		const ISM_MODE ism_mode, /* i : ISM mode */
		const int32_t ism_total_brate /* i : initial ISM total bitrate */
		@@ -5295,8 +5289,7 @@ ivas_error vbap_init_data(
		VBAP_HANDLE hVBAPdata, / i/o: handle for VBAP data structure that will be initialized */
		const float speaker_node_azi_deg, / i : vector of speaker node azimuths (positive left) */
		const float speaker_node_ele_deg, / i : vector of speaker node elevations (positive up) */
		const int16_t num_speaker_nodes /* i : number of speaker nodes in the set */
		,
		const int16_t num_speaker_nodes, /* i : number of speaker nodes in the set */
		const IVAS_FORMAT ivas_format /* i : IVAS format */
		);

		@@ -5308,8 +5301,7 @@ void vbap_determine_gains(
		const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */
		float gains, / o : gain vector for speaker nodes for given direction */
		const int16_t azi_deg, /* i : azimuth in degrees for panning direction (positive left) */
		const int16_t ele_deg /* i : elevation in degrees for panning direction (positive up) */
		,
		const int16_t ele_deg, /* i : elevation in degrees for panning direction (positive up) */
		const int16_t use_object_mode /* i : select between object mode panning and spatial mode panning */
		);

		@@ -5473,8 +5465,7 @@ void computeReferencePower_enc(
		const int16_t num_freq_bands, /* i : Number of frequency bands */
		const IVAS_FORMAT ivas_format, /* i : ivas_format */
		int16_t ref_power_w, /* i : use 0 if hodirac is enabled */
		const int16_t nchan_ana /* i : number of analysis channels */
		,
		const int16_t nchan_ana, /* i : number of analysis channels */
		int16_t *mono_frame_count,
		int16_t *dirac_mono_flag
		);

lib_dec/ivas_ism_metadata_dec.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -149,8 +149,7 @@ ivas_error ivas_ism_metadata_dec(
		ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */
		const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
		int16_t ism_extmeta_active, / i/o: Extended metadata active in renderer */
		int16_t ism_extmeta_cnt / i/o: Number of change frames observed */
		,
		int16_t ism_extmeta_cnt, / i/o: Number of change frames observed */
		DEC_CORE_HANDLE st0 /* i : core-coder handle */
		)
		{