Removing lines that has no possibility of getting hit (8319cce9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_fb_mixer.c

+6 −2

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;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -6030,9 +6030,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
		@@ -430,18 +430,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;
		}

+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++ )
		{

+2 −1

Original line number	Diff line number	Diff line
		@@ -312,11 +312,12 @@ static ivas_error ivas_dirac_rend_config(
		/* Directional and diffuses components in SHD */
		/* Diffuseness components up to 1st order */
		hDirACRend->num_outputs_diff = ( min( hDirACRend->hOutSetup.ambisonics_order, 1 ) + 1 ) * ( min( hDirACRend->hOutSetup.ambisonics_order, 1 ) + 1 );
		#ifndef REMOVE_UNUSED_FUNCTION
		if ( ( st_ivas->ivas_format == SBA_FORMAT ) && ( ivas_total_brate >= IVAS_96k ) && ( hDirACRend->hOutSetup.ambisonics_order > 1 ) && ( nchan_transport < 4 ) )
		{
		hDirACRend->num_outputs_diff += 2; /* Add 2nd-order planar components for HRs */
		}

		#endif
		hDirACRend->num_outputs_dir = ivas_sba_get_nchan( hDirACRend->hOutSetup.ambisonics_order, 0 );
		}
		else if ( hDirACRend->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD )