Merge branch '1603_ref_port_fl1388' into 'float-pc' (84e3c946) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_dirac_com.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -447,14 +447,7 @@ ivas_error ivas_dirac_sba_config(
		else
		{
		hQMetaData->useLowerBandRes = 0;
		#ifndef NONBE_FIX_973_HODIRAC_BAND_GROUPING
		if ( hodirac_flag == 0 )
		{
		nbands_coded = nbands - 1; /* always combine the last two bands */
		}
		#else
		nbands_coded = nbands - 1; /* always combine the last two bands */
		#endif
		}

		{

lib_com/ivas_prot.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -3719,9 +3719,7 @@ void generate_masking_noise_lb_dirac(
		HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
		float tdBuffer, / i/o: time-domain signal, if NULL no LB-CNA */
		const int16_t nCldfbTs, /* i : number of CLDFB slots that will be rendered */
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i : common spatial rendering parameters handle */
		#endif
		const int16_t cna_flag /* i : CNA flag for LB and HB */
		);

lib_com/options.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -193,9 +193,6 @@
		#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */
		#define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural */
		#endif
		#define FIX_963_USAN_ERROR /* Eri: Issue 963: USAN error in Stereo CNG, division by zero */
		#define NONBE_FIX_973_HODIRAC_BAND_GROUPING /* FhG: issue 973: empty parameter band in DirAC */
		#define FIX_971_LOG2_IDX_GAIN_0 /* VA: prevent -Inf due to log2(ratio==0) */

		#define BE_FIX_567_DOUBLE_STEREO_DMX /* NTT: Fix formal issues */
		#define NONBE_FIX_567_DOUBLE_STEREO_DMX /* Orange: Double-precision replaced by single-precision */
		@@ -208,18 +205,11 @@
		#define NONBE_FIX_947_STEREO_DMX_FADOPT /* Orange: Fading optimisation */
		#endif

		#define NONBE_FIX_951_MCMASA_5MS_RENDERING /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2kbps to BINAURAL */

		#define NONBE_FIX_979_OSBA_STEREO_5MS /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */
		#define FIX_983_DISC_ISM_DIGEST_NUM_OBJS /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */
		#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */
		#define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */
		#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS /* FhG : issue #982 : 5ms and 20ms output different for OMASA */
		#define NONBE_FIX_975_JBM_USAN /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */
		#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */

		#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING /* FhG: fix usan error in MCT with bw swicthing */
		#define NONBE_FIX_986_MC_BW_SWITCHING /* FhG: fix crash in bw and br switching with MC */
		#define NONBE_FIX_999_JBM_MCT_FLUSH /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */
		#define NONBE_FIX_1000_G1_G2_SWB_TBE /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */

lib_dec/fd_cng_dec.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -1805,9 +1805,7 @@ void generate_masking_noise_lb_dirac(
		HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
		float tdBuffer, / i/o: time-domain signal, if NULL no LB-CNA */
		const int16_t nCldfbTs, /* i : number of CLDFB slots that will be rendered */
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i : common spatial rendering parameters handle */
		#endif
		const int16_t cna_flag /* i : CNA flag for LB and HB */
		)
		{
		@@ -1860,12 +1858,10 @@ void generate_masking_noise_lb_dirac(
		/* LB CLDFB - CNA from STFT: CNA applied only in channel 0*/
		if ( cna_flag && tdBuffer != NULL )
		{
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		int16_t cur_subframe;
		int16_t cur_subframe_start_outfs;
		int16_t cur_subframe_start_cngfs;
		int16_t slot_size_cng;
		#endif

		while ( n_samples_out > 0 )
		{
		@@ -1950,7 +1946,6 @@ void generate_masking_noise_lb_dirac(
		n_samples_out -= hFdCngCom->frameSize;
		n_samples_start += hFdCngCom->frameSize;
		}
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		/* move generated noise to the 5ms subframe starts in the tc buffer according to the output sampling frequency to avoid
		overwriting it with the synthesis in case of shared tc and synth channel memory, i.e. non-TSM mode */
		slot_size_cng = hFdCngCom->frameSize / DEFAULT_JBM_CLDFB_TIMESLOTS;
		@@ -1971,7 +1966,6 @@ void generate_masking_noise_lb_dirac(
		/* set everything else to zero */
		set_zero( tdBuffer + cur_subframe_start_outfs + move_size, subframe_size_outfs - move_size );
		}
		#endif
		}

		pop_wmops();

lib_dec/ivas_dirac_dec.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -1952,18 +1952,10 @@ void ivas_dirac_dec_render_sf(

		generate_masking_noise_dirac( st->hFdCngDec->hFdCngCom,
		st_ivas->cldfbAnaDec[1],
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		&st_ivas->hTcBuffer->tc[1][hSpatParamRendCom->num_freq_bands * hSpatParamRendCom->slots_rendered],
		#else
		st_ivas->hTcBuffer->tc[1],
		#endif
		Cldfb_RealBuffer[1][0],
		Cldfb_ImagBuffer[1][0],
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		slot_idx,
		#else
		index_slot,
		#endif
		st->cna_dirac_flag && st->flag_cna,
		( st->core_brate == FRAME_NO_DATA \|\| st->core_brate == SID_2k40 ) && st->cng_type == FD_CNG && st->cng_sba_flag );
		}

Admin message