Commit 918a45d8 authored Apr 28, 2026 by multrus

Merge branch 'main' into float-1559-synthesis-saturates-for-stereo-with-dtx-and-bitrate-switching

parents 335054bd 0c45df10

lib_com/ivas_cnst.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -1216,7 +1216,12 @@ typedef enum
		{
		MASA_STEREO_NOT_DEFINED,
		MASA_STEREO_SPACED_MICS,
		#ifdef FIX_FLOAT_1578_OMASA_REND_SPIKES
		MASA_STEREO_DOWNMIX,
		MASA_DUAL_MONO
		#else
		MASA_STEREO_DOWNMIX
		#endif
		} MASA_TRANSPORT_SIGNAL_TYPE;

		typedef enum

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,7 @@
		#define FIX_FLOAT_1539_G192_FORMAT_SWITCH /* Nokia: reintroduce format switching for g192 bitstreams */
		#define FIX_FLOAT_1560_SVD_NO_OPT_MAX_W_SIGN /* FhG: float issue 1560: Avoid optimizing the division on the result of maxWithSign() with -funsafe-math-optimizations */
		#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES /* Dolby: remove unused ISAR */
		#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */

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

		@@ -182,6 +183,7 @@
		#define FIX_1559 /* Eri/FhG: fix for Issue 1559 in FD CNG with bitrate/bw switching */
		#define FIX_FMSW_DEC /* float issue 1542: fix JBM issue in format switching */
		#define FIX_FMSW_DEC_2 /* float issue 1575: fix crash for format switching when bitsream starts with EVS */
		#define FIX_FLOAT_1578_OMASA_REND_SPIKES /* Nokia: Float issue 1578: Fix spikes and collapsed perception in OMASA/MASA rendering to FOA/HOA */

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

lib_dec/ivas_dirac_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -274,7 +274,11 @@ static ivas_error ivas_dirac_rend_config(
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
		}
		}
		#ifdef FIX_FLOAT_1578_OMASA_REND_SPIKES
		ivas_masa_init_stereotype_detection( hDirACRend->masa_stereo_type_detect, ivas_total_brate );
		#else
		ivas_masa_init_stereotype_detection( hDirACRend->masa_stereo_type_detect );
		#endif
		}
		else
		{

lib_enc/ivas_stereo_dft_enc_itd.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -152,7 +152,11 @@ static void stereo_dft_quantize_itd(
		{
		int16_t itd;

		#ifdef FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD
		itd = in;
		#else
		itd = (int16_t) ( sign( in ) * 0.5f + in );
		#endif

		/Limit ITD/
		if ( ( ABSVAL( itd ) > STEREO_DFT_ITD_MAX ) \|\| ( ABSVAL( itd ) < STEREO_DFT_ITD_MIN ) )

lib_rend/ivas_dirac_output_synthesis_dec.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1761,6 +1761,13 @@ void ivas_dirac_dec_compute_directional_responses(
		direct_response[1] = 1.0f;
		}
		}
		#ifdef FIX_FLOAT_1578_OMASA_REND_SPIKES
		else if ( transport_signal_type == MASA_DUAL_MONO )
		{
		direct_response[0] = 1.0f;
		/* direct_response[1] is not adjusted for dual mono input */
		}
		#endif
		else
		{
		set_f( direct_response, 1.0f, hDirACRend->num_protos_ambi );