Merge branch 'main' into basop-2457 (db6736ab) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -2962,6 +2962,10 @@ static ivas_error decodeVoIP(

		phIvasDec = hIvasDec; / Update for main()' s free */
		ivasRtp.restartNeeded = false;
		#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		bitstreamReadDone = false;
		parametersAvailableForEditing = false;
		#endif
		}

		/* reference vector */
		@@ -3211,6 +3215,10 @@ static ivas_error decodeVoIP(
		}

		phIvasDec = hIvasDec; / Update for main()' s free */
		#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		bitstreamReadDone = false;
		parametersAvailableForEditing = false;
		#endif
		}

		/* Placeholder for memory reallocation */
		@@ -3974,12 +3982,13 @@ static ivas_error restartDecoder(
		}
		}

		#ifndef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#endif
		/* ISAR frame size is set from command line, not renderer config file.
		* This will be ignored if output format is not split rendering. */
		if ( renderConfig != NULL )

lib_com/options.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -99,9 +99,10 @@
		#define FIX_BASOP_2470_POWER_SPEC_E_INIT /* FhG: make sure powerSpec_e is always initialized in core_signal_analysis_high_bitrate_fx() */
		#define FIX_BASOP_2475_ASSERT_IN_MASA2_REND_TO_MONO /* Nokia: basop issue 2475: Fix MASA2 to MONO rendering within IVAS_rend */
		#define FIX_2346_DUPLICATED_IGF_FUNCTIONS /* FhG: basop issue 2346: Review potentially duplicated IGF functions */
		#define FIX_1525_UNINIT_FORMAT_SWITCHING_DEC /* VA: float issue 1525: fix reading of uninitialized memory in format switching at the decoder */
		#define FIX_BASOP_2457_HARM_GEN /* FhG: harmonization of function generate_comfort_noise_dec_hf_ivas_fx()*/

		#define HARMONIZE_2446_CON_TCX_FX /* FhG: basop issue: 2446 harmonization of function con_tcx_fx() */

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

		/* #################### Start NON-BE switches ############################ */
		@@ -118,6 +119,7 @@
		#define FIX_BASOP_2472_IGF_SP_AUD_DEC_CHAN /* FhG: always use channel 1 for sp_aud_decision0[] being passed to ProcessIGF_ivas_fx() */
		#define FIX_BASOP_REMOVE_SYNTH2_FX /* FhG: Replace 32bit olapBufferSynth2_fx with 16bit olapBufferSynth2 buffer */
		#define FIX_FLOAT_1528_5MS_REND_ISM_META_DELAY_COMPENSATION /* Nokia: float issue 1528: Fixes incorrect compensation for ISM metadata delay in 5ms TD rendering */
		#define FIX_2462_PARCOR_FIX /* VA: issue 2462: Fix bug in calculating parcor coefficient in Calc_rc0_h() */

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

lib_com/swb_tbe_com_fx.c

+15 −0

Original line number	Diff line number	Diff line
		@@ -657,7 +657,12 @@ void Calc_rc0_h(
		#ifdef HARMONIZE_TBE3
		IF( element_mode != EVS_MONO && enc_dec == ENC )
		{
		#ifdef FIX_2462_PARCOR_FIX
		tmp2 = shr( h[0], 2 );
		L_acc = L_mult( tmp2, tmp2 );
		#else
		L_acc = L_mult( h[0], h[0] ); // TBV: shouldn't it be "shr( h[0], 2 )" ?
		#endif
		FOR( i = 1; i < LONG_H_ST; i++ )
		{
		tmp2 = shr( h[i], 2 );
		@@ -669,9 +674,15 @@ void Calc_rc0_h(

		ptrs = h;

		#ifdef FIX_2462_PARCOR_FIX
		temp = shr( *ptrs++, 2 );
		move16();
		L_acc = L_mac( L_acc, temp, shr( *ptrs, 2 ) );
		#else
		temp = *ptrs++;
		move16();
		L_acc = L_mult( temp, *ptrs );
		#endif
		FOR( i = 1; i < LONG_H_ST - 1; i++ )
		{
		temp = shr( *ptrs++, 2 );
		@@ -703,7 +714,11 @@ void Calc_rc0_h(
		L_acc = L_mac( L_acc, temp, *ptrs );
		}
		}
		#ifdef FIX_2462_PARCOR_FIX
		L_acc = L_shl_sat( L_acc, sh_acf );
		#else
		L_acc = L_shl( L_acc, sh_acf );
		#endif
		acf1 = extract_h( L_acc );

		/* Compute 1st parcor */