Merge branch 'main' into 744-fix-sofa-to-rom-tables-and-binaural-binary-files (76fabad1) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1371,7 +1371,7 @@ sanitizer-test-masa:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 21 hours
		timeout: 5 hours
		timeout: 7 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS

apps/decoder.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -745,7 +745,7 @@ int main(

		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
		#else
		IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;
		@@ -757,7 +757,7 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -780,7 +780,7 @@ int main(
		#endif

		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -804,7 +804,7 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -826,7 +826,7 @@ int main(
		}
		#endif

		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		#else
		IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv = NULL;
		@@ -837,7 +837,7 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -859,7 +859,7 @@ int main(
		}
		#endif

		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
		#else
		IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin = NULL;
		@@ -870,7 +870,7 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -970,7 +970,7 @@ cleanup:
		#endif
		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
		#else
		IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;
		@@ -980,7 +980,7 @@ cleanup:
		{
		dealloc_HRTF_binary( *hHrtfTD );
		}
		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
		#else
		IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

apps/renderer.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		*******************************************************************************************************/

		#include "lib_rend.h"
		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		#include "ivas_prot_rend.h"
		#endif
		#include <assert.h>
		@@ -761,7 +761,7 @@ int main(
		#endif
		Vector3PairFileReader *referenceVectorReader = NULL;
		hrtfFileReader *hrtfFileReader = NULL;
		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
		@@ -892,7 +892,7 @@ int main(
		}
		}

		#ifndef FIX_BINARY_BINAURAL_READING
		#ifndef NONBE_FIX_BINARY_BINAURAL_READING
		if ( !isEmptyString( args.customHrtfFilePath ) )
		{
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		@@ -1032,13 +1032,13 @@ int main(
		#endif
		#ifdef NONBE_UNIFIED_DECODING_PATHS
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig,
		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		!isEmptyString( args.customHrtfFilePath ),
		#endif
		args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig,
		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		!isEmptyString( args.customHrtfFilePath ),
		#endif
		args.nonDiegeticPan, args.nonDiegeticPanGain, ( args.framing_5ms ) ? 1 : 4 ) ) != IVAS_ERR_OK )
		@@ -1048,7 +1048,7 @@ int main(
		exit( -1 );
		}

		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( !isEmptyString( args.customHrtfFilePath ) )
		{
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		@@ -2227,7 +2227,7 @@ int main(
		free( outInt16Buffer );
		free( outFloatBuffer );

		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		cleanup:
		#endif

		@@ -2262,10 +2262,10 @@ cleanup:
		RotationFileReader_close( &externalOrientationFileReader );
		RotationFileReader_close( &referenceRotReader );
		Vector3PairFileReader_close( &referenceVectorReader );
		#ifndef FIX_BINARY_BINAURAL_READING
		#ifndef NONBE_FIX_BINARY_BINAURAL_READING
		hrtfFileReader_close( &hrtfFileReader );
		#endif
		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( hSetOfHRTF != NULL && *hSetOfHRTF != NULL )
		{
		destroy_SetOfHRTF( *hSetOfHRTF );

lib_com/ivas_error.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ typedef enum
		IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,
		IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,
		IVAS_ERR_INVALID_HRTF,
		#ifdef FIX_BINARY_BINAURAL_READING
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,
		#endif
		IVAS_ERR_INVALID_INPUT_FORMAT,

lib_com/options.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,8 @@
		#define BE_FIX_867_PARAMC_RECONFIG /* FhG: issue #867: fix ParamMC CLDFB buffer dealloc when reconfiguring */
		#define NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING /* Nokia: issue #850: Fixes rare non-valid diffuseness and energy ratio values in 2dir MASA. */

		#define FIX_BINARY_BINAURAL_READING /* Add support reading binaural binary file */
		#define NONBE_FIX_BINARY_BINAURAL_READING /* Add support reading binaural binary file */
		#define NONBE_FIX_MDCT_STEREO_DTX_MONO_OUT /* FhG: fix clicks in DTX -> active transition frames in MDCT-Stereo with mono output */

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