Merge branch '20231018_acceptance_of_switches' into 'main' (d2b2dba7) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_ism_com.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -602,11 +602,7 @@ void ivas_ism_metadata_close(
		{
		int16_t n;

		#ifdef FIX_852_FIX_HANDLE_DEREF
		if ( hIsmMetaData == NULL \|\| *hIsmMetaData == NULL )
		#else
		if ( hIsmMetaData == NULL \|\| hIsmMetaData == NULL )
		#endif
		{
		return;
		}

lib_com/ivas_prot.h

+26 −54

Original line number	Diff line number	Diff line
		@@ -294,13 +294,11 @@ ivas_error ivas_init_decoder(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		#ifdef NONBE_FIX_839_MC_RS_CHANNEL_ALLOC
		ivas_error ivas_output_buff_dec(
		float p_output_f[], / i/o: output audio buffers */
		const int16_t nchan_out_buff_old, /* i : previous frame number of output channels*/
		const int16_t nchan_out_buff /* i : number of output channels */
		);
		#endif

		ivas_error stereo_dmx_evs_init_encoder(
		STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS, / o : Stereo downmix for EVS encoder handle */
		@@ -430,7 +428,6 @@ ivas_error ivas_core_enc(
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
		const int16_t n_CoreChannels, /* i : number of core channels to be coded */
		#ifdef FIX_854_ARRAY_SIZE_MISMATCH
		float old_inp_12k8[][L_INP_12k8], /* i : buffer of old input signal */
		float old_inp_16k[][L_INP], /* i : buffer of old input signal */
		float ener[], /* i : residual energy from Levinson-Durbin */
		@@ -449,26 +446,6 @@ ivas_error ivas_core_enc(
		const int16_t vad_flag_dtx[], /* i : HE-SAD flag with additional DTX HO */
		float enerBuffer[][CLDFB_NO_CHANNELS_MAX], /* i : energy buffer */
		float fft_buff[][2 * L_FFT], /* i : FFT buffer */
		#else
		float old_inp_12k8[CPE_CHANNELS][L_INP_12k8], /* i : buffer of old input signal */
		float old_inp_16k[CPE_CHANNELS][L_INP], /* i : buffer of old input signal */
		float ener[CPE_CHANNELS], /* i : residual energy from Levinson-Durbin */
		float A[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes */
		float Aw[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquantized for subframes */
		float epsP[CPE_CHANNELS][M + 1], /* i : LP prediction errors */
		float lsp_new[CPE_CHANNELS][M], /* i : LSPs at the end of the frame */
		float lsp_mid[CPE_CHANNELS][M], /* i : LSPs in the middle of the frame */
		const int16_t vad_hover_flag[CPE_CHANNELS], /* i : VAD hanglover flag */
		int16_t attack_flag[CPE_CHANNELS], /* i : attack flag (GSC or TC) */
		float realBuffer[CPE_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer */
		float imagBuffer[CPE_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer */
		float old_wsp[CPE_CHANNELS][L_WSP], /* i : weighted input signal buffer */
		const int16_t loc_harm[CPE_CHANNELS], /* i : harmonicity flag */
		const float cor_map_sum[CPE_CHANNELS], /* i : speech/music clasif. parameter */
		const int16_t vad_flag_dtx[CPE_CHANNELS], /* i : HE-SAD flag with additional DTX HO */
		float enerBuffer[CPE_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i : energy buffer */
		float fft_buff[CPE_CHANNELS][2 * L_FFT], /* i : FFT buffer */
		#endif
		const int16_t tdm_SM_flag, /* i : channel combination scheme flag */
		const int16_t ivas_format, /* i : IVAS format */
		const int16_t flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */
		@@ -480,13 +457,8 @@ ivas_error ivas_core_dec(
		CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
		MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
		const int16_t n_channels, /* i : number of channels to be decoded */
		#ifdef FIX_854_ARRAY_SIZE_MISMATCH
		float output[], / o : output synthesis signal */
		float outputHB[][L_FRAME48k], /* o : output HB synthesis signal */
		#else
		float output[CPE_CHANNELS], / o : output synthesis signal */
		float outputHB[CPE_CHANNELS][L_FRAME48k], /* o : output HB synthesis signal */
		#endif
		float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
		const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
		);

lib_com/options.h

+2 −15

Original line number	Diff line number	Diff line
		@@ -150,18 +150,11 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		/#define SPLIT_REND_WITH_HEAD_ROT / /* Dlb,FhG: Split Rendering contributions 21 and 35 */


		#define FIX_817_DOUBLE_PREC_REND_MD /* Eri: Issue 817: Avoid double precision in renderer metadata module */

		#define FIX_820_DOUBLE_PREC_MACROS /* VA: issue 820: Double precision arithmetic in IVAS_CALCULATE_ABS() */
		#define FIX_854_ARRAY_SIZE_MISMATCH /* VA: issue 854: correct the mismatch between definition and declaration of `ivas_core_dec() */
		#define FIX_785_REMOVE_DEAD_CODE /* VA: issue 785: remove dead code */
		#define FIX_852_FIX_HANDLE_DEREF /* VA: issue 852: Fix missing handle dereferencing of hIsmMetadaData in ivas_ism_metadata_close() */
		#define FIX_520_REMOVE_MEMMOVE_JBM /* VA: issue 520: Remove memmove() from JBM code */
		#define FIX_853_ARRAY_SIZE_MISMATCH /* Nokia: Issue #853: Mismatch of declaration and definition of computeIntensityVector_ana and computeReferencePower_ana */
		#define FIX_814_DOUBLE_PREC_IN_REVERB /* Philips: Issue 814: Replace double precision arithmetic in reverb */
		#define FIX_866_MOVE_VBAP /* Nokia: Issue 866: Move VBAP to lib_rend */


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


		@@ -169,19 +162,13 @@
		/* any switch which is non-be wrt selection floating point code */
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_838_CRASH_24_4_WB /* FhG: Issue 838: fix encoder crashes for Unified Stereo and MASA 2 TC at 24.4 kbps WB due to missing IGF (re-) allocation */
		#define NONBE_FIX_839_MC_RS_CHANNEL_ALLOC /* FhG: Issues #839: problems with reallocation of the channels on the heap in case of MC RS */
		#define BE_FIX_832_ASAN_ERROR_EFAP_OSBA /* FhG: issue #832: fix ASAN error caused by re-allocating EFAP memories in OSBA*/
		#define NONBE_FIX_819_DOUBLE_PREC_COMB_FORMATS /* VA: issue 820: Double precision arithmetic in combined formats */
		#define NONBE_FIX_849_OMASA_BFI_CRASH /* VA: issue 849: fix OMASA 2TC and FEC crashes */
		#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

		#define NONBE_UNIFIED_DECODING_PATHS /* FhG: unify decoding paths */
		#define NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING /* VA: issue 861: fix MASA 2TC crash when switching from MDCT stereo to TD/DFT stereo */
		#define BE_FIX_867_PARAMC_RECONFIG /* FhG: issue #867: fix ParamMC CLDFB buffer dealloc when reconfiguring */

		#define NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING /* Nokia: issue #850: Fixes rare non-valid diffuseness and energy ratio values in 2dir MASA. */


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

		/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_binRenderer_internal.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -891,12 +891,7 @@ static void ivas_binaural_obtain_DMX(
		{
		int16_t chIdx, bandIdx, k;

		#ifdef FIX_785_REMOVE_DEAD_CODE
		if ( hBinRenderer->ivas_format == MC_FORMAT )
		#else
		// ToDo: hBinRenderer->ivas_format is never set to ISM_FORMAT
		if ( hBinRenderer->ivas_format == MC_FORMAT \|\| hBinRenderer->ivas_format == ISM_FORMAT )
		#endif
		{
		/* Obtain the downmix */
		float P_in[CLDFB_NO_CHANNELS_MAX];

lib_dec/ivas_core_dec.c

+7 −12

Original line number	Diff line number	Diff line
		@@ -60,13 +60,8 @@ ivas_error ivas_core_dec(
		CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
		MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
		const int16_t n_channels, /* i : number of channels to be decoded */
		#ifdef FIX_854_ARRAY_SIZE_MISMATCH
		float output[], / o : output synthesis signal */
		float hb_synth[][L_FRAME48k], /* o : output HB synthesis signal */
		#else
		float output[L_FRAME48k], / o : output synthesis signal */
		float hb_synth[CPE_CHANNELS][L_FRAME48k], /* o : output HB synthesis signal */
		#endif
		float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
		const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
		)