Merge remote-tracking branch 'origin/main' into 1034-dry-2dir-masa-encoded-incorrectly (81399189) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -3497,13 +3497,6 @@ ivas_error ivas_cldfb_dec_reconfig(
		const int16_t numCldfbSyntheses_old /* i : number of CLDFB synthesis instances in previous frame */
		);

		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		/! r: Ambisonic (SBA) order /
		int16_t ivas_sba_get_order(
		const int16_t nb_channels, /* i : Number of ambisonic channels */
		const int16_t sba_planar /* i : SBA planar flag */
		);
		#endif
		/! r: Ambisonic (SBA) order used for analysis and coding /
		int16_t ivas_sba_get_analysis_order(
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */

lib_com/ivas_sba_config.c

+0 −47

Original line number	Diff line number	Diff line
		@@ -64,23 +64,7 @@ void ivas_sba_config(
		int16_t element_mode / o : element mode of the core coder */
		)
		{
		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		if ( ( sba_order < 0 ) && ( nb_channels < 0 ) )
		{
		assert( 0 && "Either order or number of channels must be positive" );
		}
		else if ( sba_order < 0 )
		{
		sba_order = ivas_sba_get_order( nb_channels, sba_planar );
		}
		else if ( nb_channels < 0 )
		{
		nb_channels = ivas_sba_get_nchan( sba_order, sba_planar );
		}
		else
		#else
		if ( nb_channels > 0 )
		#endif
		{
		if ( sba_planar )
		{
		@@ -121,37 +105,6 @@ void ivas_sba_config(
		return;
		}

		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		/-------------------------------------------------------------------
		* ivas_sba_get_order()
		*
		* Get Ambisonic order from number of ambisonic channels
		-------------------------------------------------------------------/

		/! r: Ambisonic (SBA) order /
		int16_t ivas_sba_get_order(
		const int16_t nb_channels, /* i : Number of ambisonic channels */
		const int16_t sba_planar /* i : SBA Planar flag */
		)
		{
		int16_t sba_order;

		if ( sba_planar )
		{
		sba_order = ( nb_channels - 1 ) / 2;
		assert( ( 2 * sba_order + 1 == nb_channels ) && "Number of channels not supported in Planar SBA!" );
		}
		else
		{
		sba_order = (int16_t) sqrtf( (float) nb_channels ) - 1;
		assert( ( ( sba_order + 1 ) * ( sba_order + 1 ) == nb_channels ) && "Number of channels not supported in SBA!" );
		}

		assert( ( sba_order <= 3 ) && "Error: SBA order must be <= 3!" );

		return ( sba_order );
		}
		#endif

		/-------------------------------------------------------------------
		* ivas_sba_get_analysis_order()

lib_com/options.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -156,10 +156,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_1020_AEID_SELECTION_ERRORS /* Philips: issue #1020: fix for acoustic environment ID selection errors */
		#define FIX_993_REMOVE_SBA_GET_ORDER /* VA: issue 993: remove unused function ivas_sba_get_order() */
		#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions */
		#define FIX_960_SYN_OUTPUT /* VA: issue 960: unused function syn_output() is removed */
		#define FIX_1027_GSC_INT_OVERFLOW /* VA: issue 2207: overflow in GSC */

		/* #################### End BE switches ################################## */
		@@ -168,9 +164,6 @@
		/* any switch which is non-be wrt selection floating point code */
		/* all switches in this category should start with "NONBE_" */

		#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */
		#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */
		#define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO /* Eri: Issue 1010: Division by zero in Stereo CNG */
		#define NONBE_FIX_1034_DRY_MASA_RATIOS /* Nokia: Fix issue 1034, use of wrong numDir state. */

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

lib_com/prot.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -4824,14 +4824,6 @@ void dec_acelp_4t64(
		const int16_t Opt_AMR_WB /* i : flag indicating AMR-WB IO mode */
		);

		#ifndef FIX_960_SYN_OUTPUT
		uint32_t syn_output(
		float synth, / i/o: float synthesis signal */
		const int16_t output_frame, /* i : output frame length */
		int16_t synth_out / o : integer 16 bits synthesis signal */
		);

		#endif
		void FEC_exc_estim(
		Decoder_State st, / i/o: Decoder static memory */
		const int16_t L_frame, /* i : length of the frame */

lib_dec/FEC_HQ_phase_ecu.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -1091,12 +1091,8 @@ static void subst_spec(
		}

		Xph = corr_phase[m];
		#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE
		/* extract fractional phase integer index in the range [0...1023] */
		Xph_short = (int16_t) ( 0x000003ff & (int32_t) ( ( Xph * 512 ) / EVS_PI ) );
		#else
		Xph_short = (int16_t) ( ( (int32_t) ( Xph * 512 / EVS_PI ) ) % 32768 ) & 0x03ff;
		#endif


		if ( Xph_short >= 512 )
		@@ -1142,11 +1138,7 @@ static void subst_spec(
		mag_chg_local = 0.5f + ( 1.0f - ( 1.0f / PHASE_DITH ) ph_dith ) * 0.5f;
		}

		#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE
		Xph_short = (int16_t) ( ( (int32_t) ( ( Xph * 512 ) / EVS_PI ) ) & 0x000003ff );
		#else
		Xph_short = (int16_t) ( Xph * 512 / EVS_PI ) & 0x03ff;
		#endif

		if ( Xph_short >= 512 )
		{