Merge branch 'float-pc' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop... (cb11301f) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+6 −3

Original line number	Diff line number	Diff line
		@@ -12,13 +12,15 @@ variables:
		LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
		SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
		TEST_SUITE: ""
		DISABLE_HRTF_MODEL_TESTS: ""
		# DISABLE_HRTF_MODEL_TESTS: "-k not model" #enable this declaration to disable HRTF model from file tests
		DUT_ENCODER_PATH: "./IVAS_cod"
		DUT_DECODER_PATH: "./IVAS_dec"
		REF_ENCODER_PATH: "./IVAS_cod_ref"
		REF_DECODER_PATH: "./IVAS_dec_ref"
		LEVEL_SCALING: "1.0"
		IVAS_PIPELINE_NAME: ''
		BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
		BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch-pc"
		PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
		TESTCASE_TIMEOUT_STV: 900
		TESTCASE_TIMEOUT_LTV: 2400
		@@ -241,6 +243,7 @@ stages:
		- git checkout "$BASOP_CI_BRANCH_PC_REPO"
		- git reset --hard origin/"$BASOP_CI_BRANCH_PC_REPO"
		- git pull

		- cd -
		- cp -r $SCRIPTS_DIR/ci .
		- cp -r $SCRIPTS_DIR/scripts .
		@@ -2031,7 +2034,7 @@ ivas-pytest-on-merge-request:

		### prepare pytest
		# create references
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 $DISABLE_HRTF_MODEL_TESTS

		### Run test using branch scripts and input
		- if [ $ref_using_target == 1 ]; then git checkout $source_branch_commit_sha; fi
		@@ -2039,7 +2042,7 @@ ivas-pytest-on-merge-request:
		### run pytest
		- exit_code=0
		- testcase_timeout=60
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout \|\| exit_code=$?
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout $DISABLE_HRTF_MODEL_TESTS \|\| exit_code=$?
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true

		- *merge-request-comparison-check

apps/decoder.c

+8 −56

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

		if ( ( error = IVAS_DEC_SetRenderFramesize( hIvasDec, arg.renderFramesize ) ) != IVAS_ERR_OK )
		{
		return error;
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( arg.renderFramesize != asked_frame_size )
		@@ -732,32 +733,8 @@ int main(
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		#ifdef FIX_OLD_BINARY_FORMAT
		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 = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != 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 );
		goto cleanup;
		}
		else
		{
		destroy_td_hrtf( hHrtfTD );
		}
		}
		#else
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		#endif
		}
		else
		{
		@@ -766,7 +743,6 @@ int main(
		}

		#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -775,7 +751,6 @@ int main(
		goto cleanup;
		}
		}
		#endif
		#endif

		if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		@@ -786,29 +761,6 @@ int main(

		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 );
		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 \n\n", arg.hrtfFileName );
		@@ -818,7 +770,6 @@ int main(
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		#endif
		}

		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		@@ -863,7 +814,6 @@ int main(


		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -882,12 +832,14 @@ int main(
		}
		}
		#else
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		if ( ( hHrtfTD != NULL ) && ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != 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 );
		goto cleanup;
		}
		#endif
		}
		#endif
		}

apps/isar_post_rend.c

+70 −62

