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

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,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_fx.c

+0 −23

Original line number	Diff line number	Diff line
		@@ -2076,12 +2076,8 @@ void ivas_dirac_dec_render_fx(
		move16();
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
		Word32 *output_fx_local[MAX_OUTPUT_CHANNELS];
		#ifdef FIX_RENDERER_STACK
		Word32 *p_output_fx[MAX_OUTPUT_CHANNELS];
		Word32 output_fx_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
		#else
		Word32 output_fx_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k] = { 0 };
		#endif

		hSpatParamRendCom = st_ivas->hSpatParamRendCom;

		@@ -2089,11 +2085,7 @@ void ivas_dirac_dec_render_fx(
		FOR( ch = 0; ch < nchan_intern; ch++ )
		{
		output_fx_local[ch] = output_fx_local_buff[ch];
		#ifdef FIX_RENDERER_STACK
		p_output_fx[ch] = output_fx[ch];
		#else
		set_zero_fx( output_fx_local[ch], nSamplesAsked );
		#endif
		}
		slot_size = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); // cL

		@@ -2122,7 +2114,6 @@ void ivas_dirac_dec_render_fx(

		FOR( ch = 0; ch < nchan_intern; ch++ )
		{
		#ifdef FIX_RENDERER_STACK
		/* move to output */
		test();
		test();
		@@ -2132,26 +2123,12 @@ void ivas_dirac_dec_render_fx(
		}

		p_output_fx[ch] += n_samples_sf;
		#else
		output_fx_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++ )
		{
		test();
		test();
		IF( !( ( st_ivas->hDirACRend->hOutSetup.separateChannelEnabled ) && ( ( EQ_16( st_ivas->hDirACRend->hOutSetup.separateChannelIndex, ch ) \|\| EQ_16( add( st_ivas->hDirACRend->hOutSetup.separateChannelIndex, 1 ), ch ) ) ) ) )
		{
		Copy32( output_fx_local_buff[ch], output_fx[ch], *nSamplesRendered );
		}
		}
		#endif
		/* clang-format off */
		IF( EQ_16( hSpatParamRendCom->slots_rendered, hSpatParamRendCom->num_slots ) )
		{

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+0 −21

Original line number	Diff line number	Diff line
		@@ -512,21 +512,13 @@ void ivas_dirac_dec_binaural_render_fx(
		UWord16 nchan_out;
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
		Word32 *output_fx_local[MAX_OUTPUT_CHANNELS];
		#ifndef FIX_RENDERER_STACK
		Word32 output_fx_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k];
		Word16 output_length;
		#endif

		hSpatParamRendCom = st_ivas->hSpatParamRendCom;
		nchan_out = BINAURAL_CHANNELS;
		move16();
		FOR( ch = 0; ch < nchan_out; ch++ )
		{
		#ifdef FIX_RENDERER_STACK
		output_fx_local[ch] = output_fx[ch];
		#else
		output_fx_local[ch] = output_fx_local_buff[ch];
		#endif
		}
		slot_size = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );

		@@ -545,10 +537,6 @@ void ivas_dirac_dec_binaural_render_fx(
		last_sf = add( last_sf, 1 );
		}

		#ifndef FIX_RENDERER_STACK
		output_length = 0;
		move16();
		#endif
		FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
		{
		n_samples_sf = imult1616( slot_size, hSpatParamRendCom->subframe_nbslots[subframe_idx] );
		@@ -560,19 +548,10 @@ void ivas_dirac_dec_binaural_render_fx(
		output_fx_local[ch] += n_samples_sf;
		}

		#ifndef FIX_RENDERER_STACK
		output_length = add( 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++ )
		{
		Copy32( output_fx_local_buff[ch], output_fx[ch], output_length );
		}
		#endif
		IF( EQ_16( hSpatParamRendCom->slots_rendered, hSpatParamRendCom->num_slots ) )
		{
		hSpatParamRendCom->dirac_read_idx = add( hSpatParamRendCom->dirac_read_idx, DEFAULT_JBM_SUBFRAMES_5MS ) % hSpatParamRendCom->dirac_md_buffer_length;