[cleanup] accept NONBE_1303_REND_GRANULARITY (6b36c7e6) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -1008,20 +1008,11 @@ Word16 IGF_MapBitRateToIndex(
		const Word16 rf_mode /* i : flag to signal the RF mode */
		);

		#ifdef NONBE_1303_REND_GRANULARITY
		Word16 ivas_jbm_dec_get_render_granularity_fx(
		const RENDERER_TYPE renderer_type, /* i : renderer type */
		const RENDERER_TYPE renderer_type_sec, /* i : secondary renderer type */
		const int32_t output_Fs /* i : sampling rate */
		);
		#else
		Word16 ivas_jbm_dec_get_render_granularity(
		const RENDERER_TYPE rendererType, /* i : renderer type */
		const IVAS_FORMAT ivas_format, /* i : ivas format */
		const MC_MODE mc_mode, /* i : MC mode */
		const Word32 output_Fs /* i : sampling rate */
		);
		#endif

		void stereo_dft_config_fx(
		STEREO_DFT_CONFIG_DATA_HANDLE hConfig, /* o : DFT stereo configuration */

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@
		#define FIX_1387_INIT_PRM_SQQ /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */
		#define FIX_1349_TNS_CRASH /* FhG: Fix crash in TNS entropy coding, in case order of joint TNS coding is reduced to 0 */
		#define FIX_1384_MSAN_stereo_tcx_core_enc /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */
		#define NONBE_1303_REND_GRANULARITY /* VA: issue 1303: Renderer granularity revision */
		#define NONBE_1300_TDREND_LARGE_ITD /* Eri: issue 1300: There was a bug feeding 1.25 ms frames to the TD renderer, causing out-of-buffer access. This was resolved. However, it is still possible that modeled HRTF with large ITDs could trigger out-of-buffer access. This adds a check to prevent this.*/
		#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() */

lib_dec/ivas_init_dec_fx.c

+0 −39

Original line number	Diff line number	Diff line
		@@ -2559,15 +2559,6 @@ ivas_error ivas_init_decoder_fx(
		return error;
		}
		}
		#ifndef NONBE_1303_REND_GRANULARITY
		granularity = NS2SA_FX2( output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
		n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );

		IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ), IVAS_ERR_OK ) )
		{
		return error;
		}
		#endif
		}
		ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) )
		{
		@@ -2611,30 +2602,6 @@ ivas_error ivas_init_decoder_fx(

		st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;
		move32();
		#ifndef NONBE_1303_REND_GRANULARITY
		test();
		IF( ( EQ_32( st_ivas->ivas_format, MC_FORMAT ) ) && ( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) ) )
		{
		granularity = NS2SA_FX2( output_Fs, CLDFB_SLOT_NS );
		n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );

		IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, MC_PARAMUPMIX_MAX_INPUT_CHANS, MC_PARAMUPMIX_MAX_INPUT_CHANS, granularity ) ), IVAS_ERR_OK ) )
		{
		return error;
		}
		}
		ELSE
		{
		granularity = NS2SA_FX2( output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );

		n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );

		IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ), IVAS_ERR_OK ) )
		{
		return error;
		}
		}
		#endif
		}

		IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )
		@@ -2921,16 +2888,10 @@ ivas_error ivas_init_decoder_fx(
		IF( st_ivas->hTcBuffer == NULL )
		{
		/* no module has yet open the TC buffer, open a default one */
		#ifdef NONBE_1303_REND_GRANULARITY
		granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, ivas_renderer_secondary_select_fx( st_ivas ), output_Fs );
		n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );

		IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ), IVAS_ERR_OK ) )
		#else
		n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );

		IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA_FX2( output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
		#endif
		{
		return error;
		}

lib_dec/ivas_ism_dec_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -142,11 +142,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(

		/* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv
		render what still fits in the new granularity */
		#ifdef NONBE_1303_REND_GRANULARITY
		tc_granularity_new = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );
		#else
		tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );
		#endif

		IF( LT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
		{

lib_dec/ivas_ism_param_dec_fx.c

+0 −15

Original line number	Diff line number	Diff line
		@@ -599,11 +599,7 @@ ivas_error ivas_param_ism_dec_open_fx(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		)
		{
		#ifdef NONBE_1303_REND_GRANULARITY
		Word16 i, granularity;
		#else
		Word16 i;
		#endif
		PARAM_ISM_DEC_HANDLE hParamIsmDec;
		IVAS_OUTPUT_SETUP hOutSetup;
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
		@@ -767,9 +763,7 @@ ivas_error ivas_param_ism_dec_open_fx(
		st_ivas->hParamIsmDec = hParamIsmDec;
		st_ivas->hSpatParamRendCom = hSpatParamRendCom;

		#ifdef NONBE_1303_REND_GRANULARITY
		granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );
		#endif

		test();
		IF( NE_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) && NE_32( st_ivas->renderer_type, RENDERER_DISABLE ) )
		@@ -816,11 +810,7 @@ ivas_error ivas_param_ism_dec_open_fx(

		IF( st_ivas->hTcBuffer == NULL )
		{
		#ifdef NONBE_1303_REND_GRANULARITY
		IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, granularity ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
		#endif
		{
		return error;
		}
		@@ -833,12 +823,7 @@ ivas_error ivas_param_ism_dec_open_fx(
		IF( st_ivas->hTcBuffer == NULL )
		{
		Word16 nchan_to_allocate = st_ivas->hDecoderConfig->nchan_out;
		#ifdef NONBE_1303_REND_GRANULARITY
		IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_BUFFER, nchan_to_allocate, nchan_to_allocate, nchan_to_allocate, granularity ) ), IVAS_ERR_OK ) )
		#else
		move16(); // NS2SA
		IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_BUFFER, nchan_to_allocate, nchan_to_allocate, nchan_to_allocate, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
		#endif
		{
		return error;
		}