Merge remote-tracking branch 'remotes/origin/main' into... (ac3422c5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab/issue_templates/sanitizer_error.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@

		### Bug description

		Clang (msan/asan?) sanitizer test in pipeline found an error:
		Clang (m,a,u)san sanitizer test in pipeline found an error:

		<!--- Copy sanitizer traceback from command line here -->
		```
		@@ -20,7 +20,7 @@ Using the [scripts](https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/wikis/
		<!--- check correct sanitizer type -->
		<!--- add error pattern if needed -->
		```
		python3 scripts/IvasBuildAndRunChecks.py --checks CLANGX -m MODE -p /path/to/my/local/ci_linux_ltv_local.json
		python3 scripts/IvasBuildAndRunChecks.py --checks CLANGX -m MODE -p /path/to/my/local/ci_linux_ltv_local.json --usan_supp_file scripts/ubsan.supp
		```
		or directly:

apps/decoder.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -1619,7 +1619,27 @@ static bool parseCmdlIVAS_dec(
		* Mandatory input arguments
		-----------------------------------------------------------------/

		#ifdef FIX_956_DECODER_COMMAND_LINE_FIX
		if ( i < argc - 4 )
		{
		for ( i = 1; i < argc; i++ )
		{
		if ( argv[i][0] == '-' )
		{
		fprintf( stderr, "Error: Wrong order of command-line arguments (optional arguments are first)\n\n" );
		usage_dec();
		return false;
		}
		}

		fprintf( stderr, "Error: Too many mandatory command-line arguments\n\n" );
		usage_dec();
		return false;
		}
		else if ( i < argc - 3 )
		#else
		if ( i < argc - 3 )
		#endif
		{
		arg->outputConfig = cmdline2config( argv[i] );
		if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

lib_com/ivas_cnst.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -1556,9 +1556,7 @@ typedef enum
		#define MAX_SPLIT_MD_SUBFRAMES 1
		#define COMPLEX_MD_BAND_THRESH MAX_SPLIT_REND_MD_BANDS
		#define COMPLEX_MD_BAND_THRESH_LOW 5
		#ifdef SPLIT_REND_HF_TUNING
		#define SPLIT_REND_RO_MD_BAND_THRESH 4
		#endif

		#define IVAS_SPLIT_REND_NUM_QUANT_STRATS 4
		#define IVAS_SPLIT_REND_PRED_63QUANT_PNTS 63

lib_com/options.h

+5 −6

Original line number	Diff line number	Diff line
		@@ -155,7 +155,10 @@
		#define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange: Missing left/right and coherence late reverb tables in binary format*/
		#define FIX_OLD_BINARY_FORMAT /* Orange: temporary to maintain bitexactness */
		#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */
		#define FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION /* Ericsson: Fix related to issue 667 in IVAS BASOP. Handling of initial lost frame in IVAS causes non-BE on EVS BASOP 26.444 */
		#define FIX_957_REMOVE_PANNING_DEAD_CODE /* VA: Remove obsolete non-diegetic panning related code. */
		#define FIX_956_DECODER_COMMAND_LINE_FIX /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */
		#define FIX_955_FASTCONV_REND_IN_ISM /* VA: put FastConv rendering call under DEBUGGING */

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

		@@ -167,15 +170,11 @@
		#define NONBE_FIX_AVG_IAC_CLDFB_REVERB /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */
		#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/
		#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /* Nokia: issue 944: fix FEC error in OMASA */
		#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER /* Qualcomm: issue 953: fix order or ER channels in LC mode*/
		#define NONBE_FIX_949_MC_5MS_FRAMING /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/
		#define NONBE_FIX_952_MC_PARAMUPMIX_5MS /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/
		#define NONBE_FIX_951_MCMASA_5MS_RENDERING /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps to BINAURAL */

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#define SPLIT_REND_HF_TUNING /* Dlb: issue 950: split rendering MD tuning change at high frequencies*/
		#define SPLIT_REND_MC_FIX_LFE /* Dlb: issue 950: split rendering LFE fix for 7.1 and 5.1 MC mode*/
		#define SPLIT_EXT_REND_FIX_LIMITER_POS /* Dlb: issue 950: fixing limiter position in split rendering mode in external renderer*/
		#endif

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

		/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_binRenderer_internal.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -1535,9 +1535,7 @@ void ivas_binaural_add_LFE(
		{
		int16_t render_lfe, idx_lfe;
		float gain;
		#ifdef SPLIT_REND_MC_FIX_LFE
		float lfe_tc[L_FRAME48k];
		#endif

		if ( st_ivas->hBinRenderer != NULL )
		{
		@@ -1561,17 +1559,10 @@ void ivas_binaural_add_LFE(

		for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ )
		{
		#ifdef SPLIT_REND_MC_FIX_LFE
		v_multc( input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, lfe_tc, output_frame );
		/* copy LFE to left and right channels */
		v_add( output_f[0], lfe_tc, output_f[0], output_frame );
		v_add( output_f[1], lfe_tc, output_f[1], output_frame );
		#else
		v_multc( input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame );
		/* copy LFE to left and right channels */
		v_add( output_f[0], input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[0], output_frame );
		v_add( output_f[1], input_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[1], output_frame );
		#endif
		}
		}