Merge remote-tracking branch 'origin' into basop-2493-usage-of-extract_l-with-values-out-of-range (7790f560) · Commits · SA4 / Audio / IVAS BASOP

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

100644 → 100755

+7 −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 ################################## */

		@@ -143,7 +144,13 @@
		#define NONBE_FIX_2493_CHECK_EXTRACT_L_GetTCXMaxenergyChange_fx /* FhG: Fix extract_l overflow inside GetTCXMaxenergyChange_fx() */
		#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, */
		/* for EVS_MONO, all is kept BE. */
		#define FIX_ISSUE_1966_PHASE_DIFF /* FhG: Basop issue 1966: shift phase range to [-2PI..+2PI[, handle 4 quadrants */
		#define FIX_ISSUE_1966_F0_32BIT /* FhG: Basop issue 1966: use 32-bit variables for F0 and thresholdModification */
		/* ##################### End NON-BE switches ########################### */

		/* ################## End MAINTENANCE switches ######################### */

lib_dec/TonalComponentDetection_fx.c

+426 −33

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/er_util_fx.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@
		#include <assert.h>
		#include "ivas_prot_fx.h"


		/* static void setnoiseLevelMemory_fx()
		*
		* Helper function - updates buffer for minimumStatistics_fx function

lib_dec/ivas_mdct_core_dec_fx.c

100644 → 100755

+0 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@
		#include "basop_proto_func.h"
		#include "ivas_prot_fx.h"


		/-----------------------------------------------------------------
		* Function mdct_read_IGF_bits()
		*