[cleanup] accept PARAM_ISM_DTX_CNG (7e2c9ae2) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -333,11 +333,9 @@ typedef enum
		#define PARAM_ISM_MAX_CHAN 16
		#define PARAM_ISM_HYS_BUF_SIZE 10

		#ifdef PARAM_ISM_DTX_CNG
		#define PARAM_ISM_DTX_COH_SCA_BITS 4
		#define PARAM_ISM_DTX_AZI_BITS 5
		#define PARAM_ISM_DTX_ELE_BITS 4
		#endif

		typedef enum
		{
		@@ -353,18 +351,12 @@ enum
		IND_ISM_NUM_OBJECTS,
		IND_ISM_METADATA_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,
		IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,
		#ifdef PARAM_ISM_DTX_CNG
		IND_ISM_SCE_ID_DTX = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,
		IND_ISM_NOISY_SPEECH_FLAG,
		IND_ISM_DTX_COH_SCA,
		#endif

		/* ------------- loop for objects -------------- */
		#ifdef PARAM_ISM_DTX_CNG
		TAG_ISM_LOOP_START = IND_ISM_DTX_COH_SCA + MAX_NUM_OBJECTS,
		#else
		TAG_ISM_LOOP_START = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,
		#endif
		IND_ISM_AZIMUTH_DIFF_FLAG = TAG_ISM_LOOP_START,
		IND_ISM_AZIMUTH = TAG_ISM_LOOP_START,
		IND_ISM_ELEVATION_DIFF_FLAG = TAG_ISM_LOOP_START,

lib_com/ivas_prot.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -500,11 +500,9 @@ void stereo_tcx_core_dec(
		const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */
		STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */
		const int16_t nchan_out /* i : number of output channels */
		#ifdef PARAM_ISM_DTX_CNG
		,
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const ISM_MODE ism_mode /* i : ISM mode (only needed if format is ISM) */
		#endif
		);

		void stereo_tcx_init_dec(
		@@ -892,7 +890,6 @@ void ivas_param_ism_params_to_masa_param_mapping(
		);


		#ifdef PARAM_ISM_DTX_CNG
		/----------------------------------------------------------------------------------
		* ISM DTX prototypes
		----------------------------------------------------------------------------------/
		@@ -940,7 +937,6 @@ void ivas_ism_coh_estim_dtx_enc(
		const int16_t nchan_transport, /* i : number of transport channels */
		const int16_t input_frame /* i : input frame length */
		);
		#endif

		/----------------------------------------------------------------------------------
		* DFT Stereo prototypes

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,6 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */


		#define PARAM_ISM_DTX_CNG /* FhG: contribution 9 - DTX-CNG for ParamISM */

		#define FIX_331_SBA_HBR_HOA_FIXES /* DLB: issue 331 - fix addressing low frequency stuttering with HOA inputs at high bitrates */
		#ifdef FIX_331_SBA_HBR_HOA_FIXES

lib_com/prot.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -2229,10 +2229,8 @@ ivas_error init_encoder(
		const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */
		const int16_t interval_SID, /* i : interval for SID update */
		const int16_t vad_only_flag /* i : flag to indicate front-VAD structure */
		#ifdef PARAM_ISM_DTX_CNG
		,
		const ISM_MODE ism_mode /* i : ISM mode */
		#endif
		);

		void LPDmem_enc_init(
		@@ -8524,10 +8522,8 @@ void generate_comfort_noise_dec_hf(
		float *bufferReal, / o : Real part of input bands */
		float *bufferImag, / o : Imaginary part of input bands */
		HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */
		#ifdef PARAM_ISM_DTX_CNG
		,
		const int16_t cng_flag /i : CNG Flag /
		#endif
		);

		void generate_masking_noise(

lib_dec/acelp_core_dec.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -512,11 +512,7 @@ ivas_error acelp_core_dec(
		}
		else
		{
		#ifdef PARAM_ISM_DTX_CNG
		if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT && st->read_sid_info )
		#else
		if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT )
		#endif
		{
		FdCng_decodeSID( st );
		*sid_bw = 0;
		@@ -532,7 +528,6 @@ ivas_error acelp_core_dec(
		}
		ApplyFdCng( syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
		}
		#ifdef PARAM_ISM_DTX_CNG
		if ( !st->read_sid_info )
		// if (!st->read_sid_info && st->cng_paramISM_flag) /* read_sid_info can only be 0 in ParamISM mode */
		{
		@@ -544,7 +539,6 @@ ivas_error acelp_core_dec(
		st->hFdCngDec->hFdCngCom->cngNoiseLevel[b] = noise_lvl_highest;
		}
		}
		#endif

		generate_comfort_noise_dec( NULL, NULL, st, nchan_out );

		@@ -1131,11 +1125,7 @@ ivas_error acelp_core_dec(
		st->lp_noise = st->hFdCngDec->lp_noise;
		}

		#ifdef PARAM_ISM_DTX_CNG
		if ( st->element_mode != IVAS_CPE_TD && !st->cng_paramISM_flag )
		#else
		if ( st->element_mode != IVAS_CPE_TD )
		#endif
		{
		/Noise estimate/
		ApplyFdCng( syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
		@@ -1311,11 +1301,7 @@ ivas_error acelp_core_dec(
		/WB/SWB-FD_CNG/
		if ( ( st->core_brate == FRAME_NO_DATA \|\| st->core_brate == SID_2k40 ) && ( st->cng_type == FD_CNG ) && ( st->hFdCngDec->hFdCngCom->numCoreBands < st->cldfbSyn->no_channels ) )
		{
		#ifdef PARAM_ISM_DTX_CNG
		generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom, st->cng_paramISM_flag );
		#else
		generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom );
		#endif

		if ( st->hFdCngDec->hFdCngCom->regularStopBand < st->cldfbSyn->no_channels )
		{