Merge branch 'main' into basop-2433-arithmetic-overflow-in-qmetadata-encoder (acbf95da) · Commits · SA4 / Audio / IVAS BASOP

lib_com/fd_cng_com_fx.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -169,7 +169,9 @@ void initFdCngCom(
		#ifndef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING
		set32_fx( hFdCngCom->olapBufferSynth_fx, 0, FFTLEN );
		#endif
		#ifndef FIX_BASOP_REMOVE_SYNTH2_FX
		set32_fx( hFdCngCom->olapBufferSynth2_fx, 0, FFTLEN );
		#endif
		set32_fx( hFdCngCom->exc_cng_32fx, 0, L_FRAME16k );
		set16_fx( hFdCngCom->exc_cng, 0, L_FRAME16k );

lib_com/fft_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2791,6 +2791,7 @@ void DoRTFTn_fx_ivas(
		return;
		}

		#ifndef HQ_ALIGN_DUPLICATED_CODE
		void fft3_fx_ivas(
		const Word32 X[], // Qx
		Word32 Y[], // Qx
		@@ -3287,7 +3288,7 @@ void ifft3_fx_ivas(

		return;
		}

		#endif

		static void rfft_post(
		const Word16 *sine_table, // Q15

lib_com/hq_tools_fx.c

+24 −0

Original line number	Diff line number	Diff line
		@@ -2640,7 +2640,22 @@ void enforce_zero_for_min_envelope_fx(
		return;
		}

		#ifdef HQ_ALIGN_DUPLICATED_CODE
		/--------------------------------------------------------------------------
		* apply_envelope()
		*
		* Apply spectral envelope without envelope adjustments and noisefill
		--------------------------------------------------------------------------/

		void apply_envelope_enc_fx(
		const Word16 coeff, / i : Normalized spectrum Q12 */
		const Word16 norm, / i : Envelope Q0 */
		const Word16 num_sfm, /* i : Total number of bands Q0 */
		const Word16 sfm_start, / i : Sub band start indices Q0 */
		const Word16 sfm_end, / i : Sub band end indices Q0 */
		Word32 coeff_out / o : scaled spectrum Q12 */
		)
		#else
		/--------------------------------------------------------------------------
		* apply_envelope()
		*
		@@ -2655,6 +2670,7 @@ void apply_envelope_enc_ivas_fx(
		const Word16 sfm_end, / i : Sub band end indices Q0 */
		Word32 coeff_out / o : coded/noisefilled spectrum Q12 */
		)
		#endif
		{
		Word16 i;
		Word16 sfm;
		@@ -2680,11 +2696,19 @@ void apply_envelope_enc_ivas_fx(
		}


		#ifdef HQ_ALIGN_DUPLICATED_CODE
		/--------------------------------------------------------------------------
		* apply_envelope_fx()
		*
		* Apply spectral envelope with envelope adjustments
		--------------------------------------------------------------------------/
		#else
		/--------------------------------------------------------------------------
		* apply_envelope()
		*
		* Apply spectral envelope with envelope adjustments
		--------------------------------------------------------------------------/
		#endif

		void apply_envelope_fx(
		const Word16 coeff, / i/o: Coded/noisefilled normalized spectrum Q12 */

lib_com/ivas_prot_fx.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -1879,6 +1879,7 @@ void TonalMDCTConceal_Detect_ivas_fx(
		);


		#ifndef HARMONIZE_FUNC
		void ivas_DetectTonalComponents_fx(
		Word16 indexOfTonalPeak[],
		Word16 lowerIndex[],
		@@ -1899,7 +1900,7 @@ void ivas_DetectTonalComponents_fx(
		const PsychoacousticParameters *psychParamsCurrent,
		Word16 element_mode
		);

		#endif
		ivas_error stereo_dft_dec_create_fx(
		STEREO_DFT_DEC_DATA_HANDLE hStereoDft, / i/o: decoder DFT stereo handle */
		const Word32 element_brate, /* i : element bitrate */
		@@ -2721,14 +2722,15 @@ void ivas_param_mc_metadata_open_fx(
		HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* o : handle for the Parametric MC parameter coding state */
		);

		#ifndef HQ_ALIGN_DUPLICATED_CODE
		Word16 mdct_classifier_ivas_fx(
		Encoder_State st, / i/o: Encoder state variable */
		const Word16 fft_buff, / i : FFT spectrum from fft_rel */
		const Word32 enerBuffer[], /* i : energy buffer */
		Word16 enerBuffer_exp, /* i: enenrgy buffer exponent */
		Word16 enerBuffer_exp, /* i : energy buffer exponent */
		const Word32 brate /* i : current brate, IVAS: nominal bitrate, EVS: st->total_brate */
		);

		#endif

		/----------------------------------------------------------------------------------
		* Range Coder prototypes

lib_com/options.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -91,7 +91,12 @@
		#define HARM_2456_APPLY_SCALE /* FhG basop issue 2456: Harmonize apply_scale_ind(), apply_scale_ivas_fx() */
		#define HARM_2454_TCX_RES_Q_SPEC /* FhG: harmonization of tcx_res_Q_spec_fx() and tcx_res_Q_spec_ivas_fx() */
		#define FIX_FLOAT_1535_ARI_RES_Q_CLEANUP /* FhG: remove dead code from tcx_ari_res_Q_spec() */
		#define HQ_ALIGN_DUPLICATED_CODE /* Eri: Align duplicated code */
		#define FIX_2467_RENAME_GSC_FUNCTION /* VA: basop issue 2467: Removal of unused function/table and renaming of _ivas_fx versions to default ones. */
		#define HARMONIZE_FUNC /* VA: basop issue 2460: Remove duplicated code: various functions */
		#define FIX_FLOAT_1536_INIT_NO_PARAM_LPC /* FhG: make sure no_param_lpc is initialized in core_encode_twodiv() */
		#define FIX_BASOP_2871_INIT_Q_SYN_FACTOR /* FhG: make sure, st_fx->Q_syn_factor gets initialized during decoder startup */
		#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_2433_ARITH_OVERFLOW_IN_QMETA_ENC /* Nokia: Fix to convert non-converted binary operations */
		/* #################### End BE switches ################################## */

		@@ -103,6 +108,12 @@
		#define FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING /* FhG: basop issue 2262: correct buffer update for FD-CNG buffer in case of BR switching */
		#define FIX_2440_AGC_PRESCALING /* FhG: basop issue 2440: Fix loop bounds when scaling p_output_fx before ivas_spar_dec_agc_pca_fx() */
		#define FIX_2471_REMOVE_POSSIBLE_OVRF /* VA: basop issue 2471: correcting undesired overflow */
		#define FIX_2465_Q_BWE_EXC /* VA: basop issue 2465: fix calculation of Q_bwe_exc in SWB TBE encoder */
		#define FIX_2436_CLDFBANAHANDLE_ADRESS /* FhG: cldfb handle pointer were handed over in faulty manner*/
		#define FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR /* FhG: basop issue 2436 (related to basop 2283): fix garbage output for >1 object OMASA with extrend as ISAR prerenderer */
		#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 */

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

		/* ################## End MAINTENANCE switches ######################### */