[cleanup] accept NONBE_FIX_1220_OMASA_JBM_EXT_USAN (06f91d3c) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@
		#define FIX_1319_STACK_SBA_DECODER /* VA: issue 1319: Optimize the definition of buffer lengths in the SBA decoder */
		#define FIX_1320_STACK_CPE_DECODER /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */
		#define NONBE_FIX_1261_MASA_EXT_META_JBM /* Nokia: issue #1261: MASA metadata EXT output delay buffer init in JBM */
		#define NONBE_FIX_1220_OMASA_JBM_EXT_USAN /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */
		#define NONBE_FIX_1376_MDCT_CONCEALMENT /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */
		#define NONBE_1377_REND_DIRATT_CONF /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */
		#define FIX_1377_HANDLE_ERROR_CODE /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */

lib_dec/ivas_masa_dec_fx.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -1711,13 +1711,9 @@ ivas_error ivas_masa_dec_reconfigure_fx(
		move32();

		test();
		#ifdef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
		test();
		/* Copy state to TC buffer if granularity matches and we are not in OMASA EXT rendering mode */
		IF( st_ivas->hSpatParamRendCom != NULL && EQ_16( st_ivas->hSpatParamRendCom->slot_size, st_ivas->hTcBuffer->n_samples_granularity ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
		#else
		IF( st_ivas->hSpatParamRendCom != NULL && EQ_16( st_ivas->hSpatParamRendCom->slot_size, st_ivas->hTcBuffer->n_samples_granularity ) )
		#endif
		{
		Copy( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
		st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;
		@@ -1737,9 +1733,7 @@ ivas_error ivas_masa_dec_reconfigure_fx(
		test();
		test();
		test();
		#ifdef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
		test();
		#endif
		IF( ( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) && st_ivas->hDirACRend == NULL ) \|\|
		( ( EQ_32( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) \|\| EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) \|\| EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) && st_ivas->hDiracDecBin[0] == NULL ) )
		{
		@@ -1749,7 +1743,6 @@ ivas_error ivas_masa_dec_reconfigure_fx(
		return error;
		}
		}
		#ifdef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
		ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_DISABLE ) \|\| EQ_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) \|\| EQ_32( st_ivas->renderer_type, RENDERER_OMASA_MIX_EXT ) )
		{
		/* close all unnecessary parametric decoding and rendering */
		@@ -1758,19 +1751,6 @@ ivas_error ivas_masa_dec_reconfigure_fx(
		ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
		ivas_dirac_dec_close_fx( &( st_ivas->hDirAC ) );
		}
		#else
		ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_DISABLE ) \|\| EQ_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) )
		{
		IF( st_ivas->hDirAC != NULL )
		{
		/* close all unnecessary parametric decoding and rendering */
		ivas_dirac_dec_close_binaural_data_fx( st_ivas->hDiracDecBin );
		ivas_dirac_rend_close_fx( &( st_ivas->hDirACRend ) );
		ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
		ivas_dirac_dec_close_fx( &( st_ivas->hDirAC ) );
		}
		}
		#endif
		/* possible reconfigure is done later */

		/-----------------------------------------------------------------

lib_dec/ivas_mct_dec_fx.c

+0 −21

Original line number	Diff line number	Diff line
		@@ -1031,17 +1031,10 @@ static ivas_error ivas_mc_dec_reconfig_fx(
		ivas_masa_dec_close_fx( &( st_ivas->hMasa ) );

		ivas_qmetadata_close_fx( &st_ivas->hQMetaData );
		#ifndef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
		IF( st_ivas->hDirAC != NULL )
		{
		#endif
		ivas_dirac_rend_close_fx( &( st_ivas->hDirACRend ) );
		ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
		ivas_dirac_dec_close_fx( &( st_ivas->hDirAC ) );
		vbap_free_data_fx( &( st_ivas->hVBAPdata ) );
		#ifndef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
		}
		#endif

		/* init LS conversion if the renderer type asks for it */
		test();
		@@ -1121,17 +1114,10 @@ static ivas_error ivas_mc_dec_reconfig_fx(
		ivas_masa_dec_close_fx( &( st_ivas->hMasa ) );
		ivas_qmetadata_close_fx( &st_ivas->hQMetaData );

		#ifndef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
		IF( st_ivas->hDirAC != NULL )
		{
		#endif
		ivas_dirac_rend_close_fx( &( st_ivas->hDirACRend ) );
		ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
		ivas_dirac_dec_close_fx( &( st_ivas->hDirAC ) );
		vbap_free_data_fx( &( st_ivas->hVBAPdata ) );
		#ifndef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
		}
		#endif

		IF( EQ_16( last_mc_mode, MC_MODE_MCT ) )
		{
		@@ -1333,9 +1319,6 @@ static ivas_error ivas_mc_dec_reconfig_fx(
		IF( EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) )
		{
		test();
		#ifndef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
		test();
		#endif
		IF( ( NE_16( st_ivas->renderer_type, RENDERER_DISABLE ) ) && ( NE_16( st_ivas->renderer_type, RENDERER_MCMASA_MONO_STEREO ) ) )
		{
		IF( st_ivas->hDirAC != NULL )
		@@ -1355,11 +1338,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
		}
		}
		}
		#ifdef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
		ELSE IF( EQ_16( st_ivas->renderer_type, RENDERER_DISABLE ) )
		#else
		ELSE IF( EQ_16( st_ivas->renderer_type, RENDERER_DISABLE ) && st_ivas->hDirAC != NULL )
		#endif
		{
		ivas_dirac_rend_close_fx( &( st_ivas->hDirACRend ) );
		ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );