Merge branch 'main' into 967-ism-mono-downmix-accumulating-energies (8840282e) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+2 −1

Original line number	Diff line number	Diff line
		@@ -1267,10 +1267,11 @@ test-long-self-test:
		- ivas-linux-fast
		artifacts:
		name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA"
		expire_in: 1 week
		expire_in: 2 weeks
		when: always
		paths:
		- ep_015.g192
		- dly_profile.dat
		- ./LOGS_PLC
		- ./LOGS_noPLC

+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:

+24 −0

Original line number	Diff line number	Diff line
		@@ -797,6 +797,18 @@ int main(
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_OLD_BINARY_FORMAT
		cleanup_SetOfHRTF( hSetOfHRTF );
		hrtfFileReader_close( &hrtfReader );
		strcat( arg.hrtfFileName, "new" );

		if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		@@ -807,6 +819,18 @@ int main(
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		}
		#else
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		#endif
		}
		#else
		if ( ( error = create_SetOfHRTF_from_binary( hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{

+23 −0

Original line number	Diff line number	Diff line
		@@ -1094,6 +1094,28 @@ int main(

		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_OLD_BINARY_FORMAT
		cleanup_SetOfHRTF( hSetOfHRTF );
		hrtfFileReader_close( &hrtfFileReader );
		strcat( args.customHrtfFilePath, "new" );
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
		goto cleanup;
		}
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s:%s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
		goto cleanup;
		}
		else
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		}
		#else
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s:%s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
		@@ -1103,6 +1125,7 @@ int main(
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		#endif
		}

		if ( ( error = IVAS_REND_GetHrtfFastConvHandle( hIvasRend, &hHrtfFastConv ) ) != IVAS_ERR_OK )

+4 −1

Original line number	Diff line number	Diff line
		@@ -155,6 +155,9 @@
		#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_WARNING_SPLIT_RENDER /* Orange: fix warning on windows build vscode */
		#define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural reverb*/
		#define FIX_20_MS_FRAME_LEN_TABLES_CONVERTER /* Orange : generate_tables_converter tools can generate rom for 5 and 20 ms frame length */
		#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. */