Merge branch 'main' into ci/usan_ltv (33e406da) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -328,6 +328,10 @@ typedef enum
		#define ISM_Q_STEP 2.5f
		#define ISM_Q_STEP_BORDER 5.0f

		#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA
		#define ISM_FEC_MAX 10
		#endif

		#define ISM_RADIUS_NBITS 6
		#define ISM_RADIUS_MIN 0.0f
		#define ISM_RADIUS_DELTA 0.25f /* Max radius = (2^ISM_RADIUS_NBITS-1)0.25 = 15.75 /

+1 −3

Original line number	Diff line number	Diff line
		@@ -151,8 +151,6 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		/#define SPLIT_REND_WITH_HEAD_ROT / /* Dlb,FhG: Split Rendering contributions 21 and 35 */

		#define FIX_911_REMOVE_CREND_DUPLICATION /* VA: issue 911: resolve duplication of CRend binaural external renderer function */
		#define FIX_938_GCC_12_WARNINGS /* VA: issue #938: remove set_f(.,.,0) call in which length is always 0 to remove GCC 12.0 warning */

		/* #################### End BE switches ################################## */

		@@ -161,7 +159,7 @@
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/
		#define NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW /* FhG: issue 943: fix crash in BW switchin from WB in MDCT-Stereo core encoder */
		#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /* Nokia: issue 944: fix FEC error in OMASA */

		/* ##################### End NON-BE switches ########################### */

+0 −4

Original line number	Diff line number	Diff line
		@@ -242,10 +242,6 @@ void transf_cdbk_enc(
		x_tran[i] = (float) ( x_norm[i] );
		}

		#ifndef FIX_938_GCC_12_WARNINGS
		set_f( x_tran + Nsv * WIDTH_BAND, 0.0f, L_SUBFR - WIDTH_BAND * Nsv );

		#endif
		if ( st->coder_type != INACTIVE && st->core_brate >= MIN_BRATE_AVQ_EXC && st->core_brate <= MAX_BRATE_AVQ_EXC_TD && !harm_flag_acelp )
		{
		mvr2r( x_tran, code_preQ, L_SUBFR );

+0 −18

Original line number	Diff line number	Diff line
		@@ -519,22 +519,6 @@ ivas_error ivas_cpe_enc(
		* Core codec configuration
		----------------------------------------------------------------/

		#ifndef NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW
		/* IGF reconfiguration */
		for ( n = 0; n < n_CoreChannels; n++ )
		{
		if ( ( hCPE->last_element_brate != hCPE->element_brate \|\| hCPE->element_mode != hCPE->last_element_mode \|\| ( hCPE->element_mode == IVAS_CPE_TD && sts[0]->bits_frame_nominal != last_bits_frame_nominal ) \|\| sts[n]->last_bwidth != sts[n]->bwidth ) && ( n == 0 \|\| hCPE->element_mode == IVAS_CPE_MDCT ) )
		{
		int16_t igf;
		igf = getIgfPresent( sts[n]->element_mode, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, sts[n]->max_bwidth, sts[n]->rf_mode );
		if ( ( error = IGF_Reconfig( &sts[n]->hIGFEnc, igf, 0, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, sts[n]->max_bwidth, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		}

		#endif
		if ( hCPE->element_mode == IVAS_CPE_MDCT && st_ivas->hMCT == NULL )
		{
		/* set coded BW for MDCT stereo */
		@@ -556,7 +540,6 @@ ivas_error ivas_cpe_enc(
		}
		}

		#ifdef NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW
		/* IGF reconfiguration */
		for ( n = 0; n < n_CoreChannels; n++ )
		{
		@@ -570,7 +553,6 @@ ivas_error ivas_cpe_enc(
		}
		}
		}
		#endif

		/* set ACELP@12k8 / ACELP@16k flag for flexible ACELP core */
		for ( n = 0; n < n_CoreChannels; n++ )

+0 −1

Original line number	Diff line number	Diff line
		@@ -275,7 +275,6 @@ ivas_error ivas_enc(
		else if ( ivas_format == MASA_ISM_FORMAT )
		{
		float *data_separated_object;

		int16_t idx_separated_object;
		int16_t flag_omasa_ener_brate;