Merge branch 'float-pc' into '1746_ref_port_fl1489' (64a528f3) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot.h

+4 −11

Original line number	Diff line number	Diff line
		@@ -795,9 +795,7 @@ void dtx_read_padding_bits(
		);

		void ivas_apply_non_diegetic_panning(
		#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING
		float input_f, / i : non-diegetic object */
		#endif
		float output_f[], / o : core-coder transport mono channel/stereo output */
		const float non_diegetic_pan_gain, /* i : non-diegetic panning gain */
		const int16_t output_frame /* i : output frame length per channel */
		@@ -1111,11 +1109,12 @@ void ivas_param_ism_dec_close(
		const AUDIO_CONFIG output_config /* i : output audio configuration */
		);

		#ifndef FIX_1022_REMOVE_PARAMISM_DEC
		void ivas_param_ism_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);

		#endif
		void ivas_ism_dec_digest_tc(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);
		@@ -3508,14 +3507,6 @@ ivas_error ivas_cldfb_dec_reconfig(
		int16_t numCldfbAnalyses_old, /* i : number of CLDFB analysis instances in previous frame */
		const int16_t numCldfbSyntheses_old /* i : number of CLDFB synthesis instances in previous frame */
		);
		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		/! r: Ambisonic (SBA) order /
		int16_t ivas_sba_get_order(
		const int16_t nb_channels, /* i : Number of ambisonic channels */
		const int16_t sba_planar /* i : SBA planar flag */
		);

		#endif
		/! r: Ambisonic (SBA) order used for analysis and coding /
		int16_t ivas_sba_get_analysis_order(
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */
		@@ -3888,11 +3879,13 @@ void ivas_param_mc_dec_render(
		float output_f[] / o : rendered time signal */
		);

		#ifndef FIX_1023_REMOVE_PARAMMC_DEC
		void ivas_param_mc_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);

		#endif
		/! r: number of cldfb synthesis instances /
		int16_t param_mc_get_num_cldfb_syntheses(
		Decoder_Struct st_ivas / i : IVAS decoder structure */

lib_com/ivas_sba_config.c

+0 −47

Original line number	Diff line number	Diff line
		@@ -64,23 +64,7 @@ void ivas_sba_config(
		int16_t element_mode / o : element mode of the core coder */
		)
		{
		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		if ( ( sba_order < 0 ) && ( nb_channels < 0 ) )
		{
		assert( 0 && "Either order or number of channels must be positive" );
		}
		else if ( sba_order < 0 )
		{
		sba_order = ivas_sba_get_order( nb_channels, sba_planar );
		}
		else if ( nb_channels < 0 )
		{
		nb_channels = ivas_sba_get_nchan( sba_order, sba_planar );
		}
		else
		#else
		if ( nb_channels > 0 )
		#endif
		{
		if ( sba_planar )
		{
		@@ -121,37 +105,6 @@ void ivas_sba_config(
		return;
		}

		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		/-------------------------------------------------------------------
		* ivas_sba_get_order()
		*
		* Get Ambisonic order from number of ambisonic channels
		-------------------------------------------------------------------/

		/! r: Ambisonic (SBA) order /
		int16_t ivas_sba_get_order(
		const int16_t nb_channels, /* i : Number of ambisonic channels */
		const int16_t sba_planar /* i : SBA Planar flag */
		)
		{
		int16_t sba_order;

		if ( sba_planar )
		{
		sba_order = ( nb_channels - 1 ) / 2;
		assert( ( 2 * sba_order + 1 == nb_channels ) && "Number of channels not supported in Planar SBA!" );
		}
		else
		{
		sba_order = (int16_t) sqrtf( (float) nb_channels ) - 1;
		assert( ( ( sba_order + 1 ) * ( sba_order + 1 ) == nb_channels ) && "Number of channels not supported in SBA!" );
		}

		assert( ( sba_order <= 3 ) && "Error: SBA order must be <= 3!" );

		return ( sba_order );
		}
		#endif

		/-------------------------------------------------------------------
		* ivas_sba_get_analysis_order()

lib_com/options.h

+6 −13

Original line number	Diff line number	Diff line
		@@ -180,8 +180,7 @@
		#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
		#define NONBE_FIX_AVG_IAC_CLDFB_REVERB
		#endif
		#define FIX_993_REMOVE_SBA_GET_ORDER /* VA: issue 993: remove unused function ivas_sba_get_order() */
		#define FIX_960_SYN_OUTPUT /* VA: issue 960: unused function syn_output() is removed */
		#define FIX_1022_REMOVE_PARAMISM_DEC /* VA: issue 1022: remove unused function ivas_param_ism_dec() */

		#define USE_NEW_HRTF_BINARY_FILE_FORMAT /* Orange: to activate when decided to change the hrtf binary file format */
		#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers */
		@@ -189,17 +188,11 @@
		#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */
		#define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural */

		#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions */
		//#define FIX_777_COMBI_RENDER_CONFIG_FILE /* Philips: Fix for combined renderer config file support */
		#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */
		/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF / / Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on )*/
		#define FIX_1009_ISM_NONDIEGETIC_PANNING /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan */
		#define FIX_777_COMBI_RENDER_CONFIG_FILE /* Philips: Fix for combined renderer config file support */
		#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on )*/
		#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */
		#define FIX_1023_REMOVE_PARAMMC_DEC /* VA: issue 1023: remove unused function ivas_param_mc_dec() */
		#define FIX_1053_REVERB_RECONFIGURATION /* Philips: issue 1053: fix for dynamic switching of acoustic environment */
		#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */
		#define FIX_998_UNUSED_FUNCTION /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */
		#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */
		#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */
		#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */

		/* #################### End BASOP porting switches ############################ */

lib_com/prot.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -4790,14 +4790,6 @@ void dec_acelp_4t64(
		float code[], /* o : algebraic (fixed) codebook excitation */
		const int16_t Opt_AMR_WB /* i : flag indicating AMR-WB IO mode */
		);
		#ifndef FIX_960_SYN_OUTPUT
		uint32_t syn_output(
		float synth, / i/o: float synthesis signal */
		const int16_t output_frame, /* i : output frame length */
		int16_t synth_out / o : integer 16 bits synthesis signal */
		);

		#endif
		void FEC_exc_estim(
		Decoder_State st, / i/o: Decoder static memory */
		const int16_t L_frame, /* i : length of the frame */

lib_dec/FEC_HQ_phase_ecu.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -1093,12 +1093,8 @@ static void subst_spec(

		Xph = corr_phase[m];

		#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE
		/* extract fractional phase integer index in the range [0...1023] */
		Xph_short = (int16_t) ( 0x000003ff & (int32_t) ( ( Xph * 512 ) / EVS_PI ) );
		#else
		Xph_short = (int16_t) ( ( (int32_t) ( Xph * 512 / EVS_PI ) ) % 32768 ) & 0x03ff;
		#endif
		if ( Xph_short >= 512 )
		{
		sin_F = -sincos_t_ext[Xph_short - 512];
		@@ -1142,11 +1138,7 @@ static void subst_spec(
		mag_chg_local = 0.5f + ( 1.0f - ( 1.0f / PHASE_DITH ) ph_dith ) * 0.5f;
		}

		#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE
		Xph_short = (int16_t) ( ( (int32_t) ( ( Xph * 512 ) / EVS_PI ) ) & 0x000003ff );
		#else
		Xph_short = (int16_t) ( Xph * 512 / EVS_PI ) & 0x03ff;
		#endif

		if ( Xph_short >= 512 )
		{