commit 1 (dec55796) · Commits · SA4 / Audio / IVAS BASOP

lib_com/basop32.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -3577,12 +3577,20 @@ Word16 div_l( Word32 L_num, Word16 den )

		if ( den == (Word16) 0 )
		{
		#ifdef IVAS_FLOAT_FIXED
		/* NOTE: This is just for temporary usage for identifying crashes */
		assert( 0 );
		#endif // IVAS_FLOAT_FIXED
		/* printf("Division by 0 in div_l, Fatal error in "); printStack(); */
		exit( -1 );
		}

		if ( ( L_num < (Word32) 0 ) \|\| ( den < (Word16) 0 ) )
		{
		#ifdef IVAS_FLOAT_FIXED
		/* NOTE: This is just for temporary usage for identifying crashes */
		assert( 0 );
		#endif // IVAS_FLOAT_FIXED
		/* printf("Division Error in div_l, Fatal error in "); printStack(); */
		exit( -1 );
		}

lib_com/calc_st_com.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -95,14 +95,14 @@ static void calc_rc0_h(


		/*----------------------------------------------------------------------------
		* calc_st_filt_fx()
		* calc_st_filt()
		*
		* computes impulse response of A(gamma2) / A(gamma1)
		* controls gain : computation of energy impulse response as
		* SUMn (abs (h[n])) and computes parcor0
		---------------------------------------------------------------------------- /

		void calc_st_filt_fx(
		void calc_st_filt(
		const float apond2, / i : coefficients of numerator */
		const float apond1, / i : coefficients of denominator */
		float parcor0, / o : 1st parcor calcul. on composed filter */

lib_com/ivas_ism_com.c

+19 −7

Original line number	Diff line number	Diff line
		@@ -787,6 +787,16 @@ void ivas_ism_reset_metadata_enc(

		return;
		}

		void ivas_ism_reset_metadata_API(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		)
		{
		ivas_ism_reset_metadata_enc(hIsmMeta);

		return;
		}

		#else
		void ivas_ism_reset_metadata(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		@@ -802,6 +812,15 @@ void ivas_ism_reset_metadata(

		return;
		}

		void ivas_ism_reset_metadata_API(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		)
		{
		ivas_ism_reset_metadata(hIsmMeta);

		return;
		}
		#endif

		/-------------------------------------------------------------------
		@@ -810,14 +829,7 @@ void ivas_ism_reset_metadata(
		* Reset ISM metadata parameters
		-------------------------------------------------------------------/

		void ivas_ism_reset_metadata_API(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		)
		{
		ivas_ism_reset_metadata_enc( hIsmMeta );

		return;
		}


		/-------------------------------------------------------------------

lib_com/ivas_prot.h

+18 −5

Original line number	Diff line number	Diff line
		@@ -503,7 +503,7 @@ ivas_error ivas_core_enc(
		const int16_t ivas_format, /* i : IVAS format */
		const int16_t flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */
		);

		#ifdef IVAS_FLOAT_FIXED
		ivas_error ivas_core_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		SCE_DEC_HANDLE hSCE, /* i/o: SCE decoder structure */
		@@ -515,6 +515,20 @@ ivas_error ivas_core_dec(
		Word32 DFT_fx[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
		const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
		);
		#else
		ivas_error ivas_core_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		SCE_DEC_HANDLE hSCE, /* i/o: SCE decoder structure */
		CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
		MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
		const int16_t n_channels, /* i : number of channels to be decoded */
		float output[], / o : output synthesis signal */
		float outputHB[][L_FRAME48k], /* o : output HB synthesis signal */
		float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
		const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
		);
		#endif


		void encod_gen_2sbfr(
		Encoder_State st, / i/o: state structure */
		@@ -1095,11 +1109,10 @@ void bitbudget_to_brate(
		void ivas_ism_reset_metadata(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handles */
		);
		#ifdef IVAS_FLOAT_FIXED //to be removed when converting encoder

		void ivas_ism_reset_metadata_enc(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		);
		#endif
		void ivas_ism_reset_metadata_API(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handles */
		);
		@@ -4982,7 +4995,7 @@ void FdCngEncodeDiracMDCTStereoSID(
		CPE_ENC_HANDLE hCPE /* i/o: CPE encoder state structure */
		);

		void FdCngDecodeDiracMDCTStereoSID_fx(
		void FdCngDecodeDiracMDCTStereoSID(
		CPE_DEC_HANDLE hCPE /* i/o: CPE decoder state structure */
		);

		@@ -6440,7 +6453,7 @@ void ivas_binaural_add_LFE(
		float input_f[], / i : transport channels */
		float output_f[] / o : synthesized core-coder transport channels/DirAC output */
		);
		void ivas_binaural_add_LFE_fix(
		void ivas_binaural_add_LFE_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		Word16 output_frame, /* i : length of input frame */
		Word32 input_fx[], / i : transport channels */

lib_com/ivas_prot_fx.h

+56 −0

Original line number	Diff line number	Diff line
		@@ -2058,4 +2058,60 @@ void td_bwe_dec_init_ivas_fx(
		TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle */
		const Word32 output_Fs /* i : output sampling rate */
		);

		void ivas_dirac_dec_render_sf_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[], / i/o: synthesized core-coder transport channels/DirAC output */
		const int16_t nchan_transport, /* i : number of transport channels */
		float *pppQMfFrame_ts_re[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX],
		float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX]
		);

		void ivas_dirac_dec_render_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const Word16 nchan_transport, /* i : number of transport channels */
		const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
		UWord16 nSamplesRendered, / o : number of CLDFB slots rendered */
		UWord16 nSamplesAvailableNext, / o : number of CLDFB slots still to render */
		float output_f[] / o : rendered time signal */
		);

		void ivas_dirac_dec_read_BS_fx(
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */
		Decoder_State st, / i/o: decoder Core state structure */
		DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common spatial rendering data handle */
		IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q metadata */
		int16_t nb_bits, / o : number of bits read */
		const int16_t last_bit_pos, /* i : last read bitstream position */
		const int16_t hodirac_flag, /* i : flag to indicate HO-DirAC mode */
		int16_t dirac_to_spar_md_bands / o : DirAC->SPAR MD bands */
		);

		ivas_error ivas_dirac_dec_config_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const DIRAC_CONFIG_FLAG flag_configopen /* i/ : Flag determining if we open or reconfigure the DirAC decoder */
		);

		void ivas_dirac_dec_output_synthesis_cov_close_fx(
		DIRAC_OUTPUT_SYNTHESIS_PARAMS h_dirac_output_synthesis_params, / i : handle for the covariance synthesis parameters */
		DIRAC_OUTPUT_SYNTHESIS_COV_STATE h_dirac_output_synthesis_state / i/o: handle for the covariance synthesis state */
		);

		ivas_error ivas_init_decoder_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		ivas_error ivas_ism_dec_config_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const ISM_MODE last_ism_mode, /* i/o: last ISM mode */
		UWord16 nSamplesRendered, / o : number of samples flushed when the renderer granularity changes */
		Word16 data / o : output synthesis signal */
		);

		ivas_error ivas_ism_metadata_dec_create_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const Word16 n_ISms, /* i : number of objects */
		Word32 element_brate_tmp[] /* o : element bitrate per object */
		);
		#endif