Merge branch 'main' into 1119-split-rendering-crashes-in-jbm (f4d82119) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+6 −6

Original line number	Diff line number	Diff line
		@@ -426,7 +426,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:
		@@ -508,7 +508,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"
		@@ -835,7 +835,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:
		@@ -886,7 +886,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:
		@@ -938,7 +938,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:
		@@ -1220,7 +1220,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
		@@ -1626,6 +1626,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;
		}

		@@ -1662,7 +1674,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

+12 −15

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,19 @@ static void setupWithSingleFormatInput(
		positionProvider->numObjects = args.inConfig.numAudioObjects;
		for ( int16_t i = 0; i < positionProvider->numObjects; ++i )
		{
		/* It is allowed on CLI to have no metadata for an ISM input - skip opening if string is empty or contains "NULL" */
		/* 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" */
		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 );
		if ( isEmptyString( args.inMetadataFilePaths[i] ) \|\| strncmp( charBuf, "NULL", 4 ) == 0 )
		if ( strncmp( charBuf, "NULL", 4 ) == 0 )
		{
		continue;
		}
		@@ -1164,29 +1169,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 +1193,6 @@ int main(
		args.inConfig.audioObjects[i].gain_dB += OMASA_TDREND_MATCHING_GAIN_DB;
		}
		}
		#endif
		}

		IVAS_REND_LfePanMtx lfePanMatrix;
		@@ -2588,6 +2584,7 @@ static CmdlnArgs defaultArgs(
		const char *executableName )
		{
		CmdlnArgs args;
		int16_t i;

		strncpy( args.executableName, executableName, RENDERER_MAX_CLI_ARG_LENGTH );
		clearString( args.inputFilePath );
		@@ -2606,7 +2603,7 @@ static CmdlnArgs defaultArgs(
		args.outConfig.outSetupCustom.num_lfe = 0;
		args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;

		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		for ( i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )
		{
		clearString( args.inMetadataFilePaths[i] );
		}
		@@ -2643,7 +2640,7 @@ static CmdlnArgs defaultArgs(
		args.render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
		args.syncMdDelay = 0;

		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		{
		args.directivityPatternId[i] = 65535;
		}

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 = {