Merge branch 'main' into 20221025_maintenance (21f172ca) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/core_com_config.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -165,7 +165,7 @@ int16_t get_codec_mode(
		int16_t getTcxonly(
		const int16_t element_mode, /* i : IVAS element mode */
		const int32_t total_brate, /* i : total bitrate */
		const int16_t is_mct /* i : MCT mode flag */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/
		)
		{
		int16_t tcxonly = 0;
		@@ -187,7 +187,7 @@ int16_t getTcxonly(
		}
		break;
		case IVAS_CPE_MDCT:
		if ( total_brate >= ( is_mct ? IVAS_32k : IVAS_48k ) )
		if ( total_brate >= ( MCT_flag ? IVAS_32k : IVAS_48k ) )
		{
		tcxonly = 1;
		}
		@@ -808,7 +808,7 @@ void init_tcx_cfg(
		const int16_t infoIGFStopFreq,
		const int16_t element_mode,
		const int16_t ini_frame,
		const int16_t is_mct,
		const int16_t MCT_flag,
		const MCT_CHAN_MODE mct_chan_mode /* i : MDCT channel mode */
		)
		{
		@@ -850,7 +850,7 @@ void init_tcx_cfg(

		if ( hTcxCfg->fIsTNSAllowed )
		{
		InitTnsConfigs( bwidth, hTcxCfg->tcx_coded_lines, hTcxCfg->tnsConfig, infoIGFStopFreq, total_brate, element_mode, is_mct );
		InitTnsConfigs( bwidth, hTcxCfg->tcx_coded_lines, hTcxCfg->tnsConfig, infoIGFStopFreq, total_brate, element_mode, MCT_flag );

		SetAllowTnsOnWhite( hTcxCfg->tnsConfig, element_mode == IVAS_CPE_MDCT );
		}

lib_com/ivas_prot.h

+101 −101

Original line number	Diff line number	Diff line
		@@ -225,7 +225,7 @@ ivas_error pre_proc_ivas(
		const int16_t vad_flag_dtx, /* i : HE-SAD flag with additional DTX HO */
		const float enerBuffer[CLDFB_NO_CHANNELS_MAX], /* i : energy buffer */
		const float fft_buff[2 * L_FFT], /* i : FFT buffer */
		const int16_t is_mct, /* i : MCT mode flag */
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const int16_t vad_hover_flag, /* i : VAD hangover flag */
		const int16_t flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */
		);
		@@ -504,7 +504,7 @@ void stereo_tcx_core_dec(

		void stereo_tcx_init_dec(
		Decoder_State st, / i/o: decoder state structure */
		const int16_t is_mct, /* i : MCT mode flag */
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const int16_t last_element_mode /* i : element mode of previous frame */
		);

		@@ -561,7 +561,7 @@ void ivas_decision_matrix_enc(

		void ivas_signaling_enc(
		Encoder_State st, / i/o: encoder state structure */
		const int16_t is_MCT, /* i : MCT enabled */
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const int32_t element_brate, /* i : element bitrate */
		const int16_t tdm_SM_flag, /* i : channel combination scheme flag in TD stereo */
		const int16_t tdm_Pitch_reuse_flag /* i : primary channel pitch reuse flag in TD stereo*/
		@@ -1869,7 +1869,7 @@ void EstimateStereoTCXNoiseLevel(
		const int16_t ignore_chan[], /* i : flag indicating whether the channel should be ignored */
		float fac_ns[][NB_DIV], /* o : noise filling level */
		int16_t param_core[][NB_DIV * NPRM_DIV], /* o : quantized noise filling level */
		const int16_t is_mct /* i : is mct flag */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */
		);

		void TNSAnalysisStereo(
		@@ -1998,7 +1998,7 @@ void decoder_tcx_noisefilling(
		const int16_t *prm_sqQ,
		int16_t nf_seed,
		const int16_t bfi, /* i : Bad frame indicator */
		const int16_t isMCT,
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const int16_t frame_cnt /* i : frame counter in the super frame */
		);

		@@ -2082,7 +2082,7 @@ void decoder_tcx_IGF_stereo(
		const int16_t left_rect, /* i : left part is rectangular */
		const int16_t k, /* i : Subframe index */
		const int16_t bfi, /* i : bad frame indicator */
		const int16_t is_mct /* i : flag to signal MCT or SMDCT */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */
		);

		void ms_processing(
		@@ -2360,7 +2360,7 @@ ivas_error front_vad(
		Encoder_State st, / i/o: encoder state structure */
		const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
		FRONT_VAD_ENC_HANDLE hFrontVads, / i/o: front-VAD handles */
		const int16_t hMCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const int16_t input_frame, /* i : frame length */
		int16_t vad_flag_dtx[], /* o : HE-SAD flag with additional DTX HO */
		float fr_bands[][2 * NB_BANDS], /* i : energy in frequency bands */
		@@ -2638,7 +2638,7 @@ void ivas_mdct_quant_coder(
		int16_t tnsBits[CPE_CHANNELS][NB_DIV], /* i : bits needed for TNS parameters */
		int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* i : size of TNS */
		int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to parameter array */
		const int16_t is_mct /* i : is mct flag */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */
		);

		void apply_MCT_enc(
		@@ -2688,7 +2688,7 @@ void ivas_mdct_dec_side_bits_frame_channel(
		int16_t LFE_off, / o : flag if LFE has content */
		int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */
		int16_t param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i/o: parameters buffer */
		const int16_t MCT_flag, /* i : MCT tool active(1) or deactive (0) */
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const int16_t odd_channel_cpe /* i : flag cpe with odd nb of tc channels */
		);

		@@ -2716,7 +2716,7 @@ void ivas_mdct_core_invQ(
		float x[CPE_CHANNELS][NB_DIV], / i/o: signal buffer */
		float Aq[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* i : LP coefficients */
		int16_t ms_mask[NB_DIV][MAX_SFB], /* i : M/S mask */
		const int16_t isMCT /* i : MCT flag */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */
		);

		void ivas_mdct_core_reconstruct(
		@@ -2725,7 +2725,7 @@ void ivas_mdct_core_reconstruct(
		float signal_outFB[CPE_CHANNELS][L_FRAME_PLUS], /* o : synthesis @output_FS */
		const int16_t LFE_off, /* i : flag if LFE content */
		int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : flage TNS enabled */
		const int16_t isMCT /* i : MCT flag */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */
		);

		void ivas_mdct_core_tns_ns(
		@@ -2735,7 +2735,7 @@ void ivas_mdct_core_tns_ns(
		STnsData tnsData[CPE_CHANNELS][NB_DIV], /* o : TNS parameter */
		float x[CPE_CHANNELS][NB_DIV], / o : synthesis @internal_FS */
		float Aq[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* o : LP coefficients */
		const int16_t isMCT /* i : MCT flag */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */
		);

		void ivas_mct_core_dec(

lib_com/prot.h

+31 −32

Original line number	Diff line number	Diff line
		@@ -6744,7 +6744,7 @@ float correlation_shift(
		void init_coder_ace_plus(
		Encoder_State st, / i : Encoder state handle */
		const int32_t last_total_brate, /* i : last total bitrate */
		const int16_t is_mct /* i : MCT mode flag */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/
		);

		void core_coder_reconfig(
		@@ -6755,7 +6755,7 @@ void core_coder_reconfig(
		void core_coder_mode_switch(
		Encoder_State st, / i/o: encoder state structure */
		const int32_t last_total_brate, /* i : last bitrate */
		const int16_t is_mct /* i : MCT mode flag */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/
		);

		void enc_acelp_tcx_main(
		@@ -6773,7 +6773,7 @@ void enc_acelp_tcx_main(
		void getTCXMode(
		Decoder_State st, / i/o: decoder memory state */
		Decoder_State st0, / i : bitstream */
		const int16_t MCT_flag /* i : MCT tool active(1) or deactive(0) */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/
		);

		void getTCXWindowing(
		@@ -7604,8 +7604,7 @@ void InitTnsConfigs(
		const int16_t igfStopFreq,
		const int32_t total_brate,
		const int16_t element_mode,
		const int16_t is_mct /* i : MCT mode flag */
		);
		const int16_t MCT_flag );

		void SetAllowTnsOnWhite(
		STnsConfig tnsConfig[2][2],
		@@ -7885,7 +7884,7 @@ void decoder_tcx_post(
		Decoder_State st, / i/o: decoder memory state */
		float *synth,
		float *synthFB,
		float *A,
		float A, / i : A(z) filter coefficients */
		const int16_t bfi,
		const int16_t isMCT );

		@@ -7939,7 +7938,7 @@ void decoder_acelp(
		void writeTCXMode(
		Encoder_State st, / i/o: encoder state structure */
		BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
		const int16_t is_mct,
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0)*/
		int16_t nbits_start / o : nbits start */
		);

		@@ -8843,8 +8842,7 @@ void InitTnsConfiguration(
		const int16_t igfStopFreq,
		const int32_t total_brate,
		const int16_t element_mode,
		const int16_t is_mct /* i : MCT mode flag */
		);
		const int16_t MCT_flag );

		int16_t DetectTnsFilt(
		const STnsConfig pTnsConfig, / i : TNS Configuration struct */
		@@ -9182,8 +9180,8 @@ void open_decoder_LPD(
		const int32_t total_brate, /* i : total bitrate */
		const int32_t last_total_brate, /* i : last total bitrate */
		const int16_t bwidth, /* i : audio bandwidth */
		const int16_t is_mct, /* i : MCT mode flag */
		const int16_t last_element_mode,
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const int16_t last_element_mode, /* i : last element mode */
		const int16_t is_init /* i : indicate call during initialization */
		);

		@@ -9223,7 +9221,7 @@ void mode_switch_decoder_LPD(
		const int32_t total_brate, /* i : total bitrate */
		const int32_t last_total_brate, /* i : last frame total bitrate */
		const int16_t frame_size_index, /* i : index determining the frame size */
		const int16_t is_mct, /* i : MCT mode flag */
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0)*/
		const int16_t last_element_mode /* i : last element mode */
		);

		@@ -9652,7 +9650,7 @@ int16_t get_codec_mode(
		int16_t getTcxonly(
		const int16_t element_mode, /* i : IVAS element mode */
		const int32_t total_brate, /* i : total bitrate */
		const int16_t is_mct /* i : MCT mode flag */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/
		);

		int16_t getTnsAllowed(
		@@ -9732,7 +9730,7 @@ void SetModeIndex(
		Encoder_State st, / i : Encoder state */
		const int32_t last_total_brate, /* i : last total bitrate */
		const int16_t last_element_mode, /* i : last IVAS element mode */
		const int16_t is_mct /* i : MCT mode flag */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */
		);

		int16_t getNumTcxCodedLines(
		@@ -9956,6 +9954,7 @@ void IGFSCFDecoderDecode(
		if 0 on input the decoder will be forced to encode without a reset */
		);

		/! r: offset value /
		int16_t tbe_celp_exc_offset(
		const int16_t T0, /* i : Integer pitch */
		const int16_t T0_frac /* i : Fractional part of the pitch */
		@@ -9998,6 +9997,6 @@ void init_tcx_cfg(
		const int16_t infoIGFStopFreq,
		const int16_t element_mode,
		const int16_t ini_frame,
		const int16_t is_mct, /* i : MCT mode flag */
		const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */
		);

lib_com/swb_tbe_com.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ void swb_tbe_reset(
		return;
		}


		/-------------------------------------------------------------------
		* swb_tbe_reset_synth()
		*
		@@ -105,11 +106,14 @@ void swb_tbe_reset_synth(
		return;
		}


		/-------------------------------------------------------------------
		* tbe_celp_exc_offset()
		*
		* Compute tbe bwe celp excitation offset
		-------------------------------------------------------------------/

		/! r: offset value /
		int16_t tbe_celp_exc_offset(
		const int16_t T0, /* i : Integer pitch */
		const int16_t T0_frac /* i : Fractional part of the pitch */
		@@ -120,6 +124,8 @@ int16_t tbe_celp_exc_offset(

		return offset;
		}


		/-------------------------------------------------------------------
		* flip_and_downmix_generic()
		*

lib_com/tcx_utils.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -995,16 +995,16 @@ void InitTnsConfigs(
		const int16_t igfStopFreq,
		const int32_t total_brate,
		const int16_t element_mode,
		const int16_t is_mct )
		const int16_t MCT_flag )
		{
		if ( total_brate > ACELP_32k )
		{
		InitTnsConfiguration( bwidth, L_frame / 2, &tnsConfig[0][0], igfStopFreq, total_brate, element_mode, is_mct );
		InitTnsConfiguration( bwidth, L_frame / 2, &tnsConfig[0][0], igfStopFreq, total_brate, element_mode, MCT_flag );
		}

		InitTnsConfiguration( bwidth, L_frame, &tnsConfig[1][0], igfStopFreq, total_brate, element_mode, is_mct );
		InitTnsConfiguration( bwidth, L_frame, &tnsConfig[1][0], igfStopFreq, total_brate, element_mode, MCT_flag );

		InitTnsConfiguration( bwidth, L_frame + L_frame / 4, &tnsConfig[1][1], igfStopFreq, total_brate, element_mode, is_mct );
		InitTnsConfiguration( bwidth, L_frame + L_frame / 4, &tnsConfig[1][1], igfStopFreq, total_brate, element_mode, MCT_flag );

		return;
		}