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

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -2386,7 +2386,7 @@ coverage-test-on-main-scheduled:
		&complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory
		- public_dir="$CI_JOB_NAME-public"
		- mkdir $public_dir
		- mv -f wmops/log__all.txt wmops/.js ${public_dir}/
		- mv -f wmops/log__all.txt ./.js ${public_dir}/
		# move logfiles for links
		- mkdir $public_dir/logs
		# first move logs

apps/decoder.c

+48 −1

Original line number	Diff line number	Diff line
		@@ -176,8 +176,12 @@ typedef struct
		IVAS_BIN_RENDERER_TYPE binaural_renderer_sec;
		IVAS_BIN_RENDERER_TYPE binaural_renderer_sec_old;

		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		IVAS_AUDIO_CONFIG hrtf_set_audio_cfg;
		#else
		IVAS_AUDIO_CONFIG intern_audio_config;
		int16_t room_reverb_flag;
		#endif

		} IVAS_DEC_HRTF_BINARY_WRAPPER;

		@@ -198,7 +202,11 @@ static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );
		#endif
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );
		#else
		static ivas_error IVAS_DEC_LoadHrtfFromFile( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const int32_t output_Fs );
		#endif
		#ifdef DEBUGGING
		static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
		static int16_t app_own_random( int16_t *seed );
		@@ -754,7 +762,7 @@ int main(
		}

		/------------------------------------------------------------------------------------------
		* Load HRTF binary file data
		* Initialize HRTF binary file data
		------------------------------------------------------------------------------------------/

		if ( arg.hrtfReaderEnabled )
		@@ -763,8 +771,12 @@ int main(
		hHrtfBinary.hrtfFileName = arg.hrtfFileName;
		hHrtfBinary.binaural_renderer = IVAS_BIN_RENDERER_TYPE_NONE;
		hHrtfBinary.binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_NONE;
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		hHrtfBinary.hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;
		#else
		hHrtfBinary.room_reverb_flag = 0;
		hHrtfBinary.intern_audio_config = IVAS_AUDIO_CONFIG_INVALID;
		#endif
		}

		/------------------------------------------------------------------------------------------
		@@ -2539,7 +2551,11 @@ static ivas_error decodeG192(
		/* Read main parameters from the bitstream to set-up the decoder */
		hHrtfBinary->binaural_renderer_old = hHrtfBinary->binaural_renderer;
		hHrtfBinary->binaural_renderer_sec_old = hHrtfBinary->binaural_renderer_sec;
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtfBinary->binaural_renderer, &hHrtfBinary->binaural_renderer_sec, &hHrtfBinary->hrtf_set_audio_cfg ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtfBinary->binaural_renderer, &hHrtfBinary->binaural_renderer_sec, &hHrtfBinary->room_reverb_flag, &hHrtfBinary->intern_audio_config ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -2550,7 +2566,11 @@ static ivas_error decodeG192(
		/* Load HRTF binary file data */
		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = load_hrtf_from_file( hHrtfBinary, hIvasDec, arg.outputConfig, arg.output_Fs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_LoadHrtfFromFile( hHrtfBinary, hIvasDec, arg.output_Fs ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_DEC_LoadHrtfFromFile failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -3498,7 +3518,11 @@ static ivas_error decodeVoIP(
		/* Read main parameters from the bitstream to set-up the decoder */
		hHrtf->binaural_renderer_old = hHrtf->binaural_renderer;
		hHrtf->binaural_renderer_sec_old = hHrtf->binaural_renderer_sec;
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtf->binaural_renderer, &hHrtf->binaural_renderer_sec, &hHrtf->hrtf_set_audio_cfg ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtf->binaural_renderer, &hHrtf->binaural_renderer_sec, &hHrtf->room_reverb_flag, &hHrtf->intern_audio_config ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -3509,7 +3533,11 @@ static ivas_error decodeVoIP(
		/* Load HRTF binary file data */
		if ( arg.hrtfReaderEnabled )
		{
		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = load_hrtf_from_file( hHrtf, hIvasDec, arg.outputConfig, arg.output_Fs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_LoadHrtfFromFile( hHrtf, hIvasDec, arg.output_Fs ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_DEC_LoadHrtfFromFile failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -3910,6 +3938,20 @@ static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec(
		#endif


		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		/---------------------------------------------------------------------
		* load_hrtf_from_file()
		*
		* Load HRTF coefficients from external binary file
		---------------------------------------------------------------------/

		static ivas_error load_hrtf_from_file(
		IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary, / i/o: HRTF binary wrapper handle */
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		const IVAS_AUDIO_CONFIG OutputConfig, /* i : output audio configuration */
		const int32_t output_Fs /* i : output sampling rate */
		)
		#else
		/---------------------------------------------------------------------
		* IVAS_DEC_LoadHrtfFromFile()
		*
		@@ -3920,6 +3962,7 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile(
		IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary,
		IVAS_DEC_HANDLE hIvasDec,
		const int32_t output_Fs )
		#endif
		{
		ivas_error error;
		IVAS_BIN_RENDERER_TYPE binaural_renderer, binaural_renderer_sec;
		@@ -4022,7 +4065,11 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile(
		return error;
		}

		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, OutputConfig, hHrtfBinary->hrtf_set_audio_cfg, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hHrtfBinary->room_reverb_flag, hHrtfBinary->intern_audio_config, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{

apps/renderer.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -945,7 +945,11 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, args.outConfig.audioConfig, args.inConfig.ambisonicsBuses->audioConfig, hrtfFileReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, 0, IVAS_AUDIO_CONFIG_INVALID, hrtfFileReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{

ci/complexity_measurements/getWmops.sh

+5 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,8 @@ config_file="scripts/config/ci_linux_ltv.json"
		# get wmops newsletter
		ivas_format_for_filename=${ivas_format// /-}
		wmopsFilenameFlcLast=wmops_newsletter_${ivas_format_for_filename}_to_${output_format}__${commit_sha}_${date}
		wmopsFilenameFlc=${destDir}/wmops/logs/${wmopsFilenameFlcLast}
		wmopsFilenameFlcDir=${destDir}/wmops/logs
		wmopsFilenameFlc=${wmopsFilenameFlcDir}/${wmopsFilenameFlcLast}

		ret_val=0

		@@ -92,6 +93,9 @@ ret_val=$?
		### WMOPS
		${scriptDir}/parseNewsletterWmops.py ${wmopsFilenameFlc}_WMOPS.csv ${wmopsFilenameFlcLast}_WMOPS.csv ${commit_sha} ${shortDate} ${fullDate} >>${destDir}/wmops/log_wmops_all.txt

		# create copy of WMOPS csv file with special name to easily get it from artifacts when comparing BASOP to float numbers
		cp ${wmopsFilenameFlc}_WMOPS.csv ${wmopsFilenameFlcDir}/latest_WMOPS.csv

		# get memory info for webpage
		### RAM
		${scriptDir}/mergeNewsletterRam.py ${wmopsFilenameFlc}_HEAP.csv ${wmopsFilenameFlc}_STACK.csv >${wmopsFilenameFlc}_RAM.csv

lib_com/ivas_cnst.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1495,6 +1495,7 @@ typedef enum

		#define BINAURAL_COHERENCE_DIFFERENCE_BINS 9 /* Number of bins for direction-dependent diffuse-field binaural coherence */

		#ifndef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM
		typedef enum
		{
		BINAURAL_INPUT_AUDIO_CONFIG_INVALID,
		@@ -1506,6 +1507,7 @@ typedef enum

		} BINAURAL_INPUT_AUDIO_CONFIG;

		#endif
		#define HEADROT_ORDER 3
		#define HEADROT_SHMAT_DIM ( ( HEADROT_ORDER + 1 ) * ( HEADROT_ORDER + 1 ) )
		#define HEADROT_SHMAT_DIM2 ( HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM )