some core functions (910bf7c8) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -4720,7 +4720,7 @@ void updt_dec_common(
		const float synth / i : decoded synthesis */
		);

		void td_cng_dec_init_flt(
		void td_cng_dec_init(
		DEC_CORE_HANDLE st /* i/o: decoder state structure */
		);

		@@ -6866,7 +6866,7 @@ void D_ACELP_indexing_ivas(
		int16_t prm[],
		int16_t *BER_detect );

		void D_ACELP_decode_43bit_flt(
		void D_ACELP_decode_43bit(
		uint16_t idxs[],
		float code[],
		int16_t *pulsestrack );
		@@ -8155,7 +8155,7 @@ void coder_acelp_rf(
		float syn_rf / i/o: pointer to RF synthesis */
		);

		void decoder_acelp_flt(
		void decoder_acelp(
		Decoder_State st, / i/o: coder memory state */
		int16_t prm[], /* i : parameters */
		const float A[], /* i : coefficients NxAz[M+1] */
		@@ -9575,7 +9575,7 @@ void longshiftleft(
		const int16_t len /* i : length of vector a[] and d[] */
		);

		void open_decoder_LPD_flt(
		void open_decoder_LPD(
		Decoder_State st, / i/o: decoder state structure */
		const int32_t total_brate, /* i : total bitrate */
		const int32_t last_total_brate, /* i : last total bitrate */
		@@ -9615,7 +9615,7 @@ void reconfig_decoder_LPD_ivas(
		const int16_t L_frame_old /* i : frame length */
		);

		void mode_switch_decoder_LPD_flt(
		void mode_switch_decoder_LPD(
		Decoder_State st, / i/o: decoder state structure */
		const int16_t bwidth, /* i : audio bandwidth */
		const int32_t total_brate, /* i : total bitrate */
		@@ -9625,7 +9625,7 @@ void mode_switch_decoder_LPD_flt(
		const int16_t last_element_mode /* i : last element mode */
		);

		void dec_acelp_tcx_frame_flt(
		void dec_acelp_tcx_frame(
		Decoder_State st, / i/o: decoder state structure */
		int16_t concealWholeFrame, / i/o: concealment flag */
		float output, / o : synthesis */
		@@ -9637,7 +9637,7 @@ void dec_acelp_tcx_frame_flt(
		STEREO_CNG_DEC_HANDLE hStereoCng /* i : stereo CNG handle */
		);

		void decoder_LPD_flt(
		void decoder_LPD(
		Decoder_State st, / i/o: decoder memory state pointer */
		float signal_out[], /* o : signal with LPD delay (7 subfrs) */
		float signal_outFB[], /* o : synthesis @output_FS */

lib_com/prot_fx2.h

+23 −16

Original line number	Diff line number	Diff line
		@@ -5808,7 +5808,7 @@ void swb_CNG_dec_ivas_fx(
		const Word16 Qsyn /* i : Q value of ACELP core synthesis */
		);

		void td_cng_dec_init(
		void td_cng_dec_init_fx(
		DEC_CORE_HANDLE st /* i/o: decoder state structure */
		);

		@@ -6298,7 +6298,7 @@ void init_tcx_cfg_fx(
		Word16 Q_syn,
		Word16 bpf_noise_buf[] /* o : BPF error signal (at int_fs) */
		);
		void addBassPostFilterFx(
		void addBassPostFilter_fx(
		const Word16 *harm_timeIn_Fx,
		Word32 **rAnalysis_Fx,
		Word32 **iAnalysis_Fx,
		@@ -6811,7 +6811,7 @@ void GSC_dec_init_ivas_fx(
		const Word16 L_subfr /* i : subframe length */
		);
		#endif

		#ifdef IVAS_FLOAT_FIXED
		//dec4t64_fx.c
		void dec_acelp_4t64_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		@@ -6819,11 +6819,12 @@ void GSC_dec_init_ivas_fx(
		Word16 code[], /* o : algebraic (fixed) codebook excitation Q9*/
		const Word16 Opt_AMR_WB
		);
		#endif
		void D_ACELP_decode_43bit_fx(UWord16 idxs[], Word16 code[], Word16 *pulsestrack);

		void D_ACELP_decode_43bit(UWord16 idxs[], Word16 code[], Word16 *pulsestrack);

		#ifdef IVAS_FLOAT_FIXED
		//dec_acelp_fx.c
		void D_ACELP_indexing(
		void D_ACELP_indexing_fx(
		Word16 code[],
		PulseConfig config,
		Word16 num_tracks,
		@@ -6831,8 +6832,8 @@ void GSC_dec_init_ivas_fx(
		, Word16 *BER_detect
		);

		void fcb_pulse_track_joint_decode(UWord16 idxs, Word16 wordcnt, UWord32 index_n, Word16 *pulse_num, Word16 track_num);

		void fcb_pulse_track_joint_decode_fx(UWord16 idxs, Word16 wordcnt, UWord32 index_n, Word16 *pulse_num, Word16 track_num);
		#endif

		//dec2t32_fx.c
		void dec_acelp_2t32_fx(
		@@ -7792,6 +7793,7 @@ void generate_comfort_noise_dec_hf_ivas_fx(
		#endif
		);

		#ifdef IVAS_FLOAT_FIXED
		//dec_amr_wb_fx.c
		void decod_amr_wb_fx(
		Decoder_State st_fx, / i/o: decoder static memory */
		@@ -7803,6 +7805,7 @@ void generate_comfort_noise_dec_hf_ivas_fx(
		Word16 voice_factors_fx, / o : voicing factors */
		Word16 gain_buf / o : floating pitch gain for each subframe Q14 */
		);
		#endif

		//rst_dec_fx.c
		void CNG_reset_dec_fx(
		@@ -7839,7 +7842,7 @@ void generate_comfort_noise_dec_hf_ivas_fx(
		);

		//core_dec_init_fx.c
		void open_decoder_LPD(
		void open_decoder_LPD_fx(
		Decoder_State* st,
		const Word32 total_brate,
		#ifdef NEW_IVAS_OPEN_DEC
		@@ -8150,8 +8153,9 @@ void generate_comfort_noise_dec_hf_ivas_fx(
		Word16 ni_seed_fx / i/o: random seed */
		);

		#ifdef IVAS_FLOAT_FIXED
		//dec_acelp_tck_main_fx.c
		Word16 dec_acelp_tcx_frame(
		Word16 dec_acelp_tcx_frame_fx(
		Decoder_State* st, /* i/o: decoder state structure */
		Word16* concealWholeFrame, /* i/o: concealment flag */
		Word16* pcmBuf, /* o : synthesis */
		@@ -8164,9 +8168,10 @@ void generate_comfort_noise_dec_hf_ivas_fx(
		, STEREO_CNG_DEC_HANDLE hStereoCng /* i : stereo CNG handle */
		#endif
		);
		#endif

		//dec_LPD_fx.c
		void decoder_LPD(
		void decoder_LPD_fx(
		Word16 signal_out[], /* o : signal with LPD delay (7 subfrs) */
		Word16 signal_outFB[], /* o : synthesis @output_FS */
		Word16* total_nbbits, /* i/o: number of bits / decoded bits */
		@@ -8181,7 +8186,7 @@ void generate_comfort_noise_dec_hf_ivas_fx(
		);

		//core_dec_switch_fx.c
		void mode_switch_decoder_LPD(Decoder_State *st, Word16 bandwidth_in, Word32 bitrate, Word16 frame_size_index
		void mode_switch_decoder_LPD_fx(Decoder_State *st, Word16 bandwidth_in, Word32 bitrate, Word16 frame_size_index
		);

		#ifdef IVAS_FLOAT_FIXED
		@@ -8672,7 +8677,7 @@ Word16 RCcontextMapping_decode2_no_mem_s17_LCS_fx(
		);

		//core_dec_reconf_fx.c
		void reconfig_decoder_LPD(Decoder_State *st, Word16 bits_frame, Word16 bandwidth_mode, Word32 bitrate, Word16 L_frame_old);
		void reconfig_decoder_LPD_fx(Decoder_State *st, Word16 bits_frame, Word16 bandwidth_mode, Word32 bitrate, Word16 L_frame_old);
		#ifdef IVAS_FLOAT_FIXED
		void reconfig_decoder_LPD_ivas_fx(
		Decoder_State st, / i/o: decoder state structure */
		@@ -8935,8 +8940,9 @@ void con_acelp(
		, Word16 *bwe_exc
		);

		#ifdef IVAS_FLOAT_FIXED
		//dec_ace_fx.c
		void decoder_acelp(
		void decoder_acelp_fx(
		Decoder_State *st,
		Word16 prm[], /* i : parameters */
		Word16 A[], /* i : coefficients NxAz[M+1] */
		@@ -8950,6 +8956,7 @@ void decoder_acelp(
		const Word16 LSF_Q_prediction,/* i : LSF prediction mode */
		Word16 bwe_exc / out: excitation for SWB TBE */
		);
		#endif

		//d_gain2p.c
		void decode_acelp_gains(
		@@ -9090,7 +9097,7 @@ void configureCldfb_ivas_fx(
		HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i/o: filter bank handle */
		const Word32 sampling_rate /* i : sampling rate */
		);

		#ifdef IVAS_FLOAT_FIXED
		// dec4t64.c
		void dec_acelp_fast_fx(
		Decoder_State st, / i/o: decoder state structure */
		@@ -9098,7 +9105,7 @@ void dec_acelp_fast_fx(
		Word16 code[], /* o : algebraic (fixed) codebook excitation */
		const int16_t L_subfr /* i : subframe length */
		);

		#endif
		// codec_tcx_common.c
		void tcx5SpectrumInterleaving_fx(
		const Word16 tcx5Size,

lib_dec/acelp_core_dec_fx.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		#include "ivas_prot_fx.h"
		#include "ivas_cnst.h" /* Common constants */
		#include "cnst.h" /* Common constants */

		#ifdef IVAS_FLOAT_FIXED
		/==========================================================================/
		/* FUNCTION : void acelp_core_dec_fx () */
		/--------------------------------------------------------------------------/
		@@ -1640,7 +1640,7 @@ ivas_error acelp_core_dec_fx(
		i = CLDFB_NO_COL_MAX;
		move16();
		}
		addBassPostFilterFx( bpf_error_signal, realBuffer, imagBuffer, st_fx->cldfbBPF, workBuffer, negate(st_fx->Q_syn),
		addBassPostFilter_fx( bpf_error_signal, realBuffer, imagBuffer, st_fx->cldfbBPF, workBuffer, negate(st_fx->Q_syn),
		i, st_fx->cldfbAna->no_col, st_fx->cldfbAna->no_channels, &scaleFactor );

		/* set output mask for upsampling */
		@@ -1825,3 +1825,4 @@ ivas_error acelp_core_dec_fx(
		return IVAS_ERR_OK;

		}
		#endif

lib_dec/acelp_core_switch_dec_fx.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		#include "prot_fx1.h" /* Function prototypes */
		#include "prot_fx2.h" /* Function prototypes */
		#include "prot.h" /* Function prototypes */

		#ifdef IVAS_FLOAT_FIXED
		/---------------------------------------------------------------------
		* Local function prototypes
		---------------------------------------------------------------------/
		@@ -219,7 +219,7 @@ ivas_error acelp_core_switch_dec_fx(
		i = CLDFB_NO_COL_MAX_SWITCH;
		move16();
		}
		addBassPostFilterFx( bpf_error_signal, realBuffer, imagBuffer, st_fx->cldfbBPF, workBuffer, negate(st_fx->Q_syn),
		addBassPostFilter_fx( bpf_error_signal, realBuffer, imagBuffer, st_fx->cldfbBPF, workBuffer, negate(st_fx->Q_syn),
		i, CLDFB_NO_COL_MAX_SWITCH, st_fx->cldfbAna->no_channels, &scaleFactor );
		cldfb_restore_memory( st_fx->cldfbBPF );

		@@ -989,3 +989,4 @@ static void decod_gen_voic_core_switch_fx(

		return;
		}
		#endif

lib_dec/amr_wb_dec_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -873,7 +873,7 @@ ivas_error amr_wb_dec_fx(
		i = CLDFB_NO_COL_MAX;
		move16();
		}
		addBassPostFilterFx( bpf_error_signal, realBuffer, imagBuffer, st_fx->cldfbBPF, workBuffer, negate(st_fx->Q_syn),
		addBassPostFilter_fx( bpf_error_signal, realBuffer, imagBuffer, st_fx->cldfbBPF, workBuffer, negate(st_fx->Q_syn),
		i, st_fx->cldfbAna->no_col, st_fx->cldfbAna->no_channels, &scaleFactor );
		st_fx->Q_syn2 = st_fx->Q_syn;
		move16();