Merge branch 'main' of ssh://forge.3gpp.org:29419/ivas-codec-pc/ivas-codec... (6902f9e8) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+7 −7

Original line number	Diff line number	Diff line
		@@ -430,7 +430,7 @@ codec-smoke-test:
		- if cat smoke_test_output_hrtf.txt \| grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val=1; fi
		- exit $ret_val
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		expire_in: 1 week
		when: always
		paths:
		@@ -512,7 +512,7 @@ pytest-compare-20ms-and-5ms-rendering:
		- if [ $exit_code10 -ne 0 ]; then echo "Non-bitexact cases encountered with 10ms rendering!"; exit_code=1; fi
		- if [ $exit_code -ne 0 ]; then exit $EXIT_CODE_FAIL; fi
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		expire_in: 1 week
		when: always
		expose_as: "pytest 5ms and 10ms vs 20ms results"
		@@ -554,7 +554,7 @@ renderer-smoke-test:
		- .rules-merge-request-to-main
		needs: ["build-codec-linux-cmake"]
		stage: test
		timeout: "30 minutes"
		timeout: "1 hour"
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		expire_in: 1 week
		@@ -817,7 +817,7 @@ ivas-pytest-on-merge-request:
		exit_codes:
		- 123
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		expire_in: 1 week
		when: always
		paths:
		@@ -868,7 +868,7 @@ ivas-interop-on-merge-request:
		exit_codes:
		- 123
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		expire_in: 1 week
		when: always
		paths:
		@@ -920,7 +920,7 @@ evs-pytest-on-merge-request:
		exit_codes:
		- 123
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		expire_in: 1 week
		when: always
		paths:
		@@ -1202,7 +1202,7 @@ codec-comparison-on-main-push:
		exit_codes:
		- 123
		artifacts:
		name: "main-push--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		name: "main-push--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		expire_in: 1 week
		when: always
		paths:

apps/decoder.c

+14 −1

Original line number	Diff line number	Diff line
		@@ -1617,6 +1617,18 @@ static bool parseCmdlIVAS_dec(
		return false;
		}

		#ifdef SUPPORT_JBM_TRACEFILE
		/* Validate options that depend on other options */
		if ( arg->jbmTraceFilename != NULL && arg->delayCompensationEnabled
		/* This decMode check should be removed once timestamp sync issues between JBM trace and audio are fixed in EVS */
		&& arg->decMode != IVAS_DEC_MODE_EVS )
		{
		fprintf( stderr, "Error: Writing to a JBM trace file requires delay compensation to be disabled with -no_delay_cmp\n\n" );
		usage_dec();
		return false;
		}
		#endif

		return true;
		}

		@@ -1653,7 +1665,8 @@ static void usage_dec( void )
		fprintf( stdout, " EVS RTP Payload Format. The SDP parameter hf_only is required.\n" );
		fprintf( stdout, " Reading RFC4867 AMR/AMR-WB RTP payload format is not supported.\n" );
		#ifdef SUPPORT_JBM_TRACEFILE
		fprintf( stdout, "-Tracefile TF : VoIP mode: Generate trace file named TF\n" );
		fprintf( stdout, "-Tracefile TF : VoIP mode: Generate trace file named TF. Requires -no_delay_cmp to\n" );
		fprintf( stdout, " be enabled so that trace contents remain in sync with audio output.\n" );
		#endif
		#ifdef DEBUGGING
		#ifdef VARIABLE_SPEED_DECODING

apps/renderer.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -68,9 +68,7 @@
		#define IVAS_MAX16B_FLT 32767.0f
		#define IVAS_MIN16B_FLT ( -32768.0f )

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		#define OMASA_TDREND_MATCHING_GAIN_DB ( -2.0f )
		#endif

		#if !defined( DEBUGGING ) && !defined( WMOPS )
		static
		@@ -1164,29 +1162,21 @@ int main(
		}
		}

		#ifndef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the total number of objects */
		#endif
		if ( args.inConfig.numAudioObjects > 0 )
		{
		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the total number of objects */
		#endif
		if ( ( error = IVAS_REND_SetTotalNumberOfObjects( hIvasRend, args.inConfig.numAudioObjects ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_SetTotalNumberOfObjects(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the metadata delay for objects */
		#endif
		if ( ( error = IVAS_REND_SetIsmMetadataDelay( hIvasRend, args.syncMdDelay ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_SetIsmMetadataDelay(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS

		/* For OMASA input and BINAURAL output, apply a gain to objects to match the loudness with MASA part */
		if ( args.inConfig.numMasaBuses > 0 && args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL )
		@@ -1196,7 +1186,6 @@ int main(
		args.inConfig.audioObjects[i].gain_dB += OMASA_TDREND_MATCHING_GAIN_DB;
		}
		}
		#endif
		}

		IVAS_REND_LfePanMtx lfePanMatrix;

lib_com/options.h

+3 −4

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@
		/#define DEBUG_JBM_CMD_OPTION/ /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */
		/#define VARIABLE_SPEED_DECODING/ /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */
		/#define DISABLE_LIMITER/ /* disable the limiter */
		/#define DEBUG_APA_SILENCE_NON_SCALED/ /* Switch APA into mode that replaces contents of non-scaled frames with silence. Useful for identifying scaled regions in the audio output of the decoder */

		/Split Rendering Debug switches/
		/#define DBG_WAV_WRITER/ /* add debugging function dbgwrite_wav() */
		@@ -162,7 +163,7 @@

		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
		#define CODE_IMPROVEMENTS /* FhG: Small code improvements that do not change the functionality */
		#define FIX_1348_OVERFLOW /* FhG: fix BASOP overflow in hq_lr_dec(), brings floating-point code inline with FX */

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

		@@ -173,9 +174,7 @@

		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
		#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */
		#define NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS /* Nokia: issue 1339: Apply scaling to the object-part of OMASA for binaural rendering in IVAS_rend. */
		#define NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING /* Nokia: Fix OMASA to MASA1 rendering in IVAS_rend */
		#define NONBE_1360_LFE_DELAY /* Dlb: LFE delay alignment when rendering in CLDFB domain*/
		#define NONBE_SVD_OPTIMIZATION

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

lib_com/tools.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -1742,27 +1742,11 @@ double anint(
		int16_t is_numeric_float(
		float x )
		{
		#ifdef CODE_IMPROVEMENTS
		int16_t retval;
		#define WMC_TOOL_SKIP
		retval = (int16_t) ( !isnan( x ) && !isinf( x ) );
		#undef WMC_TOOL_SKIP
		return retval;
		#else
		#ifndef BASOP_NOGLOB
		union float_int
		#else /* BASOP_NOGLOB */
		union float_int
		#endif /* BASOP_NOGLOB */
		{
		float float_val;
		int32_t int_val;
		} float_int;

		float_int.float_val = x;

		return ( ( float_int.int_val & 0x7f800000 ) != 0x7f800000 );
		#endif
		}

		/-------------------------------------------------------------------