[cleanup] accept SBA_TD_RESIDUAL (1146536d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_fb_mixer.c

+0 −15

Original line number	Diff line number	Diff line
		@@ -230,11 +230,7 @@ ivas_error ivas_FB_mixer_open(
		}
		else
		{
		#ifdef SBA_TD_RESIDUAL
		num_chs_alloc = 1; /* only W channel processed for predicting YZX */
		#else
		num_chs_alloc = fb_cfg->num_out_chans;
		#endif
		}

		for ( i = 0; i < num_chs_alloc; i++ )
		@@ -408,11 +404,7 @@ void ivas_FB_mixer_close(
		}
		else
		{
		#ifdef SBA_TD_RESIDUAL
		num_chs_alloc = 1; /* only W channel processed for predicting YZX */
		#else
		num_chs_alloc = fb_cfg->num_out_chans;
		#endif
		}

		if ( hFbMixer != NULL )
		@@ -538,11 +530,7 @@ void ivas_fb_mixer_pcm_ingest(
		}
		else
		{
		#ifdef SBA_TD_RESIDUAL
		num_chs_ingest = 1; /* forward Filterbank MDFT only on W */
		#else
		num_chs_ingest = fb_cfg->num_out_chans;
		#endif
		}

		for ( i = 0; i < fb_cfg->num_in_chans; i++ )
		@@ -838,9 +826,6 @@ void ivas_fb_mixer_get_in_out_mapping(
		for ( i = 1; i < fb_cfg->num_out_chans; i++ )
		{
		in_out_mixer_map[i][0] = 1;
		#ifndef SBA_TD_RESIDUAL
		in_out_mixer_map[i][order[i]] = 1;
		#endif
		}
		}
		}

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,6 @@


		#define HR_METADATA /* Nok: Contribution #45: encode directional MASA metadata with more bits at 384k and 512k */
		#define SBA_TD_RESIDUAL /* Dlb : Issue 426: SBA encoder complexity optimization */

		#define FIX_357_DTX_32K /* Eri: issue 357 - Forced LP-CNG at 32k */
		#define FIX_435_ISM_MERGE_BUG /* Eri: Merge bug fix for ISM NULL metadata and tcx_only cases */

lib_enc/ivas_spar_encoder.c

+0 −17

Original line number	Diff line number	Diff line
		@@ -450,11 +450,7 @@ static ivas_error ivas_spar_enc_process(
		int16_t ts, l_ts, orig_dirac_bands, num_del_samples;

		float ppIn_FR_real[IVAS_SPAR_MAX_CH], ppIn_FR_imag[IVAS_SPAR_MAX_CH];
		#ifdef SBA_TD_RESIDUAL
		float wyzx_del_buf[FOA_CHANNELS][IVAS_FB_1MS_48K_SAMP];
		#else
		float w_del_buf[IVAS_FB_1MS_48K_SAMP];
		#endif
		float dir[3], avg_dir[3];
		float energySum, vecLen;
		#ifdef HODIRAC
		@@ -509,7 +505,6 @@ static ivas_error ivas_spar_enc_process(
		}
		/* store previous input samples for W in local buffer */
		assert( num_del_samples <= IVAS_FB_1MS_48K_SAMP );
		#ifdef SBA_TD_RESIDUAL
		if ( hSpar->hFbMixer->fb_cfg->active_w_mixing == 0 )
		{
		/* fill delay (1 ms) buffer for all Transport channels */
		@@ -519,9 +514,6 @@ static ivas_error ivas_spar_enc_process(
		mvr2r( &hSpar->hFbMixer->ppFilterbank_prior_input[idx][hSpar->hFbMixer->fb_cfg->prior_input_length - num_del_samples], wyzx_del_buf[idx], num_del_samples );
		}
		}
		#else
		mvr2r( &hSpar->hFbMixer->ppFilterbank_prior_input[0][hSpar->hFbMixer->fb_cfg->prior_input_length - num_del_samples], w_del_buf, num_del_samples );
		#endif

		/-----------------------------------------------------------------------------------------
		* FB mixer ingest
		@@ -929,7 +921,6 @@ static ivas_error ivas_spar_enc_process(
		#ifdef DEBUG_SBA_AUDIO_DUMP
		ivas_spar_dump_signal_wav( input_frame, p_pcm_tmp, NULL, nchan_transport, spar_foa_enc_wav[1], "ivas_fb_mixer_process()" );
		#endif
		#ifdef SBA_TD_RESIDUAL
		if ( hSpar->hFbMixer->fb_cfg->active_w_mixing == 0 )
		{
		/* delayed W */
		@@ -945,14 +936,6 @@ static ivas_error ivas_spar_enc_process(
		v_add( data_f[idx], p_pcm_tmp[i] + num_del_samples, p_pcm_tmp[i] + num_del_samples, input_frame - num_del_samples );
		}
		}
		#else
		/* move delayed W into output buffer unless activeW operation*/
		if ( hSpar->hFbMixer->fb_cfg->active_w_mixing == 0 )
		{
		mvr2r( w_del_buf, p_pcm_tmp[0], num_del_samples );
		mvr2r( data_f[0], p_pcm_tmp[0] + num_del_samples, input_frame - num_del_samples );
		}
		#endif
		#if 0 /* SBA_TD_RESIDUAL */
		{
		static FILE *fid = 0;