merge main to branch (ee36a663) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -3811,11 +3811,7 @@ static void printSupportedAudioConfigs( void )
		"HOA2",
		"HOA3",
		"ISMx (input only)",
		#ifdef FIX_740_MASA_PREREND_VALIDITY_CHECK
		"MASAx",
		#else
		"MASAx (input only)",
		#endif
		"BINAURAL (output only)",
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		"BINAURAL_SPLIT_PCM",

lib_com/ivas_prot.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -189,10 +189,17 @@ ivas_error pre_proc_front_ivas(
		const float tdm_lsp_new_PCh[M], /* i : unq. LSPs of primary channel */
		const float currFlatness, /* i : flatness parameter */
		const int16_t tdm_ratio_idx, /* i : Current Ratio_L index */
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		float fr_bands_LR[][2 * NB_BANDS], /* i : energy in frequency bands */
		const float Etot_LR[], /* i : total energy Left & Right channel */
		float lf_E_LR[][2 * VOIC_BINS], /* i : per bin spectrum energy in lf, LR channels */
		const int16_t localVAD_HE_SAD_LR[], /* i : HE-SAD flag without hangover, LR channels */
		#else
		float fr_bands_LR[CPE_CHANNELS][2 * NB_BANDS], /* i : energy in frequency bands */
		const float Etot_LR[CPE_CHANNELS], /* i : total energy Left & Right channel */
		float lf_E_LR[CPE_CHANNELS][2 * VOIC_BINS], /* i : per bin spectrum energy in lf, LR channels */
		const int16_t localVAD_HE_SAD_LR[CPE_CHANNELS], /* i : HE-SAD flag without hangover, LR channels */
		#endif
		float band_energies_LR[2 * NB_BANDS], /* o : energy in critical bands without minimum noise floor E_MIN */
		const int16_t flag_16k_smc, /* i : flag to indicate if the OL SMC is run at 16 kHz */
		const int16_t front_vad_flag, /* i : front-VAD flag to overwrite VAD decision */
		@@ -990,7 +997,11 @@ ivas_error ivas_ism_metadata_dec_create(

		ivas_error ivas_ism_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		float data[], / i : input signal [channels][samples] */
		#else
		float data[MAX_NUM_OBJECTS], / i : input signal */
		#endif
		const int16_t input_frame, /* i : input frame length per channel */
		int16_t nb_bits_metadata, / i : number of metadata bits */
		const int16_t flag_omasa_ener_brate /* i : less bitrate for objects in OMASA flag */

lib_com/options.h

+2 −5

Original line number	Diff line number	Diff line
		@@ -150,14 +150,12 @@
		/#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_879_USAN_ERROR_IN_MASA_DECODING /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */
		#define FIX_740_MASA_PREREND_VALIDITY_CHECK /* Nokia: issue 740: fix incorrect validity check in lib_rend to allow use of MASA prerenderer */
		#define FIX_247_EXTERNAL_RENDERER_COMMAND_LINE /* VA: issue 247: harmonize command-line options names of external renderer with the decoder */
		#define FIX_865_MOVE_TD_DECORR /* VA: issue 865: Move ivas_td_decorr.c from lib_com to lib_rend */
		#define FIX_888_INTERFACE_UNIFICATION /* Nokia: issue #888: fix mismatch in 2D array size */
		#define FIX_889_MASA_FILE_WRITER_OPEN /* Nokia: issue #889: mismatch in function definition and use */
		#define FIX_890_ARRAY_SIZE /* Nokia: issue #890: mismatch in 2D array size declaration and use */

		#define BE_FIX_887_GCC_WARNING_ARRAY_SIZE /* VoiceAge: Issue 887: change array size definition to avoid warning with gcc 11.4.0 */
		#define FIX_247_EXTERNAL_RENDERER_COMMAND_LINE /* VA: issue 247: harmonize command-line options names of external renderer with the decoder */

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

		@@ -168,7 +166,6 @@

		#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_836_PARAMUPMIX_HEADROT /* Dlb: issue #836: Resolve "ParamUpmix MC to SBA conversion done on the already binaurlized output" */
		#define NONBE_FIX_874_OMASA_BRSW_2TD /* Nokia: issue 874: Fixes the crashes with the long test vectors that prompted switching to TD*/

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

lib_com/prot.h

+14 −5

Original line number	Diff line number	Diff line
		@@ -3249,10 +3249,19 @@ void long_enr(
		const float Etot, /* i : total channel energy */
		const int16_t localVAD_HE_SAD, /* i : HE-SAD flag without hangover */
		const int16_t high_lpn_flag, /* i : sp/mus LPN flag */
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		FRONT_VAD_ENC_HANDLE hFrontVad[], /* i/o: front-VAD handles */
		#else
		FRONT_VAD_ENC_HANDLE hFrontVad[CPE_CHANNELS], /* i/o: front-VAD handles */
		#endif
		const int16_t n_chan, /* i : number of channels */
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		const int16_t localVAD_HE_SAD_LR[], /* i : HE-SAD flag without hangover LR channels */
		const float Etot_LR[] /* i : total channel energy LR channels */
		#else
		const int16_t localVAD_HE_SAD_LR[CPE_CHANNELS], /* i : HE-SAD flag without hangover LR channels */
		const float Etot_LR[CPE_CHANNELS] /* i : total channel energy LR channels */
		#endif
		);

		void noise_est_pre(

lib_dec/ivas_dec.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -868,23 +868,15 @@ ivas_error ivas_dec(

		ivas_mc_paramupmix_dec( st_ivas, p_output );

		#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT
		if ( st_ivas->transport_config != st_ivas->intern_config &&
		( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) &&
		( output_config == IVAS_AUDIO_CONFIG_FOA \|\| output_config == IVAS_AUDIO_CONFIG_HOA2 \|\| output_config == IVAS_AUDIO_CONFIG_HOA3 ) )
		#else
		if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )
		#endif
		{
		ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );
		}

		/* Rendering */
		#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT
		if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && !st_ivas->hDecoderConfig->Opt_Headrotation )
		#else
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
		#endif
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )