move function declaration to appropriate header file (6e84ef91) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -3395,6 +3395,12 @@ ivas_error ivas_td_decorr_reconfig_dec(
		ivas_td_decorr_state_t *hTdDecorr, / i/o: TD decorrelator handle */
		uint16_t useTdDecorr / i/o: TD decorrelator flag */
		);

		/! r: Configured reqularization factor value /
		float configure_reqularization_factor(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const int32_t ivas_total_brate /* i : total IVAS bitrate */
		);
		#else
		ivas_error ivas_dirac_dec_init_binaural_data(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */

lib_dec/ivas_stat_dec.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -574,10 +574,6 @@ typedef struct dirac_output_synthesis_cov_state_structure

		} DIRAC_OUTPUT_SYNTHESIS_COV_STATE;

		#ifdef FIX_417_TD_DECORR_BRATE_SW
		float configure_reqularization_factor( const IVAS_FORMAT ivas_format, const int32_t ivas_brate );
		#endif

		/* MASA stereo transport signal type detection structure */
		typedef struct
		{

lib_rend/ivas_dirac_dec_binaural_functions.c

+16 −14

Original line number	Diff line number	Diff line
		@@ -2026,40 +2026,42 @@ static void hrtfShGetHrtf(
		* parametric binauralizer using IVAS codec format and current bitrate.
		------------------------------------------------------------------------/

		/! r: Configured reqularization factor value to be set. /
		/! r: Configured reqularization factor value /
		#ifndef FIX_417_TD_DECORR_BRATE_SW
		static
		#endif
		float configure_reqularization_factor(
		const IVAS_FORMAT ivas_format, /* i: IVAS codec format in use */
		const int32_t ivas_brate ) /* i: Current IVAS bitrate */
		float
		configure_reqularization_factor(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		)
		{
		float reqularizationFactor;
		reqularizationFactor = 1.0f; /* Default value */

		if ( ivas_format == MASA_FORMAT )
		{
		if ( ivas_brate >= IVAS_256k )
		if ( ivas_total_brate >= IVAS_256k )
		{
		reqularizationFactor = 0.2f;
		}
		else if ( ivas_brate == IVAS_192k )
		else if ( ivas_total_brate == IVAS_192k )
		{
		reqularizationFactor = 0.3f;
		}
		else if ( ivas_brate == IVAS_160k )
		else if ( ivas_total_brate == IVAS_160k )
		{
		reqularizationFactor = 0.4f;
		}
		else if ( ivas_brate == IVAS_128k )
		else if ( ivas_total_brate == IVAS_128k )
		{
		reqularizationFactor = 0.5f;
		}
		else if ( ivas_brate == IVAS_96k )
		else if ( ivas_total_brate == IVAS_96k )
		{
		reqularizationFactor = 0.6f;
		}
		else if ( ivas_brate >= IVAS_64k )
		else if ( ivas_total_brate >= IVAS_64k )
		{
		reqularizationFactor = 0.8f;
		}
		@@ -2071,19 +2073,19 @@ float configure_reqularization_factor(

		if ( ivas_format == MC_FORMAT ) /* This is always McMASA for parametric binauralizer. */
		{
		if ( ivas_brate >= IVAS_96k )
		if ( ivas_total_brate >= IVAS_96k )
		{
		reqularizationFactor = 0.3f;
		}
		else if ( ivas_brate >= IVAS_80k )
		else if ( ivas_total_brate >= IVAS_80k )
		{
		reqularizationFactor = 0.5f;
		}
		else if ( ivas_brate >= IVAS_64k )
		else if ( ivas_total_brate >= IVAS_64k )
		{
		reqularizationFactor = 0.7f;
		}
		else if ( ivas_brate >= IVAS_48k )
		else if ( ivas_total_brate >= IVAS_48k )
		{
		reqularizationFactor = 0.8f;
		}