Original line number	Diff line number	Diff line
		@@ -678,19 +678,20 @@ int main(
		int argc,
		char **argv )
		{
		ISAR_POST_REND_HANDLE hIsarPostRend;
		bool mainFailed = true; /* Assume main failed until cleanup is reached without errors */
		ISAR_POST_REND_HANDLE hIsarPostRend = NULL;
		RotFileReader *headRotReader = NULL;
		RotFileReader *externalOrientationFileReader = NULL;
		SplitRendBFIFileReader *splitRendBFIReader = NULL;
		AudioFileReader *audioReader = NULL;
		AudioFileWriter *audioWriter;
		AudioFileWriter *audioWriter = NULL;
		int32_t inBufferSize;
		int32_t outBufferSize;
		int32_t bitsBufferSize;
		int16_t *inpInt16Buffer;
		float *inFloatBuffer;
		int16_t *outInt16Buffer;
		float *outFloatBuffer;
		int16_t *inpInt16Buffer = NULL;
		float *inFloatBuffer = NULL;
		int16_t *outInt16Buffer = NULL;
		float *outFloatBuffer = NULL;
		uint8_t *bitsBufferData = NULL;
		IVAS_REND_AudioBuffer inBuffer;
		IVAS_REND_AudioBuffer outBuffer;
		@@ -734,8 +735,8 @@ int main(
		{
		if ( RotationFileReader_open( args.headRotationFilePath, &headRotReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error opening file: %s\n", args.headRotationFilePath );
		exit( -1 );
		fprintf( stderr, "\nError opening file: %s\n", args.headRotationFilePath );
		goto cleanup;
		}
		}

		@@ -760,14 +761,14 @@ int main(
		&bitsBuffer.config.lc3plusHighRes );
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "Could not open split rend metadata file %s\n", args.inMetadataFilePaths[0] );
		exit( -1 );
		fprintf( stderr, "\nCould not open split rend metadata file %s\n", args.inMetadataFilePaths[0] );
		goto cleanup;
		}

		if ( AudioFileReader_open( &audioReader, audioFilePath ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error opening file: %s\n", audioFilePath );
		exit( -1 );
		fprintf( stderr, "\nError opening file: %s\n", audioFilePath );
		goto cleanup;
		}
		}

		@@ -784,8 +785,8 @@ int main(
		&bitsBuffer.config.lc3plusHighRes );
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "Could not open split rend metadata file %s\n", args.inputFilePath );
		exit( -1 );
		fprintf( stderr, "\nCould not open split rend metadata file %s\n", args.inputFilePath );
		goto cleanup;
		}
		audioReader = NULL;
		}
		@@ -810,20 +811,20 @@ int main(
		/* else if sampling rate given on command line, compare with wav file */
		else if ( inFileSampleRate != args.sampleRate )
		{
		fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath );
		exit( -1 );
		fprintf( stderr, "\nSampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath );
		goto cleanup;
		}
		break;
		case IVAS_ERR_SAMPLING_RATE_UNKNOWN: /* Returned when input is raw PCM */
		if ( args.sampleRate == 0 )
		{
		fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" );
		exit( -1 );
		fprintf( stderr, "\nSampling rate must be specified on command line when using raw PCM input\n" );
		goto cleanup;
		}
		break;
		default:
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		int16_t inFileNumChannels = 0;
		@@ -832,23 +833,24 @@ int main(
		error = AudioFileReader_getNumChannels( audioReader, &inFileNumChannels );
		if ( error != IVAS_ERR_OK && error != IVAS_ERR_NUM_CHANNELS_UNKNOWN )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nAudioFileReader_getNumChannels failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}

		const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );
		args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_BINAURAL;
		if ( ( error = ISAR_POST_REND_open( &hIsarPostRend, args.sampleRate, args.outConfig.audioConfig, true, 0, 0.0, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error opening renderer handle: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError opening renderer handle: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		/* === Configure === */
		if ( ( error = ISAR_POST_REND_InitConfig( hIsarPostRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in Renderer Config Init: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError in Renderer Config Init: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		if ( args.inConfig.numBinBuses > 0 )
		@@ -860,12 +862,11 @@ int main(
		bitsBuffer.config.isar_frame_size_ms,
		bitsBuffer.config.lc3plusHighRes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in getting split renderer bitstream header: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError in getting split renderer bitstream header: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}


		ISAR_POST_REND_InputId splitBinIds[RENDERER_MAX_BIN_INPUTS];

		for ( i = 0; i < RENDERER_MAX_BIN_INPUTS; i++ )
		@@ -877,8 +878,8 @@ int main(
		{
		if ( ( error = ISAR_POST_REND_AddInput( hIsarPostRend, args.inConfig.binBuses[i].audioConfig, &splitBinIds[i] ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nISAR_POST_REND_AddInput failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}

		@@ -886,16 +887,16 @@ int main(

		if ( inFileNumChannels != 0 /* inFileNumChannels is 0 with raw PCM input */ && totalNumInChannels != inFileNumChannels )
		{
		fprintf( stderr, "Number of channels in input file does not match selected configuration\n" );
		exit( -1 );
		fprintf( stderr, "\nNumber of channels in input file does not match selected configuration\n" );
		goto cleanup;
		}

		int16_t numOutChannels = 2;

		if ( AudioFileWriter_open( &audioWriter, args.outputFilePath, args.sampleRate, numOutChannels ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to open file: %s\n", args.outputFilePath );
		exit( -1 );
		fprintf( stderr, "\nFailed to open file: %s\n", args.outputFilePath );
		goto cleanup;
		}

		inBufferSize = frameSize_smpls * totalNumInChannels;
		@@ -970,7 +971,7 @@ int main(
		else
		{
		fprintf( stderr, "\nUnable to read from bitstream file!\n" );
		exit( -1 );
		goto cleanup;
		}
		}
		}
		@@ -981,7 +982,7 @@ int main(
		if ( ( error = AudioFileReader_read( audioReader, inpInt16Buffer, (int16_t) inBufferSize, &numSamplesRead ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError reading from file %s\n", audioFilePath );
		exit( -1 );
		goto cleanup;
		}
		}

		@@ -1007,21 +1008,21 @@ int main(

		if ( ( error = HeadRotationFileReading( headRotReader, &headRot, &Pos ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		if ( ( error = ISAR_POST_REND_SetHeadRotation( hIsarPostRend, headRot, Pos, DEFAULT_AXIS, sf_idx ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError setting Head Rotation: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		}
		else
		{
		fprintf( stderr, "Head Rotation should be enabled in post renderer\n" );
		exit( -1 );
		fprintf( stderr, "\nHead Rotation should be enabled in post renderer\n" );
		goto cleanup;
		}

		/* Read from split renderer bfi file if specified */
		@@ -1030,14 +1031,14 @@ int main(
		int16_t bfi;
		if ( ( error = SplitRendBFIFileReading( splitRendBFIReader, &bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in SplitRendBFIFileReading(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError in SplitRendBFIFileReading(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}

		@@ -1047,31 +1048,31 @@ int main(
		{
		if ( ( error = ISAR_POST_REND_GetInputNumChannels( hIsarPostRend, splitBinIds[i], &numChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nISAR_POST_REND_GetInputNumChannels failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		ISAR_POST_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.binBuses[i].inputChannelIndex, numChannels );

		if ( ( error = ISAR_POST_REND_FeedInputAudio( hIsarPostRend, splitBinIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nISAR_POST_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		if ( splitBinNeedsNewFrame )
		{
		if ( ( error = ISAR_POST_REND_FeedSplitBinauralBitstream( hIsarPostRend, splitBinIds[i], &bitsBuffer ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nISAR_POST_REND_FeedSplitBinauralBitstream failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		}

		if ( ( error = ISAR_POST_REND_GetSplitBinauralSamples( hIsarPostRend, outBuffer, &splitBinNeedsNewFrame ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nISAR_POST_REND_GetSplitBinauralSamples failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		int16_t num_out_channels;
		@@ -1088,7 +1089,7 @@ int main(
		if ( ISAR_POST_REND_GetDelay( hIsarPostRend, &delayNumSamples, &delayTimeScale ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to get delay of renderer!\n" );
		exit( -1 );
		goto cleanup;
		}

		if ( hSplitRendFileReadWrite != NULL )
		@@ -1113,8 +1114,8 @@ int main(
		{
		if ( AudioFileWriter_write( audioWriter, &outInt16Buffer[delayNumSamples * num_out_channels], outBufferSize - ( delayNumSamples * num_out_channels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error writing audio file %s\n", args.outputFilePath );
		exit( -1 );
		fprintf( stderr, "\nError writing audio file %s\n", args.outputFilePath );
		goto cleanup;
		}
		delayNumSamples = 0;
		}
		@@ -1148,7 +1149,7 @@ int main(
		if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, outBufferSize ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nOutput audio file writer error\n" );
		exit( -1 );
		goto cleanup;
		}
		}

		@@ -1156,7 +1157,7 @@ int main(
		if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, zeroPadToWrite * outBuffer.config.numChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nOutput audio file writer error\n" );
		exit( -1 );
		goto cleanup;
		}
		zeroPadToWrite = 0;
		}
		@@ -1180,7 +1181,14 @@ int main(
		}
		#endif

		/* === Close === */
		/------------------------------------------------------------------------------------------
		* Close files and deallocate resources
		------------------------------------------------------------------------------------------/

		mainFailed = false; /* This will stay set to true if cleanup is reached via a goto due to an error */

		cleanup:

		free( inpInt16Buffer );
		free( inFloatBuffer );
		free( outInt16Buffer );
		@@ -1209,7 +1217,7 @@ int main(
		print_mem( NULL );
		#endif

		return 0;
		return mainFailed ? -1 : 0;
		}

apps/renderer.c

+230 −298

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/options.h

+2 −15

Original line number	Diff line number	Diff line
		@@ -184,23 +184,10 @@
		#define FIX_960_SYN_OUTPUT /* VA: issue 960: unused function syn_output() is removed */

		#define USE_NEW_HRTF_BINARY_FILE_FORMAT /* Orange: to activate when decided to change the hrtf binary file format */
		#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
		#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers */
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange: Missing left/right and coherence late reverb tables in binary format */
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		#define NONBE_FIX_AVG_IAC_CLDFB_REVERB
		#endif
		#endif
		#define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange: Missing left/right and coherence late reverb tables in binary format*/
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		#define NONBE_FIX_AVG_IAC_CLDFB_REVERB
		#endif
		#define FIX_OLD_BINARY_FORMAT /* Orange: trick to make tests succesful when changing hrtf binary format between ref and new branch*/
		#define FIX_OLD_BINARY_FILE /* Orange: current hrtf binary file in ref branch contains wrong values for fastconv value. This switch can be activated to compre running codec with and without hrtf file*/
		//#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers */
		//#define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange: Missing left/right and coherence late reverb tables in binary format */
		#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */
		#define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural */
		#endif

		#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions */
		//#define FIX_777_COMBI_RENDER_CONFIG_FILE /* Philips: Fix for combined renderer config file support */