[cleanup] accept HARM_PREPROC (b25dd1a4) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,6 @@
		#define FIX_1904_HARM_GSC_ENC /* VA: #1904 Harmonization of EVS and IVAS GSC code */
		#define FIX_1478_UNINIT_ON_BFI /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */
		#define FIX_2318_CLANG_DECODER /* VA: basop issue 2318: Initialize command-line parameter arg.non_diegetic_pan_gain_fx */
		#define HARM_PREPROC /* VA: basop issue 2339: Remove duplicated code in the core-coder DTX */
		#define HARM_NON_LINEARITY /* VA: basop issue 2345: Remove duplicated code in core-coder: non_linearity_fx() and LP CNG */
		#define FIX_2344_ALIGN_PREPROC /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */
		#define FIX_2334_HARM_CODER_MODIF /* VA: basop issue 2334 : harmonizing coder_modif_function */

+0 −8

Original line number	Diff line number	Diff line
		@@ -310,11 +310,7 @@ void amr_wb_enc_fx(
		}

		/* apply DTX hangover for CNG analysis */
		#ifdef HARM_PREPROC
		vad_flag_dtx = dtx_hangover_addition_fx( st, st->vad_flag, sub( st->lp_speech_fx, st->lp_noise_fx ), 0, &vad_hover_flag, NULL, NULL, NULL );
		#else
		vad_flag_dtx = dtx_hangover_addition_fx( st, st->vad_flag, sub( st->lp_speech_fx, st->lp_noise_fx ), 0, &vad_hover_flag, NULL, NULL );
		#endif

		/-----------------------------------------------------------------
		* Select SID or FRAME_NO_DATA frame if DTX enabled
		@@ -336,11 +332,7 @@ void amr_wb_enc_fx(
		move16();
		}

		#ifdef HARM_PREPROC
		dtx_fx( st, -1, -1, vad_flag_dtx, inp, Q_new );
		#else
		dtx_fx( st, vad_flag_dtx, inp, Q_new );
		#endif

		/----------------------------------------------------------------
		* Noise energy down-ward update and total noise energy estimation

+0 −569

File changed.

Preview size limit exceeded, changes collapsed.

+0 −11

Original line number	Diff line number	Diff line
		@@ -686,18 +686,7 @@ ivas_error init_encoder_fx(
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX/TD CNG\n" ) );
		}

		#ifdef HARM_PREPROC
		td_cng_enc_init_fx( st->hTdCngEnc, st->Opt_DTX_ON, st->max_bwidth );
		#else
		IF( st->element_mode == EVS_MONO )
		{
		td_cng_enc_init_fx( st->hTdCngEnc, st->Opt_DTX_ON, st->max_bwidth );
		}
		ELSE
		{
		td_cng_enc_init_ivas_fx( st->hTdCngEnc, st->Opt_DTX_ON, st->max_bwidth );
		}
		#endif
		}
		ELSE
		{

+0 −33

File changed.

Preview size limit exceeded, changes collapsed.