Merge branch 'main' into 1053-reverb-reconfiguration-runtime (8e47edee) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,7 @@
		#define FIX_970_USAN_IN_NELP_SEED
		#define FIX_1044_ISM_REND_MEMORY /* VA: issue 1044: Lower the memory of the ISM renderer handle. */
		#define FIX_1053_REVERB_RECONFIGURATION /* Philips: issue 1053: fix for dynamic switching of acoustic environment */
		#define FIX_1060_USAN_ARRAY_BOUNDS /* FhG: issue 1060: USAN array-bounds errors */

		/* #################### End BE switches ################################## */

		@@ -176,6 +177,7 @@
		#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/
		#define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */
		#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */
		#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */

		/* ##################### End NON-BE switches ########################### */

+5 −0

Original line number	Diff line number	Diff line
		@@ -2317,8 +2317,13 @@ void ivas_dirac_dec_render_sf(

		for ( l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )
		{
		#ifdef FIX_1060_USAN_ARRAY_BOUNDS
		Cldfb_RealBuffer[j2][k][l] += g * *( tc_re++ );
		Cldfb_ImagBuffer[j2][k][l] += g * *( tc_im++ );
		#else
		Cldfb_RealBuffer[j2][0][k * hSpatParamRendCom->num_freq_bands + l] += g * *( tc_re++ );
		Cldfb_ImagBuffer[j2][0][k * hSpatParamRendCom->num_freq_bands + l] += g * *( tc_im++ );
		#endif
		}
		w1 += hSpatParamRendCom->num_freq_bands;
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -286,6 +286,14 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		}

		/* Close the TD Binaural renderer */
		#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING
		ivas_td_binaural_close( &st_ivas->hBinRendererTd );

		if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		ivas_reverb_close( &st_ivas->hReverb );
		}
		#else
		if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )
		{
		ivas_td_binaural_close( &st_ivas->hBinRendererTd );
		@@ -296,6 +304,7 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		ivas_reverb_close( &st_ivas->hReverb );
		}
		}
		#endif
		}
		else
		{

+4 −0

Original line number	Diff line number	Diff line
		@@ -1210,11 +1210,15 @@ static ivas_error ivas_mc_dec_reconfig(

		if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )
		{
		#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING
		ivas_td_binaural_close( &st_ivas->hBinRendererTd );
		#else
		if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )
		{
		ivas_td_binaural_close( &st_ivas->hBinRendererTd );
		st_ivas->hHrtfTD = NULL;
		}
		#endif
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT

+8 −0

Original line number	Diff line number	Diff line
		@@ -402,12 +402,20 @@ ivas_error ivas_omasa_dec_config(
		}
		else
		{
		#ifdef NONBE_FIX_1045_ISM_BITRATE_SWITCHING
		if ( st_ivas->hBinRendererTd != NULL )
		{
		/* TD renderer handle */
		ivas_td_binaural_close( &st_ivas->hBinRendererTd );
		}
		#else
		if ( st_ivas->hBinRendererTd != NULL && st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )
		{
		/* TD renderer handle */
		ivas_td_binaural_close( &st_ivas->hBinRendererTd );
		st_ivas->hHrtfTD = NULL;
		}
		#endif
		/* ISM renderer handle + ISM data handle */
		ivas_omasa_separate_object_renderer_close( st_ivas );
		}