HARM_HQ_CORE (76c4eb6a) · Commits · SA4 / Audio / IVAS BASOP

lib_com/fine_gain_bits_fx.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		*
		* HQ core encoder
		--------------------------------------------------------------------------/

		static void subband_gain_bits_fx(
		const Word16 Rk, / i : bit allocation per band Q3 */
		const Word16 N, /* i : number of bands */
		@@ -101,7 +102,7 @@ Word16 assign_gain_bits_fx( /* o : Number of assigned

		return gain_bits_tot;
		}

		#ifndef HARM_HQ_CORE
		static void ivas_subband_gain_bits_fx(
		const Word16 Rk, / i : bit allocation per band Q3 */
		const Word16 N, /* i : number of bands */
		@@ -183,3 +184,4 @@ Word16 ivas_assign_gain_bits_fx( /* o : Number of ass

		return gain_bits_tot;
		}
		#endif

lib_com/hq_conf_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		*
		* Configuration routine for HQ mode
		--------------------------------------------------------------------------/

		#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 */
		@@ -539,6 +539,7 @@ void hq_configure_evs_fx(

		return;
		}
		#endif

		void hq_configure_fx(
		const Word16 length, /* i : Frame length Q0 */

lib_com/ivas_prot_fx.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -1611,6 +1611,7 @@ void ivas_hq_hr_dec_fx(
		const Word16 core_switching_flag /* i : Core switching flag */
		);

		#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 */
		@@ -1625,7 +1626,7 @@ void ivas_hq_configure_fx(
		Word16 sfm_start, / o : Subband start coefficients Q0 */
		Word16 sfm_end / o : Subband end coefficients Q0 */
		);

		#endif
		void ivas_hq_bit_allocation_fx(
		const Word32 core_brate, /* i : Core bit-rate Q0 */
		const Word16 length, /* i : Frame length Q0 */
		@@ -1642,6 +1643,7 @@ void ivas_hq_bit_allocation_fx(
		const Word16 num_env_bands /* i : Number sub bands to be encoded for HQ_GEN Q0 */
		);

		#ifndef HARM_HQ_CORE
		/* o : Number of assigned gain bits */
		Word16 ivas_assign_gain_bits_fx(
		const Word16 core, /* i : HQ core */
		@@ -1651,7 +1653,7 @@ Word16 ivas_assign_gain_bits_fx(
		Word16 gain_bits_array, / o : Assigned gain bits */
		Word16 Rcalc / o : Bit budget for shape quantizer Q3 */
		);

		#endif
		void ivas_fine_gain_pred_fx(
		const Word16 sfm_start, / i : Sub band start indices */
		const Word16 sfm_end, / i : Sub band end indices */
		@@ -1683,6 +1685,7 @@ Word16 ivas_pvq_core_dec_fx(
		const Word16 core
		);

		#ifndef HARM_HQ_CORE
		void ivas_hq_ecu_fx(
		const Word16 prevsynth, / i : buffer of previously synthesized signal */
		Word32 ecu_rec, / o : reconstructed frame in tda domain */
		@@ -1705,7 +1708,7 @@ void ivas_hq_ecu_fx(
		const Word16 output_frame, /* i : frame length */
		Decoder_State st_fx / i/o: decoder state structure */
		);

		#endif
		void ivas_fill_spectrum_fx(
		Word16 coeff, / i/o: normalized MLT spectrum / nf spectrum Q12 */
		Word32 L_coeff_out, / i/o: Noisefilled MLT spectrum Q12 */

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@
		#define HARM_2336_DOTP /* VA: basop 2336; Harmonisation of some dot_product function + some BE optimisation */
		#define FIX_2431_AVOID_CALLOC /* VA: basp issue 2431: avoid use of calloc() */
		#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 */

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

lib_com/prot_fx.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -1383,7 +1383,6 @@ Word16 rescale_mem(
		Word16 i_subfr /* i : subframe number */
		);

		// hq_conf.c
		void hq_configure_fx(
		const Word16 length, /* i : Frame length Q0 */
		const Word16 hqswb_clas, /* i : HQ SWB class Q0 */
		@@ -1399,6 +1398,7 @@ void hq_configure_fx(
		Word16 sfm_end / o : Subband end coefficients Q0 */
		);

		#ifndef HARM_HQ_CORE
		void hq_configure_evs_fx(
		const Word16 length, /* i : Frame length Q0 */
		const Word16 hqswb_clas, /* i : HQ SWB class Q0 */
		@@ -1413,8 +1413,7 @@ void hq_configure_evs_fx(
		Word16 sfm_start, / o : Subband start coefficients Q0 */
		Word16 sfm_end / o : Subband end coefficients Q0 */
		);

		// hp50.c
		#endif
		void hp20(
		Word16 signal[], /* i/o: signal to filter any */
		const Word16 stride, /* i : stride to be applied accessing signal */