Merge branch '1603_basop_port_fl1388' into 'main-pc' (868d9c15) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_dirac_com_fx.c

+0 −7

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

		{

lib_com/ivas_prot_fx.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -4995,9 +4995,7 @@ void generate_masking_noise_lb_dirac_fx(
		HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
		Word32 tdBuffer, / i/o: time-domain signal, if NULL no LB-CNA */
		const Word16 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 Word16 cna_flag /* i : CNA flag for LB and HB */
		);

lib_com/options.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -93,9 +93,7 @@
		#define FIX_1372_ISAR_POST_REND
		#endif
		#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
		#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 USE_NEW_HRTF_BINARY_FILE_FORMAT /* Orange: to activate when decided to change the hrtf binary file format */
		#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
		@@ -110,16 +108,9 @@

		#endif

		#define NONBE_FIX_951_MCMASA_5MS_RENDERING /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps 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 NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */
		#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 NONBE_FIX_982_OMASA_DELAY_COMP_5MS /* FhG : issue #982 : 5ms and 20ms output different for OMASA */
		#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_975_JBM_USAN /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */
		#define FIX_699_FILE_READER_JBM_TSM /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */
		#define FIX_997_REMOVE_SPAR_DEC_UPMIXER /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

lib_dec/fd_cng_dec_fx.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -5447,9 +5447,7 @@ void generate_masking_noise_lb_dirac_fx(
		HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
		Word32 tdBuffer, / i/o: time-domain signal, if NULL no LB-CNA Q11*/
		const Word16 nCldfbTs, /* i : number of CLDFB slots that will be rendered Q0*/
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i : common spatial rendering parameters handle */
		#endif
		const Word16 cna_flag /* i : CNA flag for LB and HB Q0*/
		)
		{
		@@ -5501,12 +5499,10 @@ void generate_masking_noise_lb_dirac_fx(
		test();
		IF( cna_flag && tdBuffer != NULL )
		{
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		Word16 cur_subframe;
		Word16 cur_subframe_start_outfs;
		Word16 cur_subframe_start_cngfs;
		Word16 slot_size_cng;
		#endif

		WHILE( n_samples_out > 0 )
		{
		@@ -5580,7 +5576,6 @@ void generate_masking_noise_lb_dirac_fx(
		n_samples_start = add( 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 = shr( hFdCngCom->frameSize, 4 /* DEFAULT_JBM_CLDFB_TIMESLOTS */ );
		@@ -5602,7 +5597,6 @@ void generate_masking_noise_lb_dirac_fx(
		/* set everything else to zero */
		set_zero_fx( tdBuffer + cur_subframe_start_outfs + move_size, sub( subframe_size_outfs, move_size ) );
		}
		#endif
		}

		pop_wmops();

lib_dec/ivas_dirac_dec_fx.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -2871,18 +2871,10 @@ void ivas_dirac_dec_render_sf_fx(
		test();
		generate_masking_noise_dirac_ivas_fx( st->hFdCngDec->hFdCngCom,
		st_ivas->cldfbAnaDec[1],
		#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING
		&st_ivas->hTcBuffer->tc_fx[1][hSpatParamRendCom->num_freq_bands * hSpatParamRendCom->slots_rendered],
		#else
		st_ivas->hTcBuffer->tc_fx[1],
		#endif
		Cldfb_RealBuffer_fx[1][0],
		Cldfb_ImagBuffer_fx[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 ) \|\| EQ_32( st->core_brate, SID_2k40 ) ) ) && EQ_16( st->cng_type, FD_CNG ) && st->cng_sba_flag, Q_input, &q_temp_cldfb );
		Scale_sig32( Cldfb_RealBuffer_fx[1][0], CLDFB_NO_CHANNELS_MAX, sub( Q6, q_temp_cldfb ) ); // Q6