Merge branch 'Q_info_updates_enc_MSAN_fix' into 'main' (01446363) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+36 −0

Original line number	Diff line number	Diff line
		@@ -692,6 +692,28 @@ Word16 masa_sq_fx(
		const Word16 cb_sz /* i : codebook size */
		);

		void ivas_compute_spar_params_enc_fx(
		Word32 *cov_real_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
		Word16 *q_cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
		Word32 dm_fv_re_fx[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS],
		Word16 *q_dm_fv_re,
		const Word16 i_ts,
		Word32 ***mixer_mat_fx,
		Word16 *q_mixer_mat,
		const Word16 start_band,
		const Word16 end_band,
		const Word16 dtx_vad,
		const Word16 num_ch,
		const Word16 bands_bw,
		const Word16 active_w,
		const Word16 active_w_vlbr,
		ivas_spar_md_com_cfg *hSparCfg,
		ivas_spar_md_t *hSparMd,
		Word32 *pWscale,
		Word16 *q_Wscale,
		const Word16 from_dirac,
		const Word16 dyn_active_w_flag );

		void ivas_compute_spar_params_fx(
		Word32 *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
		Word16 q_cov_real,
		@@ -1998,6 +2020,20 @@ Word16 set_ACELP_flag_IVAS(
		const Word16 cng_type /* i : CNG type */
		);

		void ivas_calc_c_p_coeffs_enc_fx(
		ivas_spar_md_t *pSparMd,
		Word32 *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
		Word16 *q_cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
		const Word16 i_ts,
		Word32 ***mixer_mat,
		Word16 q_mixer_mat,
		const Word16 num_ch,
		const Word16 num_dmx,
		const Word16 band_idx,
		const Word16 dtx_vad,
		const Word16 compute_p_flag,
		const Word16 dyn_active_w_flag );

		void ivas_calc_c_p_coeffs_fx(
		ivas_spar_md_t *pSparMd,
		Word32 *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],

lib_com/ivas_spar_com.c

+2152 −343

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/prot_fx.h

+53 −53

Original line number	Diff line number	Diff line
		@@ -6930,18 +6930,18 @@ void dec_pit_exc_ivas_fx(

		#ifdef IVAS_FLOAT_FIXED
		// pit_dec_fx.c
		Word32 Mode2_pit_decode( /* o: floating pitch value */
		Word32 Mode2_pit_decode( /* o: pitch value Q16 */
		const Word16 coder_type, /* i: coding model */
		Word16 i_subfr, /* i: subframe index */
		Word16 L_subfr,
		Word16 *pt_indice, / i/o: quantization indices pointer */
		Word16 T0, / i/o: close loop integer pitch */
		Word16 T0_frac, / o: close loop fractional part of the pitch */
		Word16 T0_res, / i/o: pitch resolution */
		Word16 T0_min, / i/o: lower limit for close-loop search */
		Word16 T0_min_frac, / i/o: lower limit for close-loop search */
		Word16 T0_max, / i/o: higher limit for close-loop search */
		Word16 T0_max_frac, / i/o: higher limit for close-loop search */
		Word16 T0, / i/o: close loop integer pitch Q0 */
		Word16 T0_frac, / o: close loop fractional part of the pitch Q0 */
		Word16 T0_res, / i/o: pitch resolution Q0 */
		Word16 T0_min, / i/o: lower limit for close-loop search Q0 */
		Word16 T0_min_frac, / i/o: lower limit for close-loop search Q0 */
		Word16 T0_max, / i/o: higher limit for close-loop search Q0 */
		Word16 T0_max_frac, / i/o: higher limit for close-loop search Q0 */
		Word16 pit_min,
		Word16 pit_fr1,
		Word16 pit_fr1b,
		@@ -6950,9 +6950,9 @@ Word32 Mode2_pit_decode( /* o: floating pitch value
		Word16 pit_res_max );

		void Mode2_abs_pit_dec(
		Word16 T0, / o: integer pitch lag */
		Word16 T0_frac, / o: pitch fraction */
		Word16 T0_res, / o: pitch resolution */
		Word16 T0, / o: integer pitch lag Q0 */
		Word16 T0_frac, / o: pitch fraction Q0 */
		Word16 T0_res, / o: pitch resolution Q0 */
		Word16 *pt_indice, / i/o: pointer to Vector of Q indexes */
		Word16 pit_min,
		Word16 pit_fr1,
		@@ -6960,11 +6960,11 @@ void Mode2_abs_pit_dec(
		Word16 pit_res_max );

		void Mode2_delta_pit_dec(
		Word16 T0, / o: integer pitch lag */
		Word16 T0_frac, / o: pitch fraction */
		Word16 T0_res, /* i: pitch resolution */
		Word16 T0_min, / i: delta search min */
		Word16 T0_min_frac, / i: delta search min */
		Word16 T0, / o: integer pitch lag Q0 */
		Word16 T0_frac, / o: pitch fraction Q0 */
		Word16 T0_res, /* i: pitch resolution Q0 */
		Word16 T0_min, / i: delta search min Q0 */
		Word16 T0_min_frac, / i: delta search min Q0 */
		Word16 *pt_indice / i/o: pointer to Vector of Q indexes */
		);

		@@ -7002,7 +7002,7 @@ Word16 pit_decode_ivas_fx( /* o : floating p
		Word16 T0_max, / i/o: delta search max for sf 2 & 4 */
		const Word16 L_subfr, /* i : subframe length */
		const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag */
		const Word16 tdm_Pri_pitch_buf[] /* i : primary channel pitch buffer */
		const Word16 tdm_Pri_pitch_buf[] /* i : primary channel pitch buffer Q6 */
		);

		void pit_Q_dec_fx(
		@@ -7078,32 +7078,31 @@ void limit_T0_voiced(
		// inov_dec.c
		void inov_decode_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		const Word32 core_brate, /* i : core bitrate */
		const Word16 Opt_AMR_WB, /* i : flag indicating AMR-WB IO mode */
		const Word16 L_frame, /* i : length of the frame */
		const Word16 sharpFlag, /* i : formant sharpening flag */
		const Word16 i_subfr, /* i : subframe index */
		const Word32 core_brate, /* i : core bitrate Q0 */
		const Word16 Opt_AMR_WB, /* i : flag indicating AMR-WB IO mode Q0 */
		const Word16 L_frame, /* i : length of the frame Q0 */
		const Word16 sharpFlag, /* i : formant sharpening flag Q0 */
		const Word16 i_subfr, /* i : subframe index Q0 */
		const Word16 p_Aq, / i : LP filter coefficients Q12 */
		const Word16 tilt_code, /* i : tilt of the excitation of previous subframe Q15 */
		const Word16 pt_pitch, /* i : pointer to current subframe fractional pitch Q6*/
		Word16 code / o : algebraic excitation */
		,
		const Word16 L_subfr /* i : subframe length */
		Word16 code, / o : algebraic excitation Q12 */
		const Word16 L_subfr /* i : subframe length Q0 */
		);

		#ifdef IVAS_FLOAT_FIXED
		void inov_decode_ivas_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		const Word32 core_brate, /* i : core bitrate */
		const Word16 Opt_AMR_WB, /* i : flag indicating AMR-WB IO mode */
		const Word16 L_frame, /* i : length of the frame */
		const Word16 sharpFlag, /* i : formant sharpening flag */
		const Word16 i_subfr, /* i : subframe index */
		const Word32 core_brate, /* i : core bitrate Q0 */
		const Word16 Opt_AMR_WB, /* i : flag indicating AMR-WB IO mode Q0 */
		const Word16 L_frame, /* i : length of the frame Q0 */
		const Word16 sharpFlag, /* i : formant sharpening flag Q0 */
		const Word16 i_subfr, /* i : subframe index Q0 */
		const Word16 p_Aq, / i : LP filter coefficients Q12 */
		const Word16 tilt_code, /* i : tilt of the excitation of previous subframe Q15 */
		const Word16 pt_pitch, /* i : pointer to current subframe fractional pitch Q6*/
		Word16 code, / o : algebraic excitation */
		const Word16 L_subfr /* i : subframe length */
		Word16 code, / o : algebraic excitation Q12 */
		const Word16 L_subfr /* i : subframe length Q0 */
		);
		#endif
		#ifdef IVAS_FLOAT_FIXED
		@@ -7779,7 +7778,7 @@ void hvq_dec_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		const Word16 num_bits, /* i : Number of available bits */
		const Word32 core_brate, /* i : Core bit-rate */
		const Word16 ynrm, / i : Envelope coefficients */
		const Word16 ynrm, / i : Envelope coefficients Q0 */
		Word16 R, / i/o: Bit allocation/updated bit allocation */
		Word16 noise_level, / o : Noise level in Q15 */
		Word16 peak_idx, / o : Peak position vector */
		@@ -7976,19 +7975,21 @@ Word16 FEC_pos_dec_fx(
		// post_dec.h
		void post_decoder(
		Decoder_State *st,
		Word16 synth_buf[],
		Word16 pit_gain[],
		Word16 pitch[],
		Word16 signal_out[],
		Word16 *bpf_noise_buf );
		Word16 synth_buf[], /* Q0 */
		Word16 pit_gain[], /* Q14 */
		Word16 pitch[], /* Q0 */
		Word16 signal_out[], /* Q0 */
		Word16 bpf_noise_buf / Q0 */
		);

		void post_decoder_ivas_fx(
		Decoder_State *st,
		Word16 synth_buf[],
		Word16 pit_gain[],
		Word16 pitch[],
		Word16 signal_out[],
		Word16 *bpf_noise_buf );
		Word16 synth_buf[], // Q0
		Word16 pit_gain[], // Q14
		Word16 pitch[], // Q0
		Word16 signal_out[], // Q0
		Word16 *bpf_noise_buf // Q0
		);

		void cldfb_synth_set_bandsToZero(
		Decoder_State *st,
		@@ -8284,11 +8285,10 @@ void swb_hr_noise_fill_fx(
		// stat_noise_uv_dec_fx.c
		void stat_noise_uv_dec_fx(
		Decoder_State st_fx, / i/o: Decoder static memory */
		Word16 lsp_new, / i : end-frame LSP vector */
		Word16 lsp_mid, / i : mid-frame LSP vector */
		Word16 Aq, / o : A(z) quantized for the 4 subframes */
		Word16 exc2 / i/o: excitation buffer */
		,
		Word16 lsp_new, / i : end-frame LSP vector Q15 */
		Word16 lsp_mid, / i : mid-frame LSP vector Q15 */
		Word16 Aq, / o : A(z) quantized for the 4 subframes Q = 14 - norm_s(Aq[0]) */
		Word16 exc2, / i/o: excitation buffer, Q = st_fx->Q_exc */
		const Word16 uc_two_stage_flag /* i : flag indicating two-stage UC */
		);
		#endif

lib_com/rom_com.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -34696,7 +34696,7 @@ const float PowerCB_NB[64][2] =
		{ 0.95166016f, 1.0351563f, },
		};

		const Word16 PowerCB_WB_fx[128] =
		const Word16 PowerCB_WB_fx[128] = /* Q11 */
		{
		-3371, -1712,
		-170, 350,
		@@ -34764,7 +34764,7 @@ const Word16 PowerCB_WB_fx[128] =
		1238, 2446
		};

		const Word16 PowerCB_NB_fx[128] =
		const Word16 PowerCB_NB_fx[128] = /* Q11 */
		{
		-3349, -2784,
		-784, 385,

lib_com/rom_com.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -1401,8 +1401,8 @@ extern const Word16 AmpCB2_NB_fx[64 * ( NUM_ERB_NB - 13 )];

		extern const float PowerCB_WB[64][2];
		extern const float PowerCB_NB[64][2];
		extern const Word16 PowerCB_WB_fx[128];
		extern const Word16 PowerCB_NB_fx[128];
		extern const Word16 PowerCB_WB_fx[128]; // Q11
		extern const Word16 PowerCB_NB_fx[128]; // Q11
		extern const float sinc[8][12];
		extern const Word16 sinc_fx[8][12];