[cleanup] accept FIX_RENDERER_STACK (fe96ba23) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -181,7 +181,6 @@
		#define FIX_1384_MSAN_ivas_spar_dec_open /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */
		#define FIX_1388_MSAN_ivas_init_decoder /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */
		#define FIX_1288_SPLIT_REND_XSAN /* Dlb: Fix asan, msan and usan issues in split rendering mode*/
		#define FIX_RENDERER_STACK /* VA: issue 1322: reduction of renderers' buffers size */
		#define JBM_MEMORY_OPT /* VA: issue 916: optimization of RAM in the JBM decoder */
		#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */
		#define FIX_1370_EXTERNAL_ORIENTATION_CHECK /* Nokia: add sanity check for Euler angles for external orientations */

lib_dec/ivas_dirac_dec.c

+0 −21

Original line number	Diff line number	Diff line
		@@ -1552,12 +1552,8 @@ void ivas_dirac_dec_render(
		uint16_t slot_size, n_samples_sf, ch, nchan_intern;
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
		float *output_f_local[MAX_OUTPUT_CHANNELS];
		#ifdef FIX_RENDERER_STACK
		float *p_output_f[MAX_OUTPUT_CHANNELS];
		float output_f_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
		#else
		float output_f_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k];
		#endif

		hSpatParamRendCom = st_ivas->hSpatParamRendCom;

		@@ -1568,11 +1564,7 @@ void ivas_dirac_dec_render(
		for ( ch = 0; ch < nchan_intern; ch++ )
		{
		output_f_local[ch] = output_f_local_buff[ch];
		#ifdef FIX_RENDERER_STACK
		p_output_f[ch] = output_f[ch];
		#else
		set_zero( output_f_local_buff[ch], nSamplesAsked );
		#endif
		}
		slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );

		@@ -1599,7 +1591,6 @@ void ivas_dirac_dec_render(

		for ( ch = 0; ch < nchan_intern; ch++ )
		{
		#ifdef FIX_RENDERER_STACK
		/* move to output */
		if ( !( ( st_ivas->hDirACRend->hOutSetup.separateChannelEnabled ) && ( st_ivas->hDirACRend->hOutSetup.separateChannelIndex == ch \|\| st_ivas->hDirACRend->hOutSetup.separateChannelIndex + 1 == ch ) ) )
		{
		@@ -1607,24 +1598,12 @@ void ivas_dirac_dec_render(
		}

		p_output_f[ch] += n_samples_sf;
		#else
		output_f_local[ch] += n_samples_sf;
		#endif
		}

		/* update combined orientation access index */
		ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );
		}

		#ifndef FIX_RENDERER_STACK
		for ( ch = 0; ch < nchan_intern; ch++ )
		{
		if ( !( ( st_ivas->hDirACRend->hOutSetup.separateChannelEnabled ) && ( st_ivas->hDirACRend->hOutSetup.separateChannelIndex == ch \|\| st_ivas->hDirACRend->hOutSetup.separateChannelIndex + 1 == ch ) ) )
		{
		mvr2r( output_f_local_buff[ch], output_f[ch], *nSamplesRendered );
		}
		}
		#endif
		if ( hSpatParamRendCom->slots_rendered == hSpatParamRendCom->num_slots )
		{
		if ( st_ivas->hDirAC->hConfig->dec_param_estim == 1 )

lib_rend/ivas_crend.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -1513,13 +1513,8 @@ static ivas_error ivas_rend_crendConvolver(
		const float pFreq_filt_re, pFreq_filt_im;
		float pFreq_buf_re = NULL, pFreq_buf_im = NULL;
		float pFreq_buf2_re = NULL, pFreq_buf2_im = NULL;
		#ifdef FIX_RENDERER_STACK
		float pOut[2 /Re,Im/ * L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
		float tmp_out_re[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES], tmp_out_im[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
		#else
		float pOut[2 /Re,Im/ * L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
		float tmp_out_re[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES], tmp_out_im[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
		#endif
		CREND_HANDLE hCrend;
		ivas_error error;

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -453,10 +453,6 @@ void ivas_dirac_dec_binaural_render(
		uint16_t nchan_out;
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
		float *output_f_local[MAX_OUTPUT_CHANNELS];
		#ifndef FIX_RENDERER_STACK
		float output_f_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k];
		int16_t output_length;
		#endif

		hSpatParamRendCom = st_ivas->hSpatParamRendCom;
		nchan_out = BINAURAL_CHANNELS;
		@@ -466,11 +462,7 @@ void ivas_dirac_dec_binaural_render(

		for ( ch = 0; ch < nchan_out; ch++ )
		{
		#ifdef FIX_RENDERER_STACK
		output_f_local[ch] = output_f[ch];
		#else
		output_f_local[ch] = output_f_local_buff[ch];
		#endif
		}
		slot_size = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );

		@@ -488,9 +480,6 @@ void ivas_dirac_dec_binaural_render(

		#ifdef DEBUGGING
		assert( slots_to_render == 0 );
		#endif
		#ifndef FIX_RENDERER_STACK
		output_length = 0;
		#endif
		for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
		{
		@@ -502,19 +491,10 @@ void ivas_dirac_dec_binaural_render(
		output_f_local[ch] += n_samples_sf;
		}

		#ifndef FIX_RENDERER_STACK
		output_length += n_samples_sf;
		#endif
		/* update combined orientation access index */
		ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );
		}

		#ifndef FIX_RENDERER_STACK
		for ( ch = 0; ch < nchan_out; ch++ )
		{
		mvr2r( output_f_local_buff[ch], output_f[ch], output_length );
		}
		#endif
		if ( hSpatParamRendCom->slots_rendered == hSpatParamRendCom->num_slots )
		{
		hSpatParamRendCom->dirac_read_idx = ( hSpatParamRendCom->dirac_read_idx + DEFAULT_JBM_SUBFRAMES_5MS ) % hSpatParamRendCom->dirac_md_buffer_length;