Merge branch 'main' into 1019-socket-interface-for-pose-and-audio (11d10bfe) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+5 −0

Original line number	Diff line number	Diff line
		@@ -569,6 +569,7 @@ renderer-smoke-test:
		- mv IVAS_cod IVAS_cod_ref
		- mv IVAS_dec IVAS_dec_ref
		- mv IVAS_rend IVAS_rend_ref
		- mv ISAR_post_rend ISAR_post_rend_ref
		- testcase_timeout=180

		# test renderer executable with cmake + asan
		@@ -724,6 +725,7 @@ split-rendering-pytest-on-merge-request:
		- mv IVAS_cod IVAS_cod_ref
		- mv IVAS_dec IVAS_dec_ref
		- mv IVAS_rend IVAS_rend_ref
		- mv ISAR_post_rend ISAR_post_rend_ref

		### If ref_using_main is not set, checkout the source branch to use scripts and input from there
		- if [ $ref_using_main == 0 ]; then git restore lib_com/options.h; fi # Revert changes back before checking out another branch to avoid conflicts
		@@ -1249,6 +1251,7 @@ ivas-conformance:
		- cp -force IVAS_cod.exe IVAS_cod_ref.exe
		- cp -force IVAS_dec.exe IVAS_dec_ref.exe
		- cp -force IVAS_rend.exe IVAS_rend_ref.exe
		- cp -force ISAR_post_rend.exe ISAR_post_rend_ref.exe

		# Reference creation
		- python scripts/prepare_combined_format_inputs.py
		@@ -1314,6 +1317,7 @@ ivas-conformance:
		expire_in: 1 week
		when: always
		paths:
		- report_cmd.html
		- report-junit.xml
		- report.html
		- Readme_IVAS_dec.txt
		@@ -1342,6 +1346,7 @@ ivas-conformance-linux:
		- cp IVAS_cod IVAS_cod_ref
		- cp IVAS_dec IVAS_dec_ref
		- cp IVAS_rend IVAS_rend_ref
		- cp ISAR_post_rend ISAR_post_rend_ref

		# Reference creation
		- python3 scripts/prepare_combined_format_inputs.py

+2 −3

Original line number	Diff line number	Diff line
		@@ -2002,13 +2002,13 @@ static ivas_error initOnFirstGoodFrame(
		return error;
		}

		int16_t zeroBuf = malloc( pcmFrameSize sizeof( int16_t ) );
		/* Write zeros to the output audio buffer */
		int16_t *zeroBuf = calloc( pcmFrameSize, sizeof( int16_t ) );
		if ( zeroBuf == NULL )
		{
		fprintf( stdout, "Error: Unable to allocate memory for output buffer.\n" );
		return IVAS_ERR_FAILED_ALLOC;
		}
		memset( zeroBuf, 0, pcmFrameSize * sizeof( int16_t ) );

		for ( int16_t i = 0; i < numInitialBadFrames; ++i )
		{
		@@ -2032,7 +2032,6 @@ static ivas_error initOnFirstGoodFrame(
		}
		else
		{

		if ( pRemainingDelayNumSamples < numOutSamples )
		{
		if ( ( error = AudioFileWriter_write( ppAfWriter, zeroBuf, numOutSamples * pNumOutChannels - ( pRemainingDelayNumSamples * *pNumOutChannels ) ) ) != IVAS_ERR_OK )

+6 −0

Original line number	Diff line number	Diff line
		@@ -3491,14 +3491,20 @@ static void parseCombinedFormatInput(
		inConfig->numAmbisonicsBuses = 1;
		inConfig->ambisonicsBuses[0].audioConfig = audioConfig;
		inConfig->ambisonicsBuses[0].inputChannelIndex = inConfig->numAudioObjects;
		#ifdef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		inConfig->ambisonicsBuses[0].gain_dB = 0.f;
		#else
		inConfig->ambisonicsBuses[0].gain_dB = -6.f;
		#endif
		*configString += 4;

		#ifndef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		/* Modify input gain for objects too */
		for ( int16_t i = 0; i < inConfig->numAudioObjects; ++i )
		{
		inConfig->audioObjects[i].gain_dB = -6.f;
		}
		#endif
		}
		else if ( audioConfig == IVAS_AUDIO_CONFIG_MASA1 \|\| audioConfig == IVAS_AUDIO_CONFIG_MASA2 )
		{

+2 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@
		#endif

		#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 */

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

		@@ -178,6 +179,7 @@
		#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_FIX_TCX5_INTERLEAVING_FOR_FS_IN_UNEQUAL_FS_OUT /* FhG: apply correct TCX5 grouping/interleaving when input_fs != output_fs */
		#define NONBE_1339_FIXOSBA_EXT_LOUDNESS /* FhG: issue 1339: apply scaling with EXT output in OSBA high-BR mode */
		#define NONBE_1352_HARMONIZE_OSBA_LOUDNESS /* FhG: do not scale OSBA inputs by 0.5 any more */

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

+6 −0