Merge branch 'main' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into... (04e71a6d) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci/variables.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,8 @@ variables:
		RUNNER_TAG: "ivas-basop-linux"
		LOGS_BACKUP_SOURCE_DIR: ""
		LOGS_BACKUP_TARGET_DIR: ""
		# set this to true to skip the external HRTF testcases in pytest calls
		DISABLE_HRTF: "false"
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
		value: 'default'

apps/renderer.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1278,6 +1278,9 @@ int main(
		{
		masaIds[i] = 0u;
		}
		#ifdef NONBE_1377_REND_DIRATT_CONF
		IVAS_REND_SetObjectIDs( hIvasRend );
		#endif

		for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )
		{

lib_com/common_api_types.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -343,7 +343,6 @@ typedef struct _IVAS_RENDER_CONFIG
		Word16 directivity_fx[IVAS_MAX_NUM_OBJECTS * 3]; // has the following q-factor pattern: {6, 6, 15, 6, 6, 15, 6, 6, 15, 6, 6, 15}
		float distAtt[3];
		Word32 distAtt_fx[3]; /* {Q27, Q30, Q30} */

		} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;

		typedef struct

lib_com/options.h

+12 −4

Original line number	Diff line number	Diff line
		@@ -71,6 +71,10 @@
		#define BASOP_NOGLOB_DECLARE_LOCAL
		#endif

		#ifdef _MSC_VER
		#define SOCKET_INTERFACE_FOR_POSE_AND_AUDIO /* Philips: Socket interface for head rotation - Windows only*/
		#endif

		/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

		#define FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 2166 */
		@@ -90,11 +94,12 @@
		#define FIX_1819_EIGENVALUE_ERROR /* FhG: Workaround for zero eigenvalue: replace with epsilon if det != 0*/
		#define FIX_1990_SANITIZER_IN_REVERB_LOAD /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure. */
		#define FIX_1995_REVERB_INIT /* VA/Nokia: issue 1995: Fix use-of-uninitialized-value in ivas_binaural_reverb_init() */
		#define FIX_1996_MASKING_NOISE /* Dlb: Heavy precision loss in ola buffers causing discontinuity*/
		#define FIX1998_APA_EXEC_SCALING /* FhG: fix scaling of apa_exec_ivas_fx(); avoid continuously worse scaling with previous data */
		#define FIX2007_BASSPSFILTER_OVERFLOW /* FhG: use saturing operator, to avoid overflow in bass_psfilter_fx() */
		#define FIX_ISSUE_2004_LPC_SHB_SAT /* Dolby: Issue 2004: prevent saturation of the LPC SHB filter */

		#ifdef _MSC_VER
		#define SOCKET_INTERFACE_FOR_POSE_AND_AUDIO /* Philips: Socket interface for head rotation - Windows only*/
		#endif

		#define FIX_2009_HIGH_NOISE_FLOOR_FOR_FX_DEC /* FhG: Corrected the q_input in the input of generate_masking_noise_dirac_ivas_fx() */
		/* #################### Start BASOP porting switches ############################ */

		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
		@@ -106,6 +111,9 @@
		#define FIX_1984_SAT_IN_PSYCHAD /* VA: Issue 1984: proposal to fix an assert */
		#define NONBE_FIX_1261_MASA_EXT_META_JBM /* Nokia: issue #1261: MASA metadata EXT output delay buffer init in JBM */
		#define NONBE_FIX_1143_MASA_BRSW /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */
		#define NONBE_FIX_1220_OMASA_JBM_EXT_USAN /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */
		#define NONBE_FIX_1376_MDCT_CONCEALMENT /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */
		#define NONBE_1377_REND_DIRATT_CONF /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */

		/* #################### End BASOP porting switches ############################ */

lib_dec/acelp_core_dec_fx.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -1637,12 +1637,16 @@ ivas_error acelp_core_dec_fx(
		IF( NE_16( st->element_mode, last_element_mode ) )
		{
		set16_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, st->hFdCngDec->hFdCngCom->fftlen );
		#ifdef FIX_1996_MASKING_NOISE
		set32_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, 0, st->hFdCngDec->hFdCngCom->fftlen );
		#endif
		}

		Word32 psyn_32_fx[L_FRAME16k];
		Copy_Scale_sig_16_32_no_sat( psyn_fx, psyn_32_fx, st->hFdCngDec->hFdCngCom->frameSize, sub( Q6, st->Q_syn ) ); // Q6
		#ifndef FIX_1996_MASKING_NOISE
		Copy_Scale_sig_16_32_no_sat( st->hFdCngDec->hFdCngCom->olapBufferSynth2, st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, shl( st->hFdCngDec->hFdCngCom->frameSize, 1 ), Q15 ); // Q15

		#endif
		generate_masking_noise_ivas_fx( psyn_32_fx, &exp, st->hFdCngDec->hFdCngCom, st->hFdCngDec->hFdCngCom->frameSize, 0, 0, 0, st->element_mode, hStereoCng, nchan_out );

		Copy_Scale_sig_32_16( psyn_32_fx, psyn_fx, st->hFdCngDec->hFdCngCom->frameSize, sub( st->Q_syn, exp ) ); // Q = st->Q_syn
		@@ -1734,6 +1738,9 @@ ivas_error acelp_core_dec_fx(
		IF( st->idchan == 0 )
		{
		set16_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, st->hFdCngDec->hFdCngCom->fftlen );
		#ifdef FIX_1996_MASKING_NOISE
		set32_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, 0, st->hFdCngDec->hFdCngCom->fftlen );
		#endif
		}
		IF( hStereoCng != NULL && ( st->idchan == 0 ) )
		{