Merge branch 'main' into basop-1966-improve-tonal-detection-accuracy-using-32bit (b3f5c8ce) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_dec.vcxproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -321,7 +321,6 @@
		<ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h" />
		<ClInclude Include="..\lib_dec\jbm_jb4_jmf.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_window.h" />
		<ClInclude Include="..\lib_dec\lib_dec.h" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −3

Original line number	Diff line number	Diff line
		@@ -515,9 +515,6 @@
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h">
		<Filter>decoder_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h">
		<Filter>decoder_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h">
		<Filter>decoder_h</Filter>
		</ClInclude>

apps/decoder.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -464,6 +464,7 @@ int main(
		}
		}

		#ifndef FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT
		/-----------------------------------------------------------------
		* Print config information
		-----------------------------------------------------------------/
		@@ -473,6 +474,7 @@ int main(
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#endif

		/-------------------------------------------------------------------
		* Load renderer configuration from file
		@@ -666,6 +668,18 @@ int main(
		hHrtfBinary.hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;
		}

		#ifdef FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT
		/-----------------------------------------------------------------
		* Print config information
		-----------------------------------------------------------------/

		if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg.voipMode ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#endif

		/------------------------------------------------------------------------------------------
		* Allocate output data buffer
		------------------------------------------------------------------------------------------/

lib_com/options.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@
		#define FIX_1585_ASAN_FORMAT_SW_ALT /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */
		#define FIX_BASOP_2573_RF_MODE_UPDATE /* FhG: BASOP issue 2573: remove duplicated update of rf_mode parameters from evs_enc_fx(); was already done in updt_enc_common_fx() */
		#define FIX_2570_BUF_OVFL /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */
		#define FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT /* Dolby: float issue 1550: Wrong render framesize printout */

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

		@@ -133,6 +134,11 @@
		#define FIX_FLOAT_1578_OMASA_REND_SPIKES /* Nokia: Float issue 1578: Fix spikes and collapsed perception in OMASA/MASA rendering to FOA/HOA */
		#define FIX_1521_SBA_LOUDNESS_STEREO /* FhG: issue 1521: Fix loudness for SBA to stereo rendering */
		#define FIX_1559 /* Eri/FhG: fix for Issue 1559 in FD CNG with bitrate/bw switching */
		#define FIX_BASOP_2571_MASA_EXT_RENDER_FIXES /* Nokia: BASOP issue 2571: Fix MASA EXT DirAC renderer by unifying it with decoder */
		#define NONBE_FIX_2575 /* Fhg: Fix issue 2575, precision loss in FD CNG */
		#define FIX_2584_TD_SM_ISSUE /* VA: Fix inconsistencies in the SM part of the TD stereo */
		#define FIX_2556_ALIGN_CONDITIONS /* VA: Fix different conditions that were not exact between float and fix, BE on self-test */
		#define FIX_NONBE_2579_INCORRECT_LAG_CALCULATION /* Dolby: fix 2579: Incorrect lag calculation */

		/* Macros for issue 1966 are independent, phase diff is always BE for EVS_MONO */
		/* The changes for F0+thdModification are mainly for IVAS better float compatibility, */

lib_dec/FEC_scale_syn_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -265,7 +265,11 @@ void FEC_scale_syn_fx(
		ener_max = lp_ener_FEC_max; /Q0*/
		move32();
		test();
		#ifdef FIX_2556_ALIGN_CONDITIONS
		if ( ( LE_16( clas, VOICED_TRANSITION ) && element_mode > EVS_MONO ) \|\| EQ_16( clas, VOICED_TRANSITION ) \|\| ( GE_16( clas, INACTIVE_CLAS ) ) )
		#else
		if ( EQ_16( clas, VOICED_TRANSITION ) \|\| ( GE_16( clas, INACTIVE_CLAS ) ) )
		#endif
		{
		ener_max = lp_ener_FEC_av; /Q0*/
		move32();