Merge remote-tracking branch 'remotes/origin/main' into formatting_ISAR (1c63d2bd) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -982,20 +982,14 @@ ivas_error ivas_ism_metadata_enc_create(

		ivas_error ivas_ism_metadata_dec_create(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		#ifdef NONBE_FIX_1065_ISM_MD_HANDLE
		const int16_t n_ISms, /* i : number of separately coded objects */
		#else
		const int16_t n_ISms, /* i : number of objects */
		#endif
		int32_t element_brate_tmp[] /* o : element bitrate per object */
		);

		#ifdef NONBE_FIX_1065_ISM_MD_HANDLE
		void ivas_ism_reset_metadata_handle_dec(
		ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
		);

		#endif
		ivas_error ivas_ism_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		float data[], / i : input signal [channels][samples] */

+0 −4

Original line number	Diff line number	Diff line
		@@ -159,7 +159,6 @@
		#define FIX_NUM_SUBFRAME_UPDATE

		#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 ################################## */
		@@ -168,9 +167,6 @@
		/* any switch which is non-be wrt selection floating point code */
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */
		#define NONBE_FIX_1067_QUATERNIONSLERP_INACCURACIES /* Philips: issue 1067: QuaternionSlerp inaccuracies in corner cases */
		#define NONBE_FIX_1065_ISM_MD_HANDLE /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */
		#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

		#define NONBE_FIX_SBA_SIGNALING_BITS_B /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

+0 −5

Original line number	Diff line number	Diff line
		@@ -2316,13 +2316,8 @@ 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;
		}

+0 −8

Original line number	Diff line number	Diff line
		@@ -1327,11 +1327,7 @@ ivas_error ivas_init_decoder(
		}
		}

		#ifdef NONBE_FIX_1065_ISM_MD_HANDLE
		if ( ( error = ivas_ism_metadata_dec_create( st_ivas, st_ivas->nchan_ism, element_brate_tmp ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_metadata_dec_create( st_ivas, st_ivas->nSCE, element_brate_tmp ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -1665,7 +1661,6 @@ ivas_error ivas_init_decoder(

		reset_indices_dec( st_ivas->hSCE[0]->hCoreCoder[0] );

		#ifdef NONBE_FIX_1065_ISM_MD_HANDLE
		if ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		if ( ( error = ivas_ism_metadata_dec_create( st_ivas, st_ivas->nchan_ism, NULL ) ) != IVAS_ERR_OK )
		@@ -1675,14 +1670,11 @@ ivas_error ivas_init_decoder(
		}
		else
		{
		#endif
		if ( ( error = ivas_ism_metadata_dec_create( st_ivas, 1, NULL ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		#ifdef NONBE_FIX_1065_ISM_MD_HANDLE
		}
		#endif
		}
		else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
		{

+0 −13

Original line number	Diff line number	Diff line
		@@ -270,25 +270,12 @@ 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 );
		st_ivas->hHrtfTD = NULL;

		if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		ivas_reverb_close( &st_ivas->hReverb );
		}
		}
		#endif
		}
		else
		{