Address review comments:set 1 (82228af2) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+2 −32

Original line number	Diff line number	Diff line
		@@ -226,9 +226,6 @@ ivas_error pre_proc_front_ivas(
		const int16_t front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision*/
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */
		const int16_t ivas_format /* i : IVAS format */
		#ifdef SBA_BR_SWITCHING_RECONFIG
		, const int16_t flag_sba_bitrate_switch /* i : SBA bitrate switch flag */
		#endif
		);

		ivas_error pre_proc_ivas(
		@@ -3130,44 +3127,17 @@ void ivas_sba_config(
		int16_t nCPE, / o : number of CPEs */
		int16_t element_mode / o : element mode of the core coder */
		);
		#ifndef SBA_BR_SWITCHING_RECONFIG

		ivas_error ivas_sba_enc_reconfigure(
		Encoder_Struct st_ivas / i/o: IVAS encoder structure */
		);

		#ifdef SBA_BR_SWITCHING
		ivas_error ivas_sba_enc_reinit(
		Encoder_Struct st_ivas / i/o: IVAS encoder structure */
		);

		int16_t get_sba_reinit_flag(
		int32_t ivas_total_bitrate, /* i : Current bitrate */
		int32_t last_ivas_total_brate /* i : Previous bitrate */
		#ifdef SBA_BR_SWITCHING
		, const int16_t sba_order
		#endif
		);
		#endif
		#ifdef SBA_BR_SWITCHING
		ivas_error ivas_spar_md_enc_init
		(
		ivas_spar_md_enc_state_t hMdEnc, / o : MD encoder handle */
		const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
		const int16_t sba_order /* i : Ambisonic (SBA) order */
		);
		#endif
		#endif
		ivas_error ivas_sba_dec_reconfigure(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);

		#ifndef SBA_BR_SWITCHING_RECONFIG
		#ifdef SBA_BR_SWITCHING
		ivas_error ivas_sba_dec_reinit(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);
		#endif

		#endif

		void ivas_init_dec_get_num_cldfb_instances(
		Decoder_Struct st_ivas, / i : IVAS decoder structure */

lib_com/options.h

+2 −5

Original line number	Diff line number	Diff line
		@@ -141,12 +141,9 @@
		#define DISABLE_ADAP_RES_COD_TMP /* temporary fix for IVAS-403, disables adaptive residual coding */
		/#define ITD_WINNER_GAIN_MODIFY / /* ITD optimization - WORK IN PROGRESS */
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/
		#ifdef SBA_BR_SWITCHING_RECONFIG
		#define SBA_BR_SWITCHING /* Issue 114: Changes for SBA bit rate switching with reconfiguration for bitrates with same number of transport channels*/
		#endif
		#ifndef SBA_BR_SWITCHING
		#define SBA_BR_SWITCHING /* Issue 114: Changes for SBA bit rate switching with reconfiguration for bitrates with same no:of transport channels and reinitialization for different no:of transport channels */
		#ifdef SBA_BR_SWITCHING
		#define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/
		#endif
		#define BRATE_SWITCHING_RENDERING /* Bitrate switching changes related to the renderers */
		#define FIX_I59_DELAY_ROUNDING /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */

lib_enc/ivas_core_pre_proc_front.c

+1 −12

Original line number	Diff line number	Diff line
		@@ -108,12 +108,7 @@ ivas_error pre_proc_front_ivas(
		const int16_t force_front_vad, /* i : flag to force VAD decision */
		const int16_t front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision*/
		const int32_t ivas_total_brate, /* i : IVAS total bitrate - for setting the DTX */
		const int16_t ivas_format
		#ifdef SBA_BR_SWITCHING_RECONFIG
		,
		const int16_t flag_sba_bitrate_switch
		#endif
		)
		const int16_t ivas_format )
		{
		float inp_12k8, new_inp_12k8; /* pointers to current frame and new data */
		float wsp; / weighted input signal buffer */
		@@ -461,12 +456,6 @@ ivas_error pre_proc_front_ivas(
		st->vad_flag = front_vad_flag;
		st->localVAD = front_vad_flag;
		}
		#ifdef SBA_BR_SWITCHING_RECONFIG
		if ( flag_sba_bitrate_switch )
		{
		st->vad_flag = 1;
		}
		#endif
		if ( ( hCPE != NULL && !( lr_vad_enabled && st->idchan == 0 ) ) \|\| hSCE != NULL )
		{
		*vad_flag_dtx = dtx_hangover_addition( st, st->vad_flag, st->lp_speech - st->lp_noise, 0, vad_hover_flag, NULL, NULL, NULL );

lib_enc/ivas_cpe_enc.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -433,12 +433,7 @@ ivas_error ivas_cpe_enc(
		&ener[n], &relE[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n],
		&vad_hover_flag[n], &attack_flag[n], realBuffer[n], imagBuffer[n], old_wsp[n], pitch_fr[n], voicing_fr[n], &loc_harm[n], &cor_map_sum[n], &vad_flag_dtx[n], enerBuffer[n],
		fft_buff[n], A[0], lsp_new[0], currFlatness[n], tdm_ratio_idx, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, band_energies_LR, 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0,
		ivas_total_brate, st_ivas->hEncoderConfig->ivas_format
		#ifdef SBA_BR_SWITCHING_RECONFIG
		,
		st_ivas->flag_sba_bitrate_switch
		#endif
		);
		ivas_total_brate, st_ivas->hEncoderConfig->ivas_format );
		if ( error != IVAS_ERR_OK )
		{
		return error;

lib_enc/ivas_front_vad.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -397,7 +397,8 @@ ivas_error front_vad_spar(
		hFrontVad = hSpar->hFrontVad;
		st = hSpar->hCoreCoderVAD;

		if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_total_brate <= SBA_DTX_BITRATE_THRESHOLD )
		if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_total_brate <= SBA_DTX_BITRATE_THRESHOLD &&
		hEncoderConfig->ivas_total_brate == hEncoderConfig->last_ivas_total_brate )
		{
		/------------------------------------------------------------------
		* Initialization