Merge branch 'basop-2342-remove-duplicated-code-core-coder-common-update-functions' into 'main' (14195602) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@
		#define REMOVE_UNUSED_CODE_IVAS_DEC /* VA: remove unused code in ivas_jbm_dec_tc_fx() */
		#define FIX_2294_CLANG_18_WARNINGS_ENC /* VA: Fix some encoder clang-18 warnings, desc. in 2294 */
		#define REMOVE_CAM_FROM_IVAS /* VA: basop issue 210: remove obsoelte CAM code from IVAS */
		#define HARM_CORECODER_UPDT /* VA: basop issue 2342: Remove duplicated code in core-coder common update functions */

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

lib_com/prot_fx.h

+15 −6

Original line number	Diff line number	Diff line
		@@ -5318,6 +5318,7 @@ Word32 sign_l(
		const Word32 x /* i : input value of x */
		);

		#ifndef HARM_CORECODER_UPDT
		void ivas_updt_dec_common_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		Word16 hq_core_type_fx, /* i : HQ core type */
		@@ -5325,7 +5326,7 @@ void ivas_updt_dec_common_fx(
		const Word32 synth, / i : decoded synthesis */
		const Word16 Qpostd /* i : Synthesis Q value */
		);

		#endif
		/* Random generator with Gaussian distribution with mean 0 and std 1 */
		Word32 rand_gauss(
		Word16 *seed );
		@@ -7762,16 +7763,23 @@ void updt_IO_switch_dec_fx(
		Decoder_State st_fx / o : Decoder static variables structure */
		);

		#ifndef HARM_CORECODER_UPDT
		void updt_bw_switching_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		const Word16 synth, / i : synthesis signal Qpost */
		const Word16 Qpost );

		const Word16 Qpost /* i : Synthesis Q value */
		);
		#endif
		void updt_dec_common_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		Word16 hq_core_type_fx, /* i : HQ core type */
		const Word16 concealWholeFrameTmp, /* i : concealWholeFrameTmp flag */
		#ifdef HARM_CORECODER_UPDT
		const Word16 synth16, / i : decoded synthesis Qpostd */
		const Word32 synth, / i : decoded synthesis Qpostd */
		#else
		const Word16 synth, / i : decoded synthesis */
		#endif
		const Word16 Qpostd /* i : Synthesis Q value */
		);

		@@ -10430,6 +10438,7 @@ void swb_pre_proc_ivas_fx(
		CPE_ENC_HANDLE hCPE /* i/o: CPE encoder structure */
		);

		#ifndef HARM_CORECODER_UPDT
		void core_encode_update_ivas_fx(
		Encoder_State st / i/o: Encoder state structure */
		);
		@@ -10438,7 +10447,7 @@ void updt_enc_common_ivas_fx(
		Encoder_State st, / i/o: encoder state structure */
		const Word16 Q_new /* i : CUrrent frame scaling */
		);

		#endif
		/* o : Q(2x - 31 - gb) */
		Word32 sum2_f_32_fx(
		const Word32 vec, / i : input vector, Qx */

lib_dec/amr_wb_dec_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -993,7 +993,11 @@ ivas_error amr_wb_dec_fx(
		st_fx->last_flag_cna = flag_cna;
		move16();

		#ifdef HARM_CORECODER_UPDT
		updt_dec_common_fx( st_fx, -1, -1, NULL, NULL, 0 );
		#else
		updt_dec_common_fx( st_fx, -1, -1, NULL, 0 );
		#endif

		/----------------------------------------------------------------
		* Overlap of ACELP synthesis with old MDCT memory

lib_dec/evs_dec_fx.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1374,7 +1374,12 @@ ivas_error evs_dec_fx(
		st_fx->bfi = 1;
		move16();
		}

		#ifdef HARM_CORECODER_UPDT
		updt_dec_common_fx( st_fx, -1, concealWholeFrameTmp, output_sp, NULL, Qpostd );
		#else
		updt_dec_common_fx( st_fx, -1, concealWholeFrameTmp, output_sp, Qpostd );
		#endif
		}
		ELSE
		{
		@@ -1383,7 +1388,12 @@ ivas_error evs_dec_fx(
		st_fx->bfi = 0;
		move16();
		}

		#ifdef HARM_CORECODER_UPDT
		updt_dec_common_fx( st_fx, hq_core_type, concealWholeFrameTmp, output_sp, NULL, Qpostd );
		#else
		updt_dec_common_fx( st_fx, hq_core_type, concealWholeFrameTmp, output_sp, Qpostd );
		#endif
		}

		pop_wmops();

lib_dec/ivas_core_dec_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1488,7 +1488,11 @@ ivas_error ivas_core_dec_fx(
		save_synthesis_hq_fec_fx( st, NULL, output_fx_loc, output_frame, 0, hCPE );

		/* Updates */
		#ifdef HARM_CORECODER_UPDT
		updt_dec_common_fx( st, NORMAL_HQ_CORE, -1, NULL, output_32_fx[n], Q11 );
		#else
		ivas_updt_dec_common_fx( st, NORMAL_HQ_CORE, -1, output_32_fx[n], Q11 );
		#endif

		Scale_sig( st->delay_buf_out_fx, NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ), negate( exp_max ) ); // Q0