address reviewers' comments: tabs, rename *_FIXED -> *_FX (c7dee1c8) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+177 −177

Original line number	Diff line number	Diff line
		@@ -6214,7 +6214,7 @@ ivas_error ivas_core_enc_fx(
		Word16 fft_buff_fx[][2 * L_FFT], /* i : FFT buffer Qx*/
		const Word16 tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag Q0*/
		const Word16 ivas_format, /* i : IVAS format Q0*/
		const Word16 flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz Q0*/
		const Word16 flag_16k_smc /* i : flag to indicate if the OL SMC is run @16 kHz Q0*/
		);

		void ivas_renderer_select(

lib_dec/ivas_dirac_output_synthesis_cov_fx.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -647,11 +647,10 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(

		FOR( ch_idx = 0; ch_idx < nY; ch_idx++ )
		{
		int i;
		Word16 i;
		Word16 idx;
		Word64 temp_real, temp_imag;


		idx = ch_idx;
		temp_real = 0;
		temp_imag = 0;
		@@ -718,7 +717,6 @@ Word16 computeMixingMatrices_fx(
		Word32 svd_s_buffer_fx[MAX_OUTPUT_CHANNELS];
		Word16 svd_s_buffer_e[MAX_OUTPUT_CHANNELS];


		Word32 limit_fx;
		Word16 limit_e;

		@@ -786,7 +784,6 @@ Word16 computeMixingMatrices_fx(
		Cy_fx_e = Cy_e;
		move16();


		/-----------------------------------------------------------------
		* Decomposition of Cy
		-----------------------------------------------------------------/
		@@ -902,13 +899,11 @@ Word16 computeMixingMatrices_fx(
		}
		}


		limit_fx = 0;
		move32();
		limit_e = 0;
		move16();


		/-----------------------------------------------------------------
		* regularized Kx-1
		-----------------------------------------------------------------/
		@@ -932,12 +927,10 @@ Word16 computeMixingMatrices_fx(
		-----------------------------------------------------------------/

		/* Computing QCxQ' */

		matrix_product_mant_exp_fx( Q_fx, Q_e, lengthCy, lengthCx, 0, Cx_fx, Cx_fx_e, lengthCx, lengthCx, 0, Q_Cx_fx, &Q_Cx_e );

		matrix_product_diag_fx( Q_Cx_fx, Q_Cx_e, lengthCy, lengthCx, 0, Q_fx, Q_e, lengthCy, lengthCx, 1, Cy_hat_diag_fx, &Cy_hat_diag_e );


		Word16 com_e = sub( limit_e, Cy_hat_diag_e );
		FOR( i = 0; i < lengthCy; ++i )
		{
		@@ -975,13 +968,11 @@ Word16 computeMixingMatrices_fx(
		move16();
		}


		/-----------------------------------------------------------------
		* Formulate optimal P
		-----------------------------------------------------------------/

		/* Computing the input matrix Kx'Q'G_hat'Ky /

		Word16 mat_mult_buffer1_fx_e;

		Word16 mat_mult_buffer2_fx_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
		@@ -1044,8 +1035,6 @@ Word16 computeMixingMatrices_fx(
		-----------------------------------------------------------------/

		/* Compute Cy_tilde = MCxM' */


		Word16 Cx_e_arr[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
		set16_fx( Cx_e_arr, Cx_fx_e, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
		matrix_product_mant_exp( mixing_matrix_fx, mixing_matrix_fx_e, lengthCy, lengthCx, 0, Cx_fx, Cx_e_arr, lengthCx, lengthCx, 0, mat_mult_buffer1_fx, mat_mult_buffer1_fx_e1 );
		@@ -1215,6 +1204,7 @@ Word16 computeMixingMatrices_fx(
		return out;
		}


		/-------------------------------------------------------------------
		* computeMixingMatricesResidual()
		*

lib_enc/prot_fx_enc.h

+791 −794

Original line number	Diff line number	Diff line
		@@ -38,9 +38,6 @@
		#include "stat_enc.h"
		#include "stat_dec.h"
		#include "ivas_stat_dec.h"
		//#include "ivas_error.h"
		//#include "ivas_error_utils.h"
		//#include "complex_basop.h"
		#include "ivas_stat_enc.h"


		@@ -53,7 +50,7 @@ ivas_error acelp_core_enc_fx(
		const Word16 epsP_h_fx[M + 1], /* i : LP prediction errors Qx*/
		const Word16 epsP_l_fx[M + 1], /* i : LP prediction errors Qx*/
		Word16 lsp_new_fx[M], /* i : LSPs at the end of the frame Q15*/
		Word16 lsp_mid_fx[M], /* i : LSPs in the middle of the frame Q15*/
		Word16 lsp_mid_fx[M], /* i : LSPs in the middle of the frame 15*/
		Word16 vad_hover_flag_fx, /* i : VAD hangover flag Q0*/
		const Word16 attack_flag, /* i : attack flag (GSC or TC) Q0*/
		Word32 bwe_exc_extended_fx[], /* i/o: bandwidth extended excitation st->prev_Q_bwe_exc*/
		@@ -2571,10 +2568,10 @@ void coder_tcx_post_ivas_fx(
		Word16 Q_new );

		void enc_prm_fx(
		const Word16 coder_type, /* (i) : coding type */
		Word16 param[], /* (i) : parameters */
		Word16 param_lpc[], /* (i) : LPC parameters */
		Encoder_State st, / io: quantization Analysis values */
		const Word16 coder_type, /* i : coding type */
		Word16 param[], /* i : parameters */
		Word16 param_lpc[], /* i : LPC parameters */
		Encoder_State st, / i/o: quantization Analysis values */
		Word16 L_Frame,
		CONTEXT_HM_CONFIG hm_cfg[],
		Word16 *bits_param_lpc,
		@@ -2931,7 +2928,7 @@ Word16 lsf_msvq_ma_encprm_ivas_fx(
		const Word16 *bits_param_lpc,
		const Word16 no_indices );

		/*< out: \| number of bits written per frame /
		/* o: number of bits written per frame */
		Word16 IGFEncWriteBitstream_fx(
		const IGF_ENC_INSTANCE_HANDLE hInstance, /*< in: \| instance handle of IGF Encoder /
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		@@ -2949,15 +2946,15 @@ void ACcontextMapping_encode2_no_mem_s17_LC_fx(
		Word16 resQMaxBits, /* Q0 */
		CONTEXT_HM_CONFIG *hm_cfg );

		/*< out: Q0 \| total number of bits written /
		/* o: Q0 \| total number of bits written */
		Word16 IGFEncWriteConcatenatedBitstream_fx(
		const IGF_ENC_INSTANCE_HANDLE hInstance, /*< in: \| instance handle of IGF Encoder /
		const IGF_ENC_INSTANCE_HANDLE hInstance, /* i : instance handle of IGF Encoder */
		BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle */
		);

		/*< out: Q0 \| total number of bits written /
		Word16 IGFEncWriteConcatenatedBitstream_ivas_fx(
		const IGF_ENC_INSTANCE_HANDLE hInstance, /*< in: \| instance handle of IGF Encoder /
		const IGF_ENC_INSTANCE_HANDLE hInstance, /* i : instance handle of IGF Encoder */
		BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle */
		);

		@@ -3054,8 +3051,8 @@ void stereo_tcx_init_enc_fx(
		);

		void IGF_UpdateInfo(
		const IGF_ENC_INSTANCE_HANDLE hInstance, /*< in: \| instance handle of IGF Encoder /
		const Word16 igfGridIdx /*< in: Q0 \| IGF grid index /
		const IGF_ENC_INSTANCE_HANDLE hInstance, /* i : \| instance handle of IGF Encoder */
		const Word16 igfGridIdx /* i : Q0 \| IGF grid index */
		);

		/*< out: Q15\| crest factor /
		@@ -3429,7 +3426,7 @@ void snr_calc(
		const Word16 sacle_sbpower, /* i : the Scaling of sbpower */
		Word32 snr, / o : frequency domain SNR Q25*/
		Word32 tsnr, / o : time domain SNR Q25*/
		const Word32 frame_energy, /* i : current frame energy sacle_sbpower*/
		const Word32 frame_energy, /* i : current frame energy scale_sbpower*/
		const Word32 bwidth /* i : audio band width Q0*/
		);

		@@ -4585,7 +4582,7 @@ void pvq_encode_fx(
		Word32 L_xq, / o : quantized vector Q31 */
		const Word16 pulses, /* i : number of allocated pulses */
		const Word16 dim, /* i : Length of vector */
		const Word16 neg_gain /* i: - Gain use - negative gain in Q15 0 ..1 */
		const Word16 neg_gain /* i : Gain use - negative gain in Q15 0 ..1 */
		);

		void pvq_encode_ivas_fx(
		@@ -4597,7 +4594,7 @@ void pvq_encode_ivas_fx(
		Word32 L_xq, / o : quantized vector Q31 */
		const Word16 pulses, /* i : number of allocated pulses */
		const Word16 dim, /* i : Length of vector */
		const Word16 neg_gain /* i: - Gain use - negative gain in Q15 0 ..1 */
		const Word16 neg_gain /* i : Gain use - negative gain in Q15 0 ..1 */
		);

		void rc_enc_init_fx(

lib_dec/rom_dec_fx.c

+1 −1

File changed.

Contains only whitespace changes.

lib_rend/lib_rend_fx.c

+1 −1

File changed.

Contains only whitespace changes.

lib_com/ivas_cnst.h

+8 −8

File changed.

Contains only whitespace changes.