make step4 = step3 + new tests (7c9450f1) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+115 −3

Original line number	Diff line number	Diff line
		@@ -206,6 +206,10 @@ int main(
		#ifdef NONBE_UNIFIED_DECODING_PATHS
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		#endif
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
		#endif
		#ifdef DEBUGGING
		int32_t noClipping;
		int32_t cnt_frames_limited;
		@@ -746,7 +750,9 @@ int main(

		if ( arg.hrtfReaderEnabled )
		{
		#ifndef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;
		#endif

		if ( ( error = IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ) ) != IVAS_ERR_OK )
		{
		@@ -754,50 +760,143 @@ int main(
		goto cleanup;
		}

		#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 )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		#ifdef FIX_OLD_BINARY_FORMAT
		destroy_td_hrtf( hHrtfTD );
		#else
		goto cleanup;
		#endif
		}
		else
		{
		destroy_td_hrtf( hHrtfTD );
		}
		}
		#else
		if ( ( error = load_HRTF_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		#endif

		IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		#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 )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		}
		#else
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		#endif
		#endif

		#ifndef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
		#endif
		if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( ( error = create_SetOfHRTF_from_binary( hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		#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 )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		}
		#else
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s for CRend \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		#endif

		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		#else
		IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv = NULL;
		#endif
		if ( ( error = IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfFastConvHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#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 )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_fastconv_hrtf( hHrtfFastConv );
		}
		}
		#else
		if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		#endif

		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
		#else
		IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin = NULL;
		#endif
		if ( ( error = IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfParamBinHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#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 )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_parambin_hrtf( hHrtfParambin );
		}
		}
		#else
		if ( ( error = load_parambin_HRTF_from_binary( hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s for parametric binauralizer \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		#endif
		}

		/------------------------------------------------------------------------------------------
		@@ -878,12 +977,25 @@ cleanup:
		#endif
		if ( arg.hrtfReaderEnabled )
		{
		#ifndef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;
		#endif
		IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );
		dealloc_HRTF_binary( hHrtfTD );
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		destroy_td_hrtf( hHrtfTD );
		#else
		dealloc_HRTF_binary( *hHrtfTD );
		#endif

		#ifndef NONBE_FIX_BINARY_BINAURAL_READING
		IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;
		#endif
		IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		destroy_SetOfHRTF( hSetOfHRTF );
		#else
		destroy_SetOfHRTF( *hSetOfHRTF );
		#endif
		}

		IVAS_DEC_Close( &hIvasDec );

apps/renderer.c

+142 −2

Original line number	Diff line number	Diff line
		@@ -760,6 +760,12 @@ int main(
		#endif
		Vector3PairFileReader *referenceVectorReader = NULL;
		hrtfFileReader *hrtfFileReader = NULL;
		#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;
		IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
		#endif
		IsmPositionProvider *positionProvider;
		LfeRoutingConfig *lfeRoutingConfigs[RENDERER_MAX_MC_INPUTS];
		RenderConfigReader *renderConfigReader = NULL;
		@@ -812,6 +818,10 @@ int main(

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		hSplitRendFileReadWrite = NULL;
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		CLDFBframeSize_smpls = 0;
		cldfb_in_flag = 0;
		#endif
		#endif
		for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )
		{
		@@ -885,6 +895,7 @@ int main(
		}
		}

		#ifndef NONBE_FIX_BINARY_BINAURAL_READING
		if ( !isEmptyString( args.customHrtfFilePath ) )
		{
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		@@ -893,6 +904,7 @@ int main(
		exit( -1 );
		}
		}
		#endif

		if ( !isEmptyString( args.renderConfigFilePath ) )
		{
		@@ -1023,15 +1035,130 @@ int main(
		#endif

		#ifdef NONBE_UNIFIED_DECODING_PATHS
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )

		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ),
		#else
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, args.nonDiegeticPan, args.nonDiegeticPanGain, ( args.framing_5ms ) ? 1 : 4 ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig,
		#endif
		args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		#else
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING

		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ),
		#else
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig,
		#endif
		args.nonDiegeticPan, args.nonDiegeticPanGain, ( args.framing_5ms ) ? 1 : 4 ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Error opening renderer handle: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}

		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		if ( !isEmptyString( args.customHrtfFilePath ) )
		{
		if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error opening file: %s\n", args.customHrtfFilePath );
		exit( -1 );
		}

		if ( hrtfFileReader != NULL )
		{
		if ( ( error = IVAS_REND_GetHrtfHandle( hIvasRend, &hHrtfTD ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_GetHrtfHandle failed\n\n" );
		goto cleanup;
		}

		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		goto cleanup;
		}
		else
		{
		destroy_td_hrtf( hHrtfTD );
		}
		}

		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		goto cleanup;
		}
		}
		#endif

		if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed\n\n" );
		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 \n\n", args.customHrtfFilePath );
		goto cleanup;
		}
		else
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		}

		if ( ( error = IVAS_REND_GetHrtfFastConvHandle( hIvasRend, &hHrtfFastConv ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_GetHrtfFastConvHandle failed\n\n" );
		goto cleanup;
		}

		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		goto cleanup;
		}
		else
		{
		destroy_fastconv_hrtf( hHrtfFastConv );
		}
		}

		if ( ( error = IVAS_REND_GetHrtfParamBinHandle( hIvasRend, &hHrtfParambin ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfParamBinHandle failed\n\n" );
		goto cleanup;
		}

		if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hrtfFileReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );
		goto cleanup;
		}
		else
		{
		destroy_parambin_hrtf( hHrtfParambin );
		}
		}
		}

		hrtfFileReader_close( &hrtfFileReader );
		}
		#endif

		/* === Configure === */
		if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
		{
		@@ -1039,11 +1166,13 @@ int main(
		exit( -1 );
		}

		#ifndef NONBE_FIX_BINARY_BINAURAL_READING
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		CLDFBframeSize_smpls = 0;
		cldfb_in_flag = 0;
		#endif

		#endif
		if ( args.renderConfigFilePath[0] != '\0' )
		{
		IVAS_RENDER_CONFIG_DATA renderConfig;
		@@ -2112,6 +2241,11 @@ int main(
		free( inFloatBuffer );
		free( outInt16Buffer );
		free( outFloatBuffer );

		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		cleanup:
		#endif

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( bitsBufferData != NULL )
		{
		@@ -2143,7 +2277,13 @@ int main(
		RotationFileReader_close( &externalOrientationFileReader );
		RotationFileReader_close( &referenceRotReader );
		Vector3PairFileReader_close( &referenceVectorReader );
		#ifndef NONBE_FIX_BINARY_BINAURAL_READING
		hrtfFileReader_close( &hrtfFileReader );
		#endif
		#ifdef NONBE_FIX_BINARY_BINAURAL_READING
		destroy_td_hrtf( hHrtfTD );
		destroy_SetOfHRTF( hSetOfHRTF );
		#endif
		IVAS_REND_Close( &hIvasRend );
		IsmPositionProvider_close( positionProvider );
		RenderConfigReader_close( &renderConfigReader );

ci/run_scheduled_sanitizer_test.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -110,8 +110,8 @@ def get_modes(in_format: str) -> list:
		def get_md_file_command(in_format: str) -> list:

		cmd = list()
		if in_format.startswith("ISM"):
		cmd.append("--metadata_files")
		if "ISM" in in_format:
		cmd.append("--ism_metadata_files")
		md_filename = "/usr/local/ltv/ltvISM{}.csv"
		n = int(in_format[-1])
		cmd.extend([md_filename.format(i) for i in range(1, n + 1)])

ci/smoke_test.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ fi

		cfg=./scripts/config/ci_linux.json
		dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat
		ism_md_cmd="--metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"
		ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"
		duration_arg="-U 1:2"
		verbosity_cmd="-z console"

lib_com/ivas_cnst.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -1632,6 +1632,9 @@ typedef enum
		#define MAX_INTERPOLATION_STEPS 12

		#define LR_IAC_LENGTH_NR_FC ( RV_LENGTH_NR_FC )
		#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
		#define LR_IAC_LENGTH_NR_FC_16KHZ ( RV_LENGTH_NR_FC_16KHZ )
		#endif

		/* ----- Enums - TD Renderer ----- */

		@@ -1684,7 +1687,9 @@ typedef enum
		#define RV_FILTER_MAX_FFT_SIZE ( 512 )
		#define RV_FILTER_MAX_HISTORY ( 512 - 160 ) /* for longest history */
		#define RV_LENGTH_NR_FC ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1

		#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
		#define RV_LENGTH_NR_FC_16KHZ ( RV_FILTER_MAX_FFT_SIZE / 4 ) + 1
		#endif
		#define IVAS_REVERB_DEFAULT_N_BANDS 31