Formatting after acceptance of switches (dbcb5c7f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/bitstream.c

+20 −15

Original line number	Diff line number	Diff line
		@@ -229,7 +229,7 @@ Word16 rate2EVSmode(

		ivas_error ind_list_realloc(
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		int16_t max_num_indices /* i : new maximum number of allowed indices in the list */
		const int16_t max_num_indices /* i : new maximum number of allowed indices in the list */
		)
		{
		int16_t i, ind_list_pos;
		@@ -281,7 +281,8 @@ ivas_error ind_list_realloc(
		* Get the maximum allowed number of indices in the encoder
		-----------------------------------------------------------------------/

		int16_t get_ivas_max_num_indices( /* o : maximum number of indices */
		/! r: maximum number of indices /
		int16_t get_ivas_max_num_indices(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		)
		@@ -519,7 +520,8 @@ int16_t get_ivas_max_num_indices( /* o : maximum
		* Get the maximum allowed number of indices in the core coder
		-----------------------------------------------------------------------/

		int16_t get_core_max_num_indices( /* o : maximum number of indices */
		/! r: maximum number of indices /
		int16_t get_core_max_num_indices(
		const int16_t core, /* i : core */
		const int32_t total_brate /* i : total bitrate */
		)
		@@ -694,7 +696,8 @@ int16_t get_core_max_num_indices( /* o : maximum numb
		* Get the maximum number of indices in the BWE
		-----------------------------------------------------------------------/

		int16_t get_BWE_max_num_indices( /* o : maximum number of indices */
		/! r: maximum number of indices /
		int16_t get_BWE_max_num_indices(
		const int32_t extl_brate /* i : extensiona layer bitrate */
		)
		{
		@@ -716,7 +719,8 @@ int16_t get_BWE_max_num_indices( /* o : maximum number
		* Set the maximum allowed number of metadata indices in the list
		-----------------------------------------------------------------------/

		int16_t get_ivas_max_num_indices_metadata( /* o : maximum number of indices */
		/! r: maximum number of indices /
		int16_t get_ivas_max_num_indices_metadata(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		)
		@@ -1348,7 +1352,7 @@ void push_next_bits(
		/! r: result: index of the indice in the list, -1 if not found /
		int16_t find_indice(
		BSTR_ENC_HANDLE hBstr, /* i : encoder bitstream handle */
		int16_t id, /* i : ID of the indice */
		const int16_t id, /* i : ID of the indice */
		uint16_t value, / o : value of the quantized indice */
		int16_t nb_bits / o : number of bits used to quantize the indice */
		)
		@@ -1368,6 +1372,7 @@ int16_t find_indice(
		return -1;
		}


		/-------------------------------------------------------------------
		* delete_indice()
		*
		@@ -1377,7 +1382,7 @@ int16_t find_indice(
		/! r: number of deleted indices /
		uint16_t delete_indice(
		BSTR_ENC_HANDLE hBstr, /* i : encoder bitstream handle */
		int16_t id /* i : ID of the indice */
		const int16_t id /* i : ID of the indice */
		)
		{
		int16_t i, j;

lib_com/ivas_cnst.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -996,8 +996,7 @@ typedef enum
		typedef enum
		{
		DIRAC_OPEN, /* initialize to default value */
		DIRAC_RECONFIGURE /* HOA3 */
		,
		DIRAC_RECONFIGURE, /* HOA3 */
		DIRAC_RECONFIGURE_MODE
		} DIRAC_CONFIG_FLAG;

lib_com/ivas_cov_smooth.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -53,12 +53,10 @@ static void ivas_set_up_cov_smoothing(
		ivas_cov_smooth_state_t *hCovState,
		ivas_filterbank_t *pFb,
		const float max_update_rate,
		const int16_t min_pool_size
		const int16_t min_pool_size,
		#ifdef FIX_489_COV_SMOOTHING
		,
		const COV_SMOOTHING_TYPE smooth_mode /* i : flag multichannel vs SPAR */
		const COV_SMOOTHING_TYPE smooth_mode, /* i : flag multichannel vs SPAR */
		#endif
		,
		const int32_t ivas_total_brate )
		{
		int16_t j, k;
		@@ -157,10 +155,9 @@ ivas_error ivas_spar_covar_smooth_enc_open(
		ivas_cov_smooth_state_t *hCovState_out, / i/o: SPAR Covar. smoothing handle */
		const ivas_cov_smooth_cfg_t cov_smooth_cfg, / i : SPAR config. handle */
		ivas_filterbank_t pFb, / i/o: FB handle */
		const int16_t nchan_inp /* i : number of input channels */
		,
		const int16_t nchan_inp, /* i : number of input channels */
		#ifdef FIX_489_COV_SMOOTHING
		COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */
		const COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */
		#endif
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		)

lib_com/ivas_fb_mixer.c

+10 −16

Original line number	Diff line number	Diff line
		@@ -107,8 +107,7 @@ ivas_error ivas_fb_set_cfg(
		const int16_t num_in_chans, /* i : number of FB input channels */
		const int16_t num_out_chans, /* i : number of FB output channels */
		const int16_t active_w_mixing, /* i : active_w_mixing flag */
		const int32_t sampling_rate /* i : sampling rate */
		,
		const int32_t sampling_rate, /* i : sampling rate */
		const int16_t nchan_fb_in /* i : number of dirAC analysis channels*/
		)
		{
		@@ -495,8 +494,7 @@ void ivas_fb_mixer_pcm_ingest(
		IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
		float pcm_in[][L_FRAME48k], /* i : input audio channels */
		float *ppOut_pcm, / o : output audio channels */
		const int16_t frame_len /* i : frame length */
		,
		const int16_t frame_len, /* i : frame length */
		const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH] )
		{
		int16_t i;
		@@ -536,16 +534,13 @@ void ivas_fb_mixer_pcm_ingest(
		void ivas_fb_mixer_update_prior_input(
		IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
		float pcm_in[], / i : input audio channels */
		const int16_t length /* i : length of time slot */
		,
		const int16_t length, /* i : length of time slot */
		const int16_t nchan_fb_in /* i : number of analysis channels */
		)
		{
		int16_t i;

		for ( i = 0; i <
		nchan_fb_in;
		i++ )
		for ( i = 0; i < nchan_fb_in; i++ )
		{
		mvr2r( &hFbMixer->ppFilterbank_prior_input[i][length], hFbMixer->ppFilterbank_prior_input[i], hFbMixer->fb_cfg->prior_input_length - length );
		mvr2r( pcm_in[i], &hFbMixer->ppFilterbank_prior_input[i][hFbMixer->fb_cfg->prior_input_length - length], length );
		@@ -567,8 +562,7 @@ void ivas_fb_mixer_get_windowed_fr(
		float frame_f_real[], / o : real freq domain values */
		float frame_f_imag[], / o : imag freq domain values */
		const int16_t length, /* i : number of new samples in time slot */
		const int16_t mdft_len /* i : MDFT frame length */
		,
		const int16_t mdft_len, /* i : MDFT frame length */
		const int16_t nchan_fb_in /* i : number of analysis channels */
		)
		{

lib_com/ivas_prot.h

+36 −59

Original line number	Diff line number	Diff line
		@@ -1014,8 +1014,7 @@ void ivas_param_ism_stereo_dmx(
		);

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

		@@ -1024,8 +1023,7 @@ ivas_error ivas_ism_enc_config(
		);

		ivas_error ivas_ism_dec_config(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		,
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const ISM_MODE last_ism_mode /* i/o: last ISM mode */
		#ifdef JBM_TSM_ON_TCS
		,
		@@ -3104,8 +3102,7 @@ void mdct_read_IGF_bits(

		ivas_error ivas_qmetadata_enc_encode(
		BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
		IVAS_QMETADATA hQMetaData / i/o: q_metadata handle */
		,
		IVAS_QMETADATA hQMetaData, / i/o: q_metadata handle */
		const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */
		);

		@@ -3161,8 +3158,7 @@ void ivas_qmetadata_enc_sid_encode(
		int16_t ivas_qmetadata_dec_decode(
		IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
		uint16_t bitstream, / i : bitstream */
		int16_t index / i/o: bitstream position */
		,
		int16_t index, / i/o: bitstream position */
		const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */
		);

		@@ -3409,11 +3405,10 @@ void ivas_dirac_param_est_enc(
		float **pp_fr_imag,
		const int16_t input_frame,
		#ifndef SBA_MODE_CLEAN_UP
		const SBA_MODE sba_mode
		const SBA_MODE sba_mode,
		#else
		const IVAS_FORMAT ivas_format
		const IVAS_FORMAT ivas_format ,
		#endif
		,
		const int16_t hodirac_flag,
		const int16_t nchan_fb_in
		);
		@@ -3491,9 +3486,8 @@ int16_t ivas_sba_get_nchan(

		/! r: number of ambisonics metadata channels /
		int16_t ivas_sba_get_nchan_metadata(
		const int16_t sba_order /* i : Ambisonic (SBA) order */
		,
		const int32_t ivas_total_brate
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

		void ivas_sba_get_spar_hoa_ch_ind(
		@@ -3843,8 +3837,7 @@ ivas_error ivas_dirac_dec_output_synthesis_open(

		void ivas_dirac_dec_output_synthesis_init(
		DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */
		const int16_t nchan_out_woLFE /* i : number of output audio channels without LFE */
		,
		const int16_t nchan_out_woLFE, /* i : number of output audio channels without LFE */
		const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */
		);

		@@ -3867,13 +3860,11 @@ void ivas_dirac_dec_output_synthesis_process_slot(
		const float p_Rmat, / i : rotation matrix */
		const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */
		const IVAS_OUTPUT_SETUP hOutSetup, /* i : output setup structure */
		const int16_t nchan_transport /* i : number of transport channels */
		const int16_t nchan_transport, /* i : number of transport channels */
		#if defined( JBM_TSM_ON_TCS )
		,
		const int16_t index_slot
		const int16_t ind_slot, /* i : index of the slot to be added to the input covariance */
		#endif
		,
		const int16_t hodirac_flag
		const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */
		);

		void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd(
		@@ -3884,8 +3875,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd(
		#ifdef JBM_TSM_ON_TCS
		const int16_t nbslots, /* i : number of slots to process */
		#endif
		const float *onset_filter
		,
		const float *onset_filter,
		#ifdef FIX_393_459_460_SBA_MD
		float *diffuseness,
		#else
		@@ -4745,8 +4735,7 @@ void ivas_spar_to_dirac(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		ivas_spar_md_dec_state_t hMdDec, / i/o: SPAR MD decoder handle */
		const int16_t dtx_vad, /* i : DTX frame flag */
		const int16_t num_bands_out /* i : number of output bands */
		,
		const int16_t num_bands_out, /* i : number of output bands */
		const int16_t bw /* i : band joining factor */
		);

		@@ -4756,15 +4745,13 @@ void ivas_spar_update_md_hist(

		void ivas_spar_smooth_md_dtx(
		ivas_spar_md_dec_state_t hMdDec, / i/o: SPAR MD decoder handle */
		const int16_t num_bands_out /* i : number of output bands */
		,
		const int16_t num_bands_out, /* i : number of output bands */
		const int16_t num_md_sub_frames /* i : number of metadata subframes */
		);

		void ivas_spar_setup_md_smoothing(
		ivas_spar_md_dec_state_t hMdDec, / i/o: SPAR MD decoder handle */
		const int16_t num_bands_out /* i : number of output bands */
		,
		const int16_t num_bands_out, /* i : number of output bands */
		const int16_t num_md_sub_frames /* i : number of metadata subframes */
		);

		@@ -4772,8 +4759,7 @@ void ivas_spar_dec_gen_umx_mat(
		ivas_spar_md_dec_state_t hMdDec, / i/o: SPAR MD decoder handle */
		const int16_t nchan_transport, /* i : number of transport channels */
		const int16_t num_bands_out, /* i : number of output bands */
		const int16_t bfi /* i : bad frame indicator */
		,
		const int16_t bfi, /* i : bad frame indicator */
		const int16_t num_md_sub_frames
		);

		@@ -4782,8 +4768,7 @@ ivas_error ivas_spar_covar_enc_open(
		ivas_enc_cov_handler_state_t *hCovEnc, / i/o: SPAR Covar. encoder handle */
		ivas_filterbank_t pFb, / i/o: FB handle */
		const int32_t input_Fs, /* i : input sampling rate */
		const int16_t nchan_inp /* i : number of input channels */
		,
		const int16_t nchan_inp, /* i : number of input channels */
		#ifdef FIX_489_COV_SMOOTHING
		COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC*/
		#endif
		@@ -4806,8 +4791,7 @@ void ivas_enc_cov_handler_process(
		const int16_t end_band,
		const int16_t nchan_inp,
		const int16_t dtx_vad,
		const int16_t transient_det[2]
		,
		const int16_t transient_det[2],
		const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH]
		);

		@@ -4815,10 +4799,9 @@ ivas_error ivas_spar_covar_smooth_enc_open(
		ivas_cov_smooth_state_t *hCovState, / i/o: SPAR Covar. smoothing handle */
		const ivas_cov_smooth_cfg_t cov_smooth_cfg, / i : SPAR config. handle */
		ivas_filterbank_t pFb, / i/o: FB handle */
		const int16_t nchan_inp /* i : number of input channels */
		,
		const int16_t nchan_inp, /* i : number of input channels */
		#ifdef FIX_489_COV_SMOOTHING
		COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC*/
		const COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */
		#endif
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);
		@@ -5191,8 +5174,7 @@ void masa_compensate_two_dir_energy_ratio_index(
		const int16_t ratio_index_1, /* i : Input ratio for direction 1 */
		const int16_t ratio_index_2, /* i : Input ratio for direction 2 */
		int16_t ratio_index_mod1, / o : Output modified ratio for direction 1 */
		int16_t ratio_index_mod2 / o : Output modified ratio for direction 2 */
		,
		int16_t ratio_index_mod2, / o : Output modified ratio for direction 2 */
		const int16_t hodirac_flag /* i : flag to indicate HO-DirAC mode */
		);

		@@ -5576,12 +5558,11 @@ void computeReferencePower_enc(
		const int16_t enc_param_start_band, /* i : first band to process */
		const int16_t num_freq_bands, /* i : Number of frequency bands */
		#ifndef SBA_MODE_CLEAN_UP
		const SBA_MODE sba_mode /* i : SBA mode */
		const SBA_MODE sba_mode, /* i : SBA mode */
		#else
		const IVAS_FORMAT ivas_format, /* i : ivas_format */
		int16_t ref_power_w /* i : use 0 if hodirac is enabled */
		int16_t ref_power_w, /* i : use 0 if hodirac is enabled */
		#endif
		,
		const int16_t nchan_ana /* i : number of analysis channels */
		);

		@@ -5719,8 +5700,7 @@ ivas_error ivas_fb_set_cfg(
		const int16_t num_in_chans, /* i : number of FB input channels */
		const int16_t num_out_chans, /* i : number of FB output channels */
		const int16_t active_w_mixing, /* i : active_w_mixing flag */
		const int32_t sampling_Fs /* i : sampling rate */
		,
		const int32_t sampling_Fs, /* i : sampling rate */
		const int16_t nachan_dirac_ana /* i : number of DirAR analysis channels */
		);

		@@ -5741,8 +5721,7 @@ void ivas_fb_mixer_pcm_ingest(
		IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
		float pcm_in[][L_FRAME48k], /* i : input audio channels */
		float *ppOut_pcm, / o : output audio channels */
		const int16_t frame_length /* i : frame length */
		,
		const int16_t frame_length, /* i : frame length */
		const int16_t HOA_md_ind[IVAS_SPAR_MAX_CH]
		);

		@@ -5756,8 +5735,7 @@ void ivas_dirac_enc_spar_delay_synchro(
		void ivas_fb_mixer_update_prior_input(
		IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
		float pcm_in[], / i : input audio channels */
		const int16_t length /* i : length of time slot */
		,
		const int16_t length, /* i : length of time slot */
		const int16_t nchan_fb_in /* i : number of analysis channels */
		);

		@@ -5767,8 +5745,7 @@ void ivas_fb_mixer_get_windowed_fr(
		float frame_f_real[], / o : real freq domain values */
		float frame_f_imag[], / o : imag freq domain values */
		const int16_t length, /* i : number of new samples in time slot */
		const int16_t mdft_len /* i : MDFT frame length */
		,
		const int16_t mdft_len, /* i : MDFT frame length */
		const int16_t nchan_fb_in /* i : number of analysis channels */
		);