port MR (22469e85) · Commits · SA4 / Audio / IVAS BASOP

lib_com/bitstream.c

+1307 −102

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/bitstream_fx.c

deleted100644 → 0

+0 −1316

File deleted.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_arith_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ void ivas_ari_done_decoding_14bits_ext_1_lfe(
		Decoder_State *st,
		const Word16 extra_bits_read )
		{
		get_next_indice_tmp( st, negate( sub( cbitsnew - 2, extra_bits_read ) ) );
		get_next_indice_tmp_fx( st, negate( sub( cbitsnew - 2, extra_bits_read ) ) );

		return;
		}

lib_com/prot_fx.h

+27 −30

Original line number	Diff line number	Diff line
		@@ -1248,11 +1248,6 @@ UWord16 get_next_indice_fx(
		Word16 nb_bits /* i : number of bits that were used to quantize the indice */
		);

		Word16 rate2EVSmode(
		const Word32 brate, /* i : bitrate */
		Word16 is_amr_wb / o : (flag) does the bitrate belong to AMR-WB? Can be NULL */
		);

		/* o : value of the indice */
		UWord16 get_next_indice_1_fx(
		Decoder_State st_fx / i/o: decoder state structure */
		@@ -1274,11 +1269,23 @@ void reset_indices_enc_fx(
		const Word16 max_num_indices /* i : max number of indices */
		);

		Word16 BRATE2IDX_fx( Word32 brate );
		Word16 BRATE2IDX16k_fx( Word32 brate );
		Word16 BRATE2IDX_fx(
		const Word32 brate );

		Word16 BRATE2IDX16k_fx(
		Word32 brate );

		Word32 BIT_ALLOC_IDX_fx( Word32 brate, Word16 ctype, Word16 sfrm, Word16 tc );
		Word32 BIT_ALLOC_IDX_16KHZ_fx( Word32 brate, Word16 ctype, Word16 sfrm, Word16 tc );
		Word32 BIT_ALLOC_IDX_fx(
		const Word32 brate,
		Word16 ctype,
		const Word16 sfrm,
		const Word16 tc );

		Word32 BIT_ALLOC_IDX_16KHZ_fx(
		const Word32 brate,
		const Word16 ctype,
		const Word16 sfrm,
		const Word16 tc );

		void getPartialCopyInfo(
		Decoder_State st, / i : decoder state structure */
		@@ -10420,6 +10427,7 @@ Word32 sum2_32_fx(
		const Word32 vec, / i : input vector */
		const Word16 lvec, /* i : length of input vector */
		Word16 *e );

		void ProcessStereoIGF_fx(
		STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,
		Encoder_State sts[CPE_CHANNELS], / i : Encoder state */
		@@ -10437,6 +10445,7 @@ void ProcessStereoIGF_fx(
		const Word16 sp_aud_decision0, /* i : sp_aud_decision0 */
		const Word32 element_brate, /* i : element bitrate */
		const Word16 mct_on );

		/igf_enc.c/
		void IGFEncApplyStereo_fx(
		STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct, /* i/o: MDCT stereo encoder structure */
		@@ -10460,6 +10469,7 @@ void IGFSaveSpectrumForITF_ivas_fx(
		const Word16 igfGridIdx, /* i : IGF grid index */
		const Word32 pITFSpectrum, / i : MDCT spectrum */
		Word16 exp_pITFSpectrum );

		Word16 IGFEncWriteBitstream_ivas_fx(
		const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i : instance handle of IGF Encoder */
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		@@ -10467,6 +10477,7 @@ Word16 IGFEncWriteBitstream_ivas_fx(
		const Word16 igfGridIdx, /* i : igf grid index see declaration of IGF_GRID_IDX for details */
		const Word16 isIndepFlag /* i : if 1 frame is independent, 0 = frame is coded with data from previous frame */
		);

		/igf_scf_enc.c/
		Word16 IGFSCFEncoderEncode_ivas_fx(
		IGFSCFENC_INSTANCE_HANDLE hPublicData, /* i/o: handle to public data or NULL in case there was no instance created */
		@@ -10476,6 +10487,7 @@ Word16 IGFSCFEncoderEncode_ivas_fx(
		const Word16 igfGridIdx, /* i : igf grid index see declaration of IGF_GRID_IDX for details */
		const Word16 indepFlag /* i : if 1 frame is independent, 0 = frame is coded with data from previous frame */
		);

		/ari_enc.c/
		Word16 ari_encode_14bits_ext_ivas_fx(
		Word16 ptr, / Q0 */
		@@ -10484,6 +10496,7 @@ Word16 ari_encode_14bits_ext_ivas_fx(
		Word32 symbol, /* Q0 */
		UWord16 const cum_freq / Q0 */
		);

		Word16 ari_encode_14bits_sign_ivas_fx(
		Word16 ptr, / Q0 */
		Word16 bp, /* Q0 */
		@@ -10491,22 +10504,18 @@ Word16 ari_encode_14bits_sign_ivas_fx(
		Tastat *s,
		Word16 sign /* Q0 */
		);

		Word16 ari_done_encoding_14bits_ivas_fx(
		Word16 ptr, / Q0 */
		Word16 bp, /* Q0 */
		Tastat *s );
		void pack_bit(
		const Word16 bit, /* i: bit to be packed */
		UWord8 *pt, / i/o: pointer to octet array into which bit will be placed */
		UWord8 omask / i/o: output mask to indicate where in the octet the bit is to be written */
		);

		void IGFEncConcatenateBitstream(
		const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i : instance handle of IGF Encoder */
		const Word16 bsBits, /* i : number of IGF bits written to list of indices */
		BSTR_ENC_HANDLE hBstr /* i/o: bitstream handle */
		);


		void hq_generic_hf_encoding_fx(
		const Word32 coefs_fx, / i : MDCT coefficients of weighted original */
		Word16 hq_generic_fenv_fx, / i/o: energy of SWB envelope */
		@@ -10514,6 +10523,7 @@ void hq_generic_hf_encoding_fx(
		Encoder_State st_fx, / i/o: encoder state structure */
		Word16 hq_generic_exc_clas, / o : bwe excitation class */
		Word16 length );

		Word16 ari_decode_14bits_pow_ivas(
		Word16 *ptr,
		Word16 bp,
		@@ -10981,18 +10991,7 @@ UWord16 delete_indice(
		);

		/! r: value of the indice /
		UWord16 get_next_indice(
		Decoder_State st, / i/o: decoder state structure */
		Word16 nb_bits /* i : number of bits that were used to quantize the indice */
		);

		void get_next_indice_tmp(
		Decoder_State st, / o : decoder state structure */
		Word16 nb_bits /* i : number of bits that were used to quantize the indice */
		);

		/! r: value of the indice /
		UWord16 get_indice(
		UWord16 get_indice_fx(
		Decoder_State st, / i/o: decoder state structure */
		Word16 pos, /* i : absolute position in the bitstream */
		Word16 nb_bits /* i : number of bits that were used to quantize the indice */
		@@ -11002,12 +11001,11 @@ void reset_indices_dec(
		Decoder_State st / i/o: decoder state structure */
		);

		Word16 rate2EVSmode_float(
		Word16 rate2EVSmode(
		const Word32 brate, /* i : bitrate */
		Word16 is_amr_wb / o : (flag) does the bitrate belong to AMR-WB? Can be NULL */
		);


		/! r: 1 = OK, 0 = something wrong /
		ivas_error read_indices_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		@@ -11018,7 +11016,6 @@ ivas_error read_indices_fx(
		Word16 bfi /* i : bad frame indicator */
		);


		void ivas_set_bitstream_pointers(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

lib_dec/FEC_clas_estim_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -864,7 +864,7 @@ Word16 FEC_pos_dec_fx(
		bit_pos_pitch_index = add( bit_pos_pitch_index, 1 );
		}
		/* retrieve the pitch index */
		pitch_index = (Word16) get_indice( st_fx, bit_pos_pitch_index, nBits );
		pitch_index = (Word16) get_indice_fx( st_fx, bit_pos_pitch_index, nBits );

		/* decode pitch period */
		T0_min = PIT_MIN;