Merge remote-tracking branch 'remotes/origin/main' into 1328-issue-when-computing-bwe_exc_extended (4faf48d1) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+19 −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
		@@ -566,12 +564,27 @@ static void setupWithSingleFormatInput(
		positionProvider->numObjects = args.inConfig.numAudioObjects;
		for ( int16_t i = 0; i < positionProvider->numObjects; ++i )
		{
		#ifdef FIX_1376_MISSING_ISM_METADATA
		/* Check if path to metadata file was given */
		if ( isEmptyString( args.inMetadataFilePaths[i] ) )
		{
		fprintf( stderr, "No metadata file was given for ISM input %d\n", i );
		exit( -1 );
		}

		/* It is allowed on CLI to have no metadata for an ISM input - skip opening if string contains "NULL" */
		#else
		/* It is allowed on CLI to have no metadata for an ISM input - skip opening if string is empty or contains "NULL" */
		#endif
		char charBuf[FILENAME_MAX];
		strncpy( charBuf, args.inMetadataFilePaths[i], min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1 );
		charBuf[min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1] = '\0';
		to_upper( charBuf );
		#ifdef FIX_1376_MISSING_ISM_METADATA
		if ( strncmp( charBuf, "NULL", 4 ) == 0 )
		#else
		if ( isEmptyString( args.inMetadataFilePaths[i] ) \|\| strncmp( charBuf, "NULL", 4 ) == 0 )
		#endif
		{
		continue;
		}
		@@ -1164,29 +1177,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 +1201,6 @@ int main(
		args.inConfig.audioObjects[i].gain_dB += OMASA_TDREND_MATCHING_GAIN_DB;
		}
		}
		#endif
		}

		IVAS_REND_LfePanMtx lfePanMatrix;
		@@ -2606,7 +2610,11 @@ static CmdlnArgs defaultArgs(
		args.outConfig.outSetupCustom.num_lfe = 0;
		args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;

		#ifdef FIX_1376_MISSING_ISM_METADATA
		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )
		#else
		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		#endif
		{
		clearString( args.inMetadataFilePaths[i] );
		}

ci/basop-pages/basop_index.html

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,10 @@
		<body>
		<h1>Ivas BASOP code Development</h1>

		<h2>Regression tracking</h2>

		<li><a href="long_term_regression.html">Long term regression</a></li>

		<h2>Daily long testvector tests</h2>

		<ul>

ci/setup_pages.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ JOBS_BASOP_REPO = {
		"complexity-stereo-in-stereo-out": "Stereo in, Stereo out",
		# "timeless" jobs (not complexity)
		"coverage-test-on-main-scheduled": "Coverage",
		"ivas-long-term-job-logs-overview": "Long term logs",
		}

		JOBS_FOR_PROJECT_ID = {

lib_com/options.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -163,8 +163,9 @@

		/#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 */
		#define FIX_1369_HQ_LR_OVERFLOW /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */
		#define FIX_1376_MISSING_ISM_METADATA /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */

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

		@@ -175,9 +176,6 @@

		#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

		#define NONBE_1328_FIX_NON_LINEARITY /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0 */

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
		}

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

Admin message