Merge branch 'main' into 744-fix-sofa-to-rom-tables-and-binaural-binary-files (15976b3e) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_fb_mixer.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -727,18 +727,21 @@ void ivas_fb_mixer_process(

		void ivas_fb_mixer_get_in_out_mapping(
		const IVAS_FB_CFG fb_cfg, / i : FB config. handle */
		#ifndef REMOVE_UNUSED_FUNCTION
		const int16_t nchan_transport, /* i : number of transport channels */
		const int16_t enc_dec_flag, /* i : encoder or decoder flag */
		const int16_t order, / i : downmix order */
		#endif
		int16_t in_out_mixer_map[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i/o: mixing mapping */
		)
		{
		int16_t i, j;

		set_s( (int16_t ) in_out_mixer_map, 0, IVAS_MAX_FB_MIXER_OUT_CH IVAS_MAX_SPAR_FB_MIXER_IN_CH );

		#ifndef REMOVE_UNUSED_FUNCTION
		if ( enc_dec_flag == ENC )
		{
		#endif
		if ( fb_cfg->active_w_mixing )
		{
		for ( i = 0; i < fb_cfg->num_out_chans; i++ )
		@@ -757,6 +760,7 @@ void ivas_fb_mixer_get_in_out_mapping(
		in_out_mixer_map[i][0] = 1;
		}
		}
		#ifndef REMOVE_UNUSED_FUNCTION
		}
		else
		{
		@@ -788,7 +792,7 @@ void ivas_fb_mixer_get_in_out_mapping(
		}
		}
		}

		#endif
		return;
		}

+8 −4

Original line number	Diff line number	Diff line
		@@ -110,12 +110,12 @@ ivas_error mct_enc_reconfigure(
		ivas_error ivas_sba_enc_reconfigure(
		Encoder_Struct st_ivas / i/o: IVAS encoder structure */
		);

		#ifndef REMOVE_UNUSED_FUNCTION
		/! r: maximum SBA metadata bit-budget /
		int16_t ivas_sba_get_max_md_bits(
		Encoder_Struct st_ivas / i/o: IVAS encoder structure */
		);

		#endif
		void destroy_sce_enc(
		SCE_ENC_HANDLE hSCE /* i/o: SCE encoder structure */
		);
		@@ -4163,8 +4163,10 @@ ivas_error ivas_sba_linear_renderer(
		const int16_t nchan_in, /* i : number of input ambisonics channels */
		const int16_t nchan_ism,
		const AUDIO_CONFIG output_config, /* i : output audio configuration */
		const IVAS_OUTPUT_SETUP output_setup, /* i : output format setup */
		const float hoa_dec_mtx[] /* i : HOA decoding mtx */
		const IVAS_OUTPUT_SETUP output_setup /* i : output format setup */
		#ifndef REMOVE_UNUSED_FUNCTION
		,const float hoa_dec_mtx[] /* i : HOA decoding mtx */
		#endif
		);

		void ivas_sba_mix_matrix_determiner(
		@@ -6034,9 +6036,11 @@ void ivas_fb_mixer_process(

		void ivas_fb_mixer_get_in_out_mapping(
		const IVAS_FB_CFG fb_cfg, / i : FB config. handle */
		#ifndef REMOVE_UNUSED_FUNCTION
		const int16_t nchan_transport, /* i : number of transport channels */
		const int16_t enc_dec_flag, /* i : encoder or decoder flag */
		const int16_t order, / i : downmix order */
		#endif
		int16_t in_out_mixer_map[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i/o: mixing mapping */
		);

+4 −2

Original line number	Diff line number	Diff line
		@@ -251,18 +251,20 @@ int16_t ivas_get_sba_num_TCs(
		)
		{
		int16_t table_idx, nchan_transport;

		#ifndef REMOVE_UNUSED_FUNCTION
		if ( ivas_total_brate == IVAS_SID_5k2 )
		{
		nchan_transport = 1;
		}
		else
		{
		#endif
		table_idx = ivas_get_spar_table_idx( ivas_total_brate, sba_order, SPAR_CONFIG_BW, NULL, NULL );

		nchan_transport = ivas_spar_br_table_consts[table_idx].nchan_transport;
		#ifndef REMOVE_UNUSED_FUNCTION
		}

		#endif
		return nchan_transport;
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@
		#define ROM_TO_RAM /Dlb : ROM optimization in SR mode/
		#define FIX_712_713_SPLIT_REND_MASA_MC /Dlb : Fix for issue 712 and 713/
		#endif
		#define REMOVE_UNUSED_FUNCTION /* Dlb: Remove functions that are unhit/unused */


		#define FIX_708_DPID_COMMAND_LINE /* issue 708: sanity checks for '-dpid' command-line */
		@@ -175,6 +176,7 @@

		/* #################### End BE switches ################################## */


		/* #################### Start NON-BE switches ############################ */
		/* any switch which is non-be wrt selection floating point code */
		/* all switches in this category should start with "NONBE_" */
		@@ -185,7 +187,7 @@
		#define NONBE_FIX_802_PARAMUPMIX_HIGHPASS /* Dlb: issue 802: Move HighPass filter operation for ParamUpmix */
		#define NONBE_FIX_809_EXTERNAL_TARGET_INTERPOLATION /* FhG: issue 809: unify external target interpolation inter and intra frame behaviour */
		#define NONBE_FIX_775_OSBA_BR_SWITCHING_CRASH /* FhG: issue 775: fix crash in OSBA with bitrate switching and output order lower than input order */

		#define NONBE_FIX_827_JBM_CREND_EARLY_REFLECTIONS /* FhG: issue #827: Resolve "JBM Crend early reflections are wrong" */
		#define JBM_FOR_OSBA /* FhG: implement OSBA format in the JBM path */
		#ifdef JBM_FOR_OSBA
		#define OSBA_ROOM_IR

+4 −1

Original line number	Diff line number	Diff line
		@@ -255,6 +255,7 @@ void ivas_agc_read_bits(
		/* read AGC parameters */
		if ( AGC_flag == 1 )
		{
		#ifndef REMOVE_UNUSED_FUNCTION
		if ( n_channels > 1 )
		{
		for ( i = 0; i < n_channels; i++ )
		@@ -264,9 +265,11 @@ void ivas_agc_read_bits(
		}
		else
		{
		#endif
		per_ch_bit[0] = 1;
		#ifndef REMOVE_UNUSED_FUNCTION
		}

		#endif
		assert( AGC_BITS_PER_CH == ( pState->agc_com.betaE + 1 ) );
		for ( i = 0; i < n_channels; i++ )
		{