fix conflict (3a53d1a3) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+2 −102

Original line number	Diff line number	Diff line
		<<<<<<< HEAD
		/******************************************************************************************************

		(C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		@@ -73,11 +72,6 @@
		#define FIX_1378_ACELP_OUT_OF_BOUNDS

		/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

		#define DIV32_OPT_NEWTON /* FhG: faster 32 by 32 bit division */
		#define MERGE_REQ


		//#define OPT_STEREO_32KBPS_V1 /* Optimization made in stereo decoding path for 32kbps decoding */
		#define OPT_AVOID_STATE_BUF_RESCALE /* Optimization made to avoid rescale of synth state buffer */
		#define FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx /FhG: WMOPS tuning, nonbe/
		@@ -90,10 +84,8 @@
		//#define HARM_SCE_INIT
		#define DIV32_OPT_NEWTON /* FhG: faster 32 by 32 bit division */
		#define MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of Cy calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Obsoletes IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE. */
		#define FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat /FhG: reduces WMOPS - bit-exact/
		#define FIX_1439_SPEEDUP_stereo_icBWE_dec_fx /FhG: reduces WMOPS - bit-exact/
		#define FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx /FhG: reduces WMOPS - bit-exact/
		#define FIX_1439_SPEEDUP_synthesise_fb_high_band_fx /FhG: reduces WMOPS - bit-exact/

		#define TEST_HR

		//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic /FhG: reduces maintenance complexity & reduces WMOPS & prepares STAGE2 patch/
		//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_ACTIVATENEW /activates new, spaghetticode version of elliptic_bpf_48k_generic. if inactive, only old code with no opts is active/
		@@ -101,97 +93,5 @@
		//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2 /FhG: reduces WMOPS/
		//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2_TEST_ALLIVAS /Test stage2 macro with all isavas variable = 1 - evs BE test will fail at least/
		//#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_func1

		#endif
		=======
		/******************************************************************************************************

		(C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
		contributors to this repository. All Rights Reserved.

		This software is protected by copyright law and by international treaties.
		The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
		contributors to this repository retain full ownership rights in their respective contributions in
		the software. This notice grants no license of any kind, including but not limited to patent
		license, nor is any license granted by implication, estoppel or otherwise.

		Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
		contributions.

		This software is provided "AS IS", without any express or implied warranties. The software is in the
		development stage. It is intended exclusively for experts who have experience with such software and
		solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
		and fitness for a particular purpose are hereby disclaimed and excluded.

		Any dispute, controversy or claim arising under or in relation to providing this software shall be
		submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
		accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
		the United Nations Convention on Contracts on the International Sales of Goods.

		*******************************************************************************************************/

		/*====================================================================================
		EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0
		====================================================================================*/

		#ifndef OPTIONS_H
		#define OPTIONS_H

		/* clang-format off */

		/* ################### Start DEBUGGING switches ######################## */

		/#define DEBUGGING/ /* Allows debugging message to be printed out during runtime */
		#ifdef DEBUGGING
		#define DEBUG_MODE_INFO /* Define to output most important parameters to the subdirectory "res/" */
		#define DEBUG_MODE_INFO_TWEAK /* Enable command line switch to specify subdirectory for debug info output inside "./res/" */
		#define DEBUG_FORCE_MDCT_STEREO_MODE /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */
		/#define DEBUG_FORCE_DIR/ /* Force modes/parameters by reading from external binary files */
		/#define DBG_WAV_WRITER/ /* Enable dbgwrite_wav() function for generating ".wav" files */
		#define SUPPORT_FORCE_TCX10_TCX20 /* VA: Enable -force tcx10\|tcx20 command-line option */
		#endif

		#define SUPPORT_JBM_TRACEFILE /* Support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */

		/#define WMOPS/ /* Activate complexity and memory counters */
		#ifdef WMOPS
		/#define WMOPS_PER_FRAME/ /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */
		/#define WMOPS_DETAIL/ /* Output detailed complexity printout for every function. Increases runtime overhead */
		/#define WMOPS_WC_FRAME_ANALYSIS/ /* Output detailed complexity analysis for the worst-case frame */
		/#define MEM_COUNT_DETAILS/ /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */
		#endif

		/* #################### End DEBUGGING switches ############################ */

		#ifndef BASOP_NOGLOB_DEV_USE_GLOBALS
		#define BASOP_NOGLOB_DECLARE_LOCAL
		#endif

		#define FIX_867_CLDFB_NRG_SCALE

		#define FIX_1378_ACELP_OUT_OF_BOUNDS

		/* Note: each compile switch (FIX_1101_...) is independent from the other ones */
		//#define OPT_STEREO_32KBPS_V1 /* Optimization made in stereo decoding path for 32kbps decoding */
		#define OPT_AVOID_STATE_BUF_RESCALE /* Optimization made to avoid rescale of synth state buffer */
		#define FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx /FhG: WMOPS tuning, nonbe/
		#define FIX_1310_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot /FhG: WMOPS tuning, nonbe/
		/* Both following 2 macros (IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST) are independent from each other, they refer to different code blocks /
		#define IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE /* FhG: reduces WMOPS of param_mc_prm_est, bit-exact to previous version */
		//#define IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE /* FhG: reduces WMOPS of param_mc_prm_est, not bit-exact to previous version. Obsoleted by MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */
		#define HARM_PUSH_BIT
		#define HARM_ENC_INIT
		//#define HARM_SCE_INIT
		#define DIV32_OPT_NEWTON /* FhG: faster 32 by 32 bit division */
		#define MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of Cy calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Obsoletes IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE. */

		#define TEST_HR

		#endif
		>>>>>>> main