Merge branch 'main' into 988-remove-switches-fix_638_energie_iac_rom-fix_inv_diffuse_weigth (26bed59f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1240,6 +1240,7 @@ test-long-self-test:

		### switch to main
		- git checkout main
		- git pull origin main
		- echo "Building reference codec at commit $(git rev-parse HEAD)"

		### build main (ref) binaries

LICENSE.md

+1 −1

Original line number	Diff line number	Diff line
		/******************************************************************************************************

		(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		(C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

apps/decoder.c

+34 −3

Original line number	Diff line number	Diff line
		/******************************************************************************************************

		(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		(C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
		@@ -457,9 +457,14 @@ int main(
		------------------------------------------------------------------------------------------/

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef SPLIT_REND_LCLD_5MS
		asked_frame_size = arg.renderFramesize;
		#endif
		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		#ifndef SPLIT_REND_LCLD_5MS
		asked_frame_size = arg.renderFramesize;
		#endif
		if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -472,11 +477,12 @@ int main(
		goto cleanup;
		}

		#ifndef SPLIT_REND_LCLD_5MS
		if ( arg.renderFramesize != asked_frame_size )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for split rendering!\n" );
		}

		#endif
		arg.enableHeadRotation = true;
		}
		#endif
		@@ -630,6 +636,7 @@ int main(
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifndef SPLIT_REND_LCLD_5MS
		if ( arg.renderFramesize == IVAS_RENDER_FRAMESIZE_5MS && ( renderConfig.split_rend_config.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE \|\|
		renderConfig.split_rend_config.dof == 0 ) )
		{
		@@ -647,7 +654,7 @@ int main(
		}

		#endif

		#endif
		if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
		@@ -660,6 +667,30 @@ int main(
		goto cleanup;
		}

		#ifdef SPLIT_REND_LCLD_5MS
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS && ( renderConfig.split_rend_config.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE \|\|
		renderConfig.split_rend_config.dof == 0 ) )
		{
		arg.renderFramesize = asked_frame_size;
		}
		else
		{
		arg.renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;
		}

		if ( ( error = IVAS_DEC_SetRenderFramesize( hIvasDec, arg.renderFramesize ) ) != IVAS_ERR_OK )
		{
		return error;
		}

		if ( arg.renderFramesize != asked_frame_size )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );
		}
		#endif
		#endif

		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

apps/encoder.c

+1 −1

Original line number	Diff line number	Diff line
		/******************************************************************************************************

		(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		(C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

apps/renderer.c

+24 −2

Original line number	Diff line number	Diff line
		/******************************************************************************************************

		(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		(C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
		@@ -1903,7 +1903,8 @@ int main(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		for ( i = 0; i < args.inConfig.numBinBuses; ++i )
		{
		if ( splitBinNeedsNewFrame )
		#ifdef SPLIT_REND_LCLD_5MS
		if ( numSamplesRead > 0 )
		{
		if ( ( error = IVAS_REND_GetInputNumChannels( hIvasRend, splitBinIds[i], &numChannels ) ) != IVAS_ERR_OK )
		{
		@@ -1917,7 +1918,24 @@ int main(
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}
		#endif
		if ( splitBinNeedsNewFrame )
		{
		#ifndef SPLIT_REND_LCLD_5MS
		if ( ( error = IVAS_REND_GetInputNumChannels( hIvasRend, splitBinIds[i], &numChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.binBuses[i].inputChannelIndex, numChannels );

		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, splitBinIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		#endif
		if ( ( error = IVAS_REND_FeedSplitBinauralBitstream( hIvasRend, splitBinIds[i], &bitsBuffer ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		@@ -2217,6 +2235,9 @@ cleanup:
		}

		split_rend_reader_writer_close( &hSplitRendFileReadWrite );
		#ifdef SPLIT_REND_LCLD_5MS
		SplitRendBFIFileReader_close( &splitRendBFIReader );
		#endif
		#endif

		for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )
		@@ -2229,6 +2250,7 @@ cleanup:
		RotationFileReader_close( &headRotReader );
		RotationFileReader_close( &externalOrientationFileReader );
		RotationFileReader_close( &referenceRotReader );

		Vector3PairFileReader_close( &referenceVectorReader );
		destroy_td_hrtf( hHrtfTD );
		destroy_SetOfHRTF( hSetOfHRTF );