Merge branch '20221025_maintenance' into 'main' (f51ae4c3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_filters.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@


		/------------------------------------------------------------------------------------------
		* Static functions declaration
		* Local functions declaration
		------------------------------------------------------------------------------------------/

		static void ivas_iir_2_filter( ivas_filters_process_state_t filter_state, float pIn_Out, const int16_t length, const int16_t stage );
		@@ -55,9 +55,9 @@ static void ivas_iir_2_filter( ivas_filters_process_state_t *filter_state, float
		-----------------------------------------------------------------------------------------/

		void ivas_filters_init(
		ivas_filters_process_state_t *filter_state,
		const float *filt_coeff,
		const int16_t order )
		ivas_filters_process_state_t filter_state, / i/o: filter state handle */
		const float filt_coeff, / i : filter coefficients */
		const int16_t order ) /* i : filter order */
		{
		int16_t i;
		filter_state->order = order;
		@@ -107,9 +107,9 @@ void ivas_filters_init(
		-----------------------------------------------------------------------------------------/

		void ivas_filter_process(
		ivas_filters_process_state_t *filter_state,
		float *pIn_Out,
		const int16_t length )
		ivas_filters_process_state_t filter_state, / i/o: filter state handle */
		float pIn_Out, / i/o: signal subject to filtering */
		const int16_t length ) /* i : filter order */
		{

		switch ( filter_state->order )

lib_com/ivas_prot.h

+42 −42

Original line number	Diff line number	Diff line
		@@ -1998,7 +1998,7 @@ void decoder_tcx_noisefilling(
		const int16_t *prm_sqQ,
		int16_t nf_seed,
		const int16_t bfi, /* i : Bad frame indicator */
		const int16_t MCT_flag,
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const int16_t frame_cnt /* i : frame counter in the super frame */
		);

		@@ -3092,7 +3092,7 @@ int16_t ivas_sba_get_nchan_metadata(
		);

		#ifdef SBA_HOA_HBR_IMPROV
		/! r: get the flag to code SPAR HOA MD for all band /
		/! r: flag indicating to code SPAR HOA MD for all bands /
		int16_t ivas_sba_get_spar_hoa_md_flag(
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		@@ -3170,7 +3170,7 @@ void ivas_dirac_enc(
		BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */
		int16_t nb_bits_metadata, / o : number of metadata bits written */
		const int16_t Opt_DTX_ON, /* i : flag signaling DTX on */
		float data_f[][L_FRAME48k], /* i/o: input: ACN/SN3D, output: omni, stereo DMX or FOA */
		float data_f[][L_FRAME48k], /* i/o: SBA channels */
		const int16_t input_frame, /* i : input frame length */
		const int16_t sba_planar /* i : SBA planar flag */
		);
		@@ -3988,7 +3988,7 @@ ivas_error ivas_spar_md_dec_open(
		const int16_t num_channels /* i : number of internal channels */
		#ifdef SBA_HOA_HBR_IMPROV
		,
		const int16_t sba_order /* i : flag to send HOA MD for all bands */
		const int16_t sba_order /* i : SBA order */
		#endif
		);

		@@ -4827,7 +4827,7 @@ void lls_interp_n(
		const int16_t N, /* i : length of the input vector */
		float a, / o : calculated slope */
		float b, / o : calculated offset */
		int16_t upd /* i : use 1 to update x[] with the interpolated output */
		const int16_t upd /* i : use 1 to update x[] with the interpolated output*/
		);

		void computeReferencePower_enc(
		@@ -4926,15 +4926,15 @@ void ivas_lfe_lpf_select_filt_coeff(
		);

		void ivas_filters_init(
		ivas_filters_process_state_t *filter_state,
		const float *filt_coeff,
		const int16_t order
		ivas_filters_process_state_t filter_state, / i/o: filter state handle */
		const float filt_coeff, / i : filter coefficients */
		const int16_t order /* i : filter order */
		);

		void ivas_filter_process(
		ivas_filters_process_state_t *filter_state,
		float *pIn_Out,
		const int16_t length
		ivas_filters_process_state_t filter_state, / i/o: filter state handle */
		float pIn_Out, / i : signal subject to filtering */
		const int16_t length /* i : filter order */
		);


		@@ -5193,7 +5193,7 @@ void ivas_fb_mixer_pcm_ingest(
		void ivas_dirac_enc_spar_delay_synchro(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		const int16_t input_frame, /* i : input frame length */
		float data_f[][L_FRAME48k] /* i/o: input: ACN/SN3D, output: omni, stereo DMX or FOA*/
		float data_f[][L_FRAME48k] /* i/o: SBA channels (ACN / SN3D) */
		);

		void ivas_fb_mixer_update_prior_input(

lib_com/ivas_sba_config.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -285,16 +285,17 @@ int16_t ivas_sba_get_nchan_metadata(
		/-------------------------------------------------------------------
		* ivas_sba_get_spar_hoa_md_flag()
		*
		* et the flag to code SPAR HOA MD for all band
		* Get the flag to code SPAR HOA MD for all band
		-------------------------------------------------------------------/

		/! r: get the flag to code SPAR HOA MD for all band /
		/! r: flag indicating to code SPAR HOA MD for all bands /
		int16_t ivas_sba_get_spar_hoa_md_flag(
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		)
		{
		int16_t spar_hoa_md_flag = 0;

		if ( sba_order > 1 && ivas_total_brate >= IVAS_256k )
		{
		spar_hoa_md_flag = 1;
		@@ -303,6 +304,7 @@ int16_t ivas_sba_get_spar_hoa_md_flag(
		{
		spar_hoa_md_flag = 0;
		}

		return spar_hoa_md_flag;
		}
		#endif

lib_com/ivas_stat_com.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@ typedef struct
		/----------------------------------------------------------------------------------
		* PARAMETRIC ISM encoder/decoder (common) structure
		----------------------------------------------------------------------------------/

		typedef struct ivas_param_ism_data_structure
		{
		int16_t nbands;
		@@ -480,6 +481,7 @@ typedef struct ivas_qdirection_band_data_struct
		uint16_t elevation_index[MAX_PARAM_SPATIAL_SUBFRAMES];
		float q_azimuth[MAX_PARAM_SPATIAL_SUBFRAMES];
		float q_elevation[MAX_PARAM_SPATIAL_SUBFRAMES];

		} IVAS_QDIRECTION_BAND_DATA;

		typedef struct ivas_qdirection_band_coherence_data_struct
		@@ -532,6 +534,7 @@ typedef struct ivas_masa_qmetadata_frame_struct
		int16_t ec_flag;
		float dir_comp_ratio;
		uint8_t is_masa_ivas_format;

		} IVAS_QMETADATA, *IVAS_QMETADATA_HANDLE;


		@@ -739,7 +742,6 @@ typedef struct ivas_fb_mixer_state_structure
		float cldfb_cross_fade[CLDFB_NO_COL_MAX];
		int16_t cldfb_cross_fade_start;
		int16_t cldfb_cross_fade_end;
		int16_t cldfb_latency;

		int16_t first_frame[IVAS_SPAR_MAX_CH];

lib_com/ivas_tools.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -958,7 +958,7 @@ void lls_interp_n(
		const int16_t N, /* i : length of the input vector */
		float a, / o : calculated slope */
		float b, / o : calculated offset */
		int16_t upd /* i : use 1 to update x[] with the interpolated output */
		const int16_t upd /* i : use 1 to update x[] with the interpolated output */
		)
		{
		int16_t i;