[cleanup] accept FIX_NCHAN_BUFFERS (929691ec) · 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_NCHAN_BUFFERS /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */
		#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 */

lib_dec/ivas_init_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -2475,12 +2475,8 @@ ivas_error ivas_init_decoder(
		return error;
		}
		#else
		#ifdef FIX_NCHAN_BUFFERS
		k = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );
		for ( n = 0; n < k; n++ )
		#else
		for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )
		#endif
		{
		/* note: these are intra-frame heap memories */
		if ( ( st_ivas->p_output_f[n] = (float ) malloc( ( 48000 / FRAMES_PER_SEC ) sizeof( float ) ) ) == NULL )

lib_dec/ivas_jbm_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -883,16 +883,12 @@ void ivas_jbm_dec_feed_tc_to_renderer(
		p_data_f[n] = &st_ivas->p_output_f[n][0];
		}

		#ifdef FIX_NCHAN_BUFFERS
		#ifdef JBM_MEMORY_OPT
		ch = max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );
		#else
		ch = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );
		#endif
		for ( n = 0; n < ch; n++ )
		#else
		for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )
		#endif
		{
		hTcBuffer->tc[n] = st_ivas->p_output_f[n]; /* note: buffers needed in the TD decorellator */
		}

lib_dec/ivas_masa_dec.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -1320,12 +1320,10 @@ ivas_error ivas_masa_dec_reconfigure(
		Decoder_State **sts;
		int32_t ivas_total_brate, last_ivas_total_brate;
		int16_t numCldfbAnalyses_old, numCldfbSyntheses_old;
		#ifdef FIX_NCHAN_BUFFERS
		#ifdef FIX_1330_JBM_MEMORY
		int16_t nchan_out_buff;
		#else
		int16_t nchan_out_buff_old, nchan_out_buff;
		#endif
		#endif
		ivas_error error;
		int16_t pos_idx;
		@@ -1333,12 +1331,10 @@ ivas_error ivas_masa_dec_reconfigure(

		ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
		last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;
		#ifdef FIX_NCHAN_BUFFERS
		#ifndef FIX_1330_JBM_MEMORY
		nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );
		#endif

		#endif
		/* Copy state to TC buffer if granularity matches and we are not in OMASA EXT rendering mode */
		if ( st_ivas->hSpatParamRendCom != NULL && st_ivas->hSpatParamRendCom->slot_size == st_ivas->hTcBuffer->n_samples_granularity && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		@@ -1505,15 +1501,11 @@ ivas_error ivas_masa_dec_reconfigure(
		}
		else
		{
		#ifdef FIX_NCHAN_BUFFERS
		tc_nchan_to_allocate = BINAURAL_CHANNELS;
		if ( st_ivas->hDiracDecBin[0] != NULL && st_ivas->hDiracDecBin[0]->useTdDecorr )
		{
		tc_nchan_to_allocate = 2 * BINAURAL_CHANNELS;
		}
		#else
		tc_nchan_to_allocate = 2 * BINAURAL_CHANNELS;
		#endif
		}

		if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode == ISM_MASA_MODE_DISC )
		@@ -1571,7 +1563,6 @@ ivas_error ivas_masa_dec_reconfigure(
		}
		}

		#ifdef FIX_NCHAN_BUFFERS
		/-----------------------------------------------------------------
		* floating-point output audio buffers
		-----------------------------------------------------------------/
		@@ -1590,7 +1581,6 @@ ivas_error ivas_masa_dec_reconfigure(
		}
		}

		#endif
		return IVAS_ERR_OK;
		}

lib_dec/ivas_mct_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1320,7 +1320,6 @@ static ivas_error ivas_mc_dec_reconfig(

		if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM \|\| st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )
		{
		#ifdef FIX_NCHAN_BUFFERS
		tc_nchan_allocate_new = BINAURAL_CHANNELS;
		if ( st_ivas->hDiracDecBin[0] != NULL && st_ivas->hDiracDecBin[0]->useTdDecorr )
		{
		@@ -1330,9 +1329,6 @@ static ivas_error ivas_mc_dec_reconfig(
		{
		tc_nchan_allocate_new++;
		}
		#else
		tc_nchan_allocate_new = 2 * BINAURAL_CHANNELS;
		#endif
		tc_nchan_full_new = tc_nchan_allocate_new;
		}