merge HARM_HQ_CORE2 into HARM_HQ_CORE (0c5f484c) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+3 −4

Original line number	Diff line number	Diff line
		@@ -1580,7 +1580,7 @@ ivas_error ivas_osba_render_sf_fx(
		Word32 p_output[] / o : rendered time signal */
		);

		#ifndef HARM_HQ_CORE2
		#ifndef HARM_HQ_CORE
		void ivas_hq_core_dec_fx(
		Decoder_State st_fx, / i/o: decoder state structure fx */
		Word16 synth[], /* o : output synthesis */
		@@ -1600,7 +1600,7 @@ Word16 ivas_hq_classifier_dec_fx(
		Word16 hqswb_clas / o : HQ class Q0 */
		);

		#ifndef HARM_HQ_CORE2
		#ifndef HARM_HQ_CORE
		void ivas_hq_hr_dec_fx(
		Decoder_State st_fx, / i/o: decoder state structure fx */
		Word32 t_audio_q, / o : transform-domain coefficients Q12 */
		@@ -1612,8 +1612,7 @@ void ivas_hq_hr_dec_fx(
		Word16 SWB_fenv, / o : SWB frequency envelopes Q1 */
		const Word16 core_switching_flag /* i : Core switching flag */
		);
		#endif
		#ifndef HARM_HQ_CORE

		void ivas_hq_configure_fx(
		const Word16 length, /* i : Frame length Q0 */
		const Word16 hqswb_clas, /* i : HQ SWB class Q0 */

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@
		#define FIX_2424_REMOVE_GAUSS_L2_ENC /* VA: basop issue 2424: Remove duplicated code in gauss_L2_ivas_fx() */
		#define HARM_HQ_CORE /* harmonize HQ core functions */
		#define HARM_HQ_CORE_KEEP_EVS_BE // hack to keep EVS BE
		#define HARM_HQ_CORE2


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

lib_com/prot_fx.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -7071,7 +7071,7 @@ void fd_bwe_dec_init(
		FD_BWE_DEC_HANDLE hBWE_FD /* i/o: FD BWE data handle */
		);

		#ifndef HARM_HQ_CORE2
		#ifndef HARM_HQ_CORE
		void hq_core_enc_ivas_fx(
		Encoder_State st, / i/o: encoder state structure */
		const Word16 audio_fx, / i : input audio signal Q0 */
		@@ -7087,7 +7087,7 @@ void hq_core_dec_fx(
		Word16 Q_synth, / o : Q value of synth */
		const Word16 output_frame, /* i : output frame length Q0*/
		const Word16 hq_core_type, /* i : HQ core type Q0*/
		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		const Word16 core_switching_flag, /* i : ACELP->HQ switching frame flag */
		Word32 output_32_fx / o : synthesis @internal_Fs, Q11 */
		#else

lib_dec/evs_dec_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -348,7 +348,7 @@ ivas_error evs_dec_fx(
		}
		ELSE
		{
		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		hq_core_dec_fx( st_fx, synth_fx, &Q_synth, output_frame, hq_core_type, core_switching_flag, NULL );
		#else
		hq_core_dec_fx( st_fx, synth_fx, &Q_synth, output_frame, hq_core_type, core_switching_flag );

lib_dec/hq_core_dec_fx.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		* HQ core decoder
		--------------------------------------------------------------------------/
		void hq_core_dec_fx(
		#ifndef HARM_HQ_CORE2
		#ifndef HARM_HQ_CORE
		Decoder_State st_fx, / i/o: decoder state structure fx */
		Word16 synth[], /* o : output synthesis Q_synth*/
		Word16 Q_synth, / o : Q value of synth */
		@@ -500,7 +500,7 @@ void ivas_hq_core_dec_fx(
		UWord16 lsb;
		Word16 L_spec;
		HQ_DEC_HANDLE hHQ_core;
		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		const Word16 sfmsize, sfm_start, *sfm_end;
		#endif
		TCX_DEC_HANDLE hTcxDec;
		@@ -582,7 +582,7 @@ void ivas_hq_core_dec_fx(
		}
		ELSE
		{
		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		core_switching_hq_prepare_dec_fx( st_fx, &num_bits, output_frame );

		/* During ACELP->HQ core switching, limit the HQ core bitrate to 48kbps */
		@@ -647,7 +647,7 @@ void ivas_hq_core_dec_fx(
		}
		}

		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		IF( EQ_16( output_frame, L_FRAME8k ) )
		{
		hq_configure_bfi_fx( &nb_sfm, &num_Sb, num_bands_p, &sfmsize, &sfm_start, &sfm_end );
		@@ -700,7 +700,7 @@ void ivas_hq_core_dec_fx(
		{
		IF( EQ_16( hq_core_type, LOW_RATE_HQ_CORE ) )
		{
		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		IF( EQ_16( st_fx->prev_bfi, 1 ) )
		{
		set32_fx( hHQ_core->last_ni_gain_fx, 0, BANDS_MAX );
		@@ -728,7 +728,7 @@ void ivas_hq_core_dec_fx(
		ELSE
		{
		/* HQ high rate decoder */
		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		#ifdef HARM_HQ_CORE_KEEP_EVS_BE
		IF( st_fx->element_mode == EVS_MONO )
		{
		@@ -959,7 +959,7 @@ void ivas_hq_core_dec_fx(
		move16();
		}

		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		IF( EQ_16( output_frame, L_FRAME8k ) )
		{
		test();
		@@ -1003,7 +1003,7 @@ void ivas_hq_core_dec_fx(
		IF( EQ_16( st_fx->bfi, 1 ) && GE_16( output_frame, L_FRAME16k ) )
		{
		/* PHASE_ECU active */
		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		IF( st_fx->element_mode > EVS_MONO )
		#endif
		{
		@@ -1038,7 +1038,7 @@ void ivas_hq_core_dec_fx(
		}
		}

		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		IF( st_fx->element_mode == EVS_MONO )
		{
		test();
		@@ -1091,7 +1091,7 @@ void ivas_hq_core_dec_fx(
		move16();
		}

		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		IF( EQ_16( output_frame, L_FRAME8k ) )
		{
		Copy32( wtda_audio, st_fx->hHQ_nbfec->oldIMDCTout_fx, L_FRAME8k / 2 ); /* q_wtda */
		@@ -1123,7 +1123,7 @@ void ivas_hq_core_dec_fx(
		set16_fx( &st_fx->mem_pitch_gain[2], 0, nbsubfr );
		}

		#ifdef HARM_HQ_CORE2
		#ifdef HARM_HQ_CORE
		IF( output_32_fx != NULL )
		#endif
		{