Do not propagate Etot parameter */; under REMOVE_ETOT_PROPAGATION (444b72d4) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -183,7 +183,9 @@ ivas_error pre_proc_front_ivas(
		const int16_t n, /* i : channel number */
		float old_inp_12k8[], /* o : buffer of old input signal */
		float old_inp_16k[], /* o : buffer of old input signal @16kHz */
		#ifndef REMOVE_ETOT_PROPAGATION
		float Etot, / o : total energy */
		#endif
		float ener, / o : residual energy from Levinson-Durbin */
		float relE, / o : frame relative energy */
		float A[NB_SUBFR16k * ( M + 1 )], /* o : A(z) unquantized for the 4 subframes */
		@@ -413,7 +415,9 @@ ivas_error ivas_core_enc(
		const int16_t n_CoreChannels, /* i : number of core channels to be coded */
		float old_inp_12k8[CPE_CHANNELS][L_INP_12k8], /* i : buffer of old input signal */
		float old_inp_16k[CPE_CHANNELS][L_INP], /* i : buffer of old input signal */
		#ifndef REMOVE_ETOT_PROPAGATION
		const float Etot[CPE_CHANNELS], /* i : total energy */
		#endif
		float ener[CPE_CHANNELS], /* i : residual energy from Levinson-Durbin */
		float A[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes */
		float Aw[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquantized for subframes */
		@@ -1713,6 +1717,9 @@ void tdm_ol_pitch_comparison(

		void tdm_configure_enc(
		CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
		#ifdef REMOVE_ETOT_PROPAGATION
		const float Etot_last[CPE_CHANNELS], /* i/o: Energy of last frame */
		#endif
		const int16_t tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag in TD stereo OR LRTD primary channel */
		const int16_t tdm_ratio_idx, /* i : ratio index */
		const int16_t tdm_ratio_idx_SM, /* i : ratio index in SM mode */

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,8 @@
		#define BRATE_SWITCHING_RENDERING /* Bitrate switching changes related to the renderers */
		#define FIX_150 /* Issue 150: Crash in EVS mono, HQ_HARMONIC mode, related to BASOP_NOGLOB */
		#define FIX_VBR_COMPLEXITY /* Issue 234: fix extremely high complexity numbers for IVAS EVS mode */
		#define REMOVE_ETOT_PROPAGATION /* Issue 251: Do not propagate Etot parameter */


		/* ################## End DEVELOPMENT switches ######################### */
		/* clang-format on */

lib_com/prot.h

+9 −4

Original line number	Diff line number	Diff line
		@@ -2300,7 +2300,9 @@ void pre_proc(
		float old_inp_16k[], /* i/o: buffer of old input signal @ 16kHz */
		float *inp, / o : ptr. to inp. signal in the current frame*/
		float fr_bands[2 * NB_BANDS], /* i : energy in frequency bands */
		#ifndef REMOVE_ETOT_PROPAGATION
		float Etot, / i : total energy */
		#endif
		float ener, / o : residual energy from Levinson-Durbin */
		#ifndef FIX_I4_OL_PITCH
		int16_t pitch_orig[3], /* o : open-loop pitch values for quantization */
		@@ -3914,8 +3916,11 @@ void updt_enc(
		);

		void updt_enc_common(
		Encoder_State st, / i/o: encoder state structure */
		Encoder_State st / i/o: encoder state structure */
		#ifndef REMOVE_ETOT_PROPAGATION
		,
		const float Etot /* i : total energy */
		#endif
		);

		void updt_IO_switch_enc(

lib_enc/amr_wb_enc.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -531,7 +531,11 @@ void amr_wb_enc(
		updt_enc( st, old_exc, pitch_buf, 0, Aq, isf_new, isp_new, dummy_buf );

		/* update main codec paramaters */
		#ifdef REMOVE_ETOT_PROPAGATION
		updt_enc_common( st );
		#else
		updt_enc_common( st, Etot );
		#endif

		#ifdef DEBUG_MODE_INFO
		dbgwrite( &st->codec_mode, sizeof( int16_t ), 1, input_frame, "res/codec" );

lib_enc/evs_enc.c

+26 −12

Original line number	Diff line number	Diff line
		@@ -72,7 +72,9 @@ ivas_error evs_enc(
		float old_inp_12k8[L_INP_12k8], inp; / buffer of input signal @ 12k8 */
		float old_inp_16k[L_INP]; /* buffer of input signal @ 16kHz */
		float fr_bands[2 * NB_BANDS]; /* energy in frequency bands */
		#ifndef REMOVE_ETOT_PROPAGATION
		float Etot; /* total energy; correlation shift */
		#endif
		float ener; /* residual energy from Levinson-Durbin */
		float A[NB_SUBFR16k * ( M + 1 )]; /* A(z) unquantized for subframes */
		float Aw[NB_SUBFR16k * ( M + 1 )]; /* weighted A(z) unquantized for subframes */
		@@ -181,10 +183,18 @@ ivas_error evs_enc(
		---------------------------------------------------------------------/

		#ifdef FIX_I4_OL_PITCH
		#ifdef REMOVE_ETOT_PROPAGATION
		pre_proc( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, Etot, &ener, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag, &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &hq_core_type );
		#else
		pre_proc( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &Etot, &ener, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag, &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &hq_core_type );
		#endif
		#else
		#ifdef REMOVE_ETOT_PROPAGATION
		pre_proc( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &ener, pitch_orig, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag, &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &hq_core_type );
		#else
		pre_proc( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &Etot, &ener, pitch_orig, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag, &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &hq_core_type );
		#endif
		#endif


		if ( st->mdct_sw == MODE2 )
		@@ -509,7 +519,11 @@ ivas_error evs_enc(
		* Updates
		---------------------------------------------------------------------/

		#ifdef REMOVE_ETOT_PROPAGATION
		updt_enc_common( st );
		#else
		updt_enc_common( st, Etot );
		#endif

		if ( st->mdct_sw == MODE1 )
		{