Align changes with port 369 (9f8e0b3e) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_rend.vcxproj

+1 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@
		<ClCompile Include="..\lib_rend\ivas_rom_rend.c" />
		<ClCompile Include="..\lib_rend\ivas_shoebox.c" />
		<ClCompile Include="..\lib_rend\ivas_td_decorr.c" />
		<ClCompile Include="..\lib_rend\ivas_td_ring_buffer.c" />
		<ClCompile Include="..\lib_rend\ivas_vbap.c" />
		<ClCompile Include="..\lib_rend\lib_rend.c" />
		</ItemGroup>

apps/renderer.c

+63 −51

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#include "lib_rend.h"
		#include <assert.h>
		#include <math.h>
		#include <stdint.h>
		#include <string.h>
		#include "audio_file_reader.h"
		#include "audio_file_writer.h"
		@@ -190,7 +191,7 @@ typedef struct
		float lfeConfigElevation;
		bool lfeCustomRoutingEnabled;
		char inLfePanningMatrixFile[RENDERER_MAX_CLI_ARG_LENGTH];
		float syncMdDelay;
		int16_t syncMdDelay;
		IVAS_RENDER_FRAMESIZE render_framesize;
		uint16_t directivityPatternId[RENDERER_MAX_ISM_INPUTS];
		AcousticEnvironmentSequence aeSequence;
		@@ -720,6 +721,7 @@ int main(
		SplitFileReadWrite *hSplitRendFileReadWrite;
		int16_t delayNumSamples_temp;
		int32_t delayTimeScale_temp;
		bool flushRendererLastFrame = false;
		int16_t numSamplesRead;
		int16_t delayNumSamples = -1;
		int16_t delayNumSamples_orig = 0;
		@@ -766,8 +768,11 @@ int main(

		CmdlnArgs args = parseCmdlnArgs( argc, argv );

		if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) \|\|
		( args.inConfig.numAudioObjects > 0 && args.inConfig.audioObjects[0].audioConfig == IVAS_AUDIO_CONFIG_OBA && args.inConfig.numAudioObjects == 1 ) ) )
		if ( args.nonDiegeticPan &&
		!( ( args.inConfig.numAudioObjects == 0 &&
		args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) \|\|
		( args.inConfig.numAudioObjects > 0 &&
		args.inConfig.audioObjects[0].audioConfig == IVAS_AUDIO_CONFIG_OBA && args.inConfig.numAudioObjects == 1 ) ) )
		{
		fprintf( stderr, "\ninvalid configuration - non-diegetic panning requires mono or ISM1 input\n" );
		goto cleanup;
		@@ -1088,7 +1093,10 @@ int main(
		IVAS_RENDER_CONFIG_DATA renderConfig;
		#endif
		/* sanity check */
		if ( ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL ) && ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) && ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) && !is_split_pre_rend_mode( &args ) )
		if ( ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL ) &&
		( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) &&
		( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) &&
		!is_split_pre_rend_mode( &args ) )
		{
		fprintf( stderr, "\nExternal Renderer Config is supported only when binaural output configurations is used as output OR when Split pre-rendering mode is enabled. Exiting. \n" );
		goto cleanup;
		@@ -1402,7 +1410,7 @@ int main(
		}

		int16_t numOutChannels;
		if ( ( error = IVAS_REND_NumOutChannels( hIvasRend, &numOutChannels ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_REND_GetNumOutChannels( hIvasRend, &numOutChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_NumOutChannels(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		@@ -1417,31 +1425,16 @@ int main(
		}
		}

		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )
		{
		if ( ( error = IVAS_REND_GetSplitRendBitstreamHeader( hIvasRend, &bitsBuffer.config.codec, &bitsBuffer.config.poseCorrection, &bitsBuffer.config.codec_frame_size_ms, &bitsBuffer.config.isar_frame_size_ms ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_GetSplitRendBitstreamHeader()!\n" );
		goto cleanup;
		}

		if ( IVAS_REND_GetDelay( hIvasRend, &delayNumSamples_temp, &delayTimeScale_temp ) != IVAS_ERR_OK )
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		fprintf( stderr, "\nUnable to get delay of renderer!\n" );
		goto cleanup;
		}
		char *outFile = args.outMetadataFilePath;

		if ( ( error = split_rend_writer_open( &hSplitRendFileReadWrite, args.outputFilePath, delayNumSamples_temp, delayTimeScale_temp, bitsBuffer.config.codec, bitsBuffer.config.poseCorrection, bitsBuffer.config.codec_frame_size_ms, bitsBuffer.config.isar_frame_size_ms, args.sampleRate, bitsBuffer.config.lc3plus_highres ) ) != IVAS_ERR_OK )
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )
		{
		fprintf( stderr, "\nCould not open split rend metadata file %s\n", args.outputFilePath );
		goto cleanup;
		}
		outFile = args.outputFilePath;
		audioWriter = NULL;
		}
		else
		{
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{

		if ( ( error = IVAS_REND_GetSplitRendBitstreamHeader( hIvasRend, &bitsBuffer.config.codec, &bitsBuffer.config.poseCorrection, &bitsBuffer.config.codec_frame_size_ms, &bitsBuffer.config.isar_frame_size_ms ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_GetSplitRendBitstreamHeader()!\n" );
		@@ -1454,13 +1447,15 @@ int main(
		goto cleanup;
		}

		if ( ( error = split_rend_writer_open( &hSplitRendFileReadWrite, args.outMetadataFilePath, delayNumSamples_temp, delayTimeScale_temp, bitsBuffer.config.codec, bitsBuffer.config.poseCorrection, bitsBuffer.config.codec_frame_size_ms, bitsBuffer.config.isar_frame_size_ms, args.sampleRate, bitsBuffer.config.lc3plus_highres ) ) != IVAS_ERR_OK )
		if ( ( error = split_rend_writer_open( &hSplitRendFileReadWrite, outFile, delayNumSamples_temp, delayTimeScale_temp, bitsBuffer.config.codec, bitsBuffer.config.poseCorrection, bitsBuffer.config.codec_frame_size_ms, bitsBuffer.config.isar_frame_size_ms, args.sampleRate, bitsBuffer.config.lc3plus_highres ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nCould not open split rend metadata file %s\n", args.outMetadataFilePath );
		fprintf( stderr, "\nCould not open split rend metadata file %s\n", outFile );
		goto cleanup;
		}
		}

		if ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )
		{
		if ( AudioFileWriter_open( &audioWriter, args.outputFilePath, args.sampleRate, numOutChannels ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nFailed to open file: %s\n", args.outputFilePath );
		@@ -1590,16 +1585,23 @@ int main(
		if ( numSamplesRead == 0 )
		{
		/* end of input data */
		break;
		flushRendererLastFrame = true;
		}

		/* Convert from int to float and from interleaved to packed */
		if ( !flushRendererLastFrame )
		{
		convertInputBuffer( inpInt16Buffer, numSamplesRead, inBuffer.config.numSamplesPerChannel, num_in_channels, inFloatBuffer, inBuffer.config.is_cldfb, cldfbAna );
		}
		else
		{
		memset( inBuffer.data, 0, inBuffer.config.numChannels * inBuffer.config.numSamplesPerChannel * sizeof( float ) );
		}

		int16_t num_subframes, sf_idx;
		num_subframes = (int16_t) args.render_framesize;

		if ( isCurrentFrameMultipleOf20ms )
		if ( isCurrentFrameMultipleOf20ms && !flushRendererLastFrame )
		{
		IsmPositionProvider_getNextFrame( positionProvider, &mtdBuffer );

		@@ -1711,7 +1713,7 @@ int main(
		}
		IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.multiChannelBuses[i].inputChannelIndex, numChannels );

		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, mcIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, mcIds[i], tmpBuffer, flushRendererLastFrame ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		@@ -1726,7 +1728,7 @@ int main(
		{
		IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.audioObjects[i].inputChannelIndex, args.inConfig.numAudioObjects );

		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, ismIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, ismIds[i], tmpBuffer, flushRendererLastFrame ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		@@ -1743,7 +1745,7 @@ int main(
		{
		IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.audioObjects[i].inputChannelIndex, 1 );

		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, ismIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, ismIds[i], tmpBuffer, flushRendererLastFrame ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		@@ -1766,7 +1768,7 @@ int main(
		}
		IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.ambisonicsBuses[i].inputChannelIndex, numChannels );

		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, sbaIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, sbaIds[i], tmpBuffer, flushRendererLastFrame ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		@@ -1782,13 +1784,13 @@ int main(
		}
		IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.masaBuses[i].inputChannelIndex, numChannels );

		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, masaIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, masaIds[i], tmpBuffer, flushRendererLastFrame ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "IVAS_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		if ( isCurrentFrameMultipleOf20ms )
		if ( isCurrentFrameMultipleOf20ms && !flushRendererLastFrame )
		{
		if ( masaReaders[i] != NULL )
		{
		@@ -1851,7 +1853,7 @@ int main(
		zeroPad = delayNumSamples;
		}

		if ( is_split_pre_rend_mode( &args ) )
		if ( is_split_pre_rend_mode( &args ) && !flushRendererLastFrame )
		{
		if ( split_rend_write_bitstream_to_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead,
		&bitsBuffer.config.bitsWritten ) != IVAS_ERR_OK )
		@@ -1861,7 +1863,7 @@ int main(
		}
		}

		if ( audioWriter != NULL )
		if ( audioWriter != NULL && !flushRendererLastFrame )
		{
		if ( delayNumSamples * num_out_channels < outBufferSize )
		{
		@@ -1882,7 +1884,7 @@ int main(
		bitsBuffer.config.bitsWritten = 0;

		/* Write MASA metadata for MASA outputs */
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_MASA1 \|\| args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_MASA2 )
		if ( !flushRendererLastFrame && ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_MASA1 \|\| args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_MASA2 ) )
		{
		IVAS_REND_AudioConfigType inputType1;
		IVAS_REND_AudioConfigType inputType2;
		@@ -1954,7 +1956,8 @@ int main(
		}
		}

		if ( ( args.inConfig.numAmbisonicsBuses > 0 \|\| args.inConfig.numMultiChannelBuses > 0 \|\| args.inConfig.numMasaBuses > 0 ) && args.inConfig.numAudioObjects > 0 )
		if ( ( args.inConfig.numAmbisonicsBuses > 0 \|\| args.inConfig.numMultiChannelBuses > 0 \|\| args.inConfig.numMasaBuses > 0 ) &&
		args.inConfig.numAudioObjects > 0 )
		{
		inputType2 = IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED;
		if ( ( error = IVAS_REND_MergeMasaMetadata( hIvasRend, &hMetaOutput, inputType1, inputType2 ) ) != IVAS_ERR_OK )
		@@ -1970,6 +1973,13 @@ int main(
		}
		}

		/* no new input was actually read, only delay buffers were flushed
		* therefore this is not a real frame */
		if ( flushRendererLastFrame )
		{
		break;
		}

		frame++;
		if ( !args.quietModeEnabled )
		{
		@@ -1982,12 +1992,13 @@ int main(
		#endif
		}

		/* add zeros at the end to have equal length of synthesized signals */
		/* add zeros at the end to have equal length of synthesized signals
		* the output buffer will contain either leftover input samples from delay aligned inputs
		* or zeros for padding */
		if ( audioWriter != NULL )
		{
		for ( zeroPadToWrite = zeroPad; zeroPadToWrite > frameSize_smpls; zeroPadToWrite -= frameSize_smpls )
		{
		memset( outInt16Buffer, 0, outBufferSize * sizeof( int16_t ) );
		if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, outBufferSize ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nOutput audio file writer error\n" );
		@@ -1995,7 +2006,6 @@ int main(
		}
		}

		memset( outInt16Buffer, 0, zeroPadToWrite * outBuffer.config.numChannels * sizeof( int16_t ) );
		if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, zeroPadToWrite * outBuffer.config.numChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nOutput audio file writer error\n" );
		@@ -2004,9 +2014,10 @@ int main(
		zeroPadToWrite = 0;
		}

		if ( args.inConfig.numAudioObjects != 0 && ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL \|\| args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		if ( args.inConfig.numAudioObjects != 0 &&
		( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL \|\| args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		fprintf( stdout, "\n\nMetadata delayed %d subframes\n\n", (int16_t) round( args.syncMdDelay / ( 1000 / IVAS_NUM_FRAMES_PER_SEC / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) ) );
		fprintf( stdout, "\n\nMetadata delayed %d subframes\n\n", (int16_t) round( args.syncMdDelay / ( 1000.f / IVAS_NUM_FRAMES_PER_SEC / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) ) );
		}

		if ( !args.quietModeEnabled && args.delayCompensationEnabled )
		@@ -2917,7 +2928,7 @@ static void parseOption(
		case CmdLnOptionId_syncMdDelay:
		assert( numOptionValues == 1 );
		/* Metadata Delay to sync with audio delay in ms */
		args->syncMdDelay = strtof( optionValues[0], NULL );
		args->syncMdDelay = (int16_t) strtol( optionValues[0], NULL, 10 );
		break;
		default:
		assert( 0 && "This should be unreachable - all command line options should be explicitly handled." );
		@@ -3400,7 +3411,8 @@ static void parseObjectPosition(
		*positionDuration = (uint16_t) strtol( line, &endptr, 10 );
		readNextMetadataChunk( line, "\n" );

		read_values = (int16_t) sscanf( line, "%f,%f,%f,%f,%f,%f,%f,%f", &meta_prm[0], &meta_prm[1], &meta_prm[2], &meta_prm[3], &meta_prm[4], &meta_prm[5], &meta_prm[6], &meta_prm[7] );
		read_values = (int16_t) sscanf( line, "%f,%f,%f,%f,%f,%f,%f,%f",
		&meta_prm[0], &meta_prm[1], &meta_prm[2], &meta_prm[3], &meta_prm[4], &meta_prm[5], &meta_prm[6], &meta_prm[7] );

		if ( read_values < 2 )
		{

lib_rend/ivas_prot_rend.h

+10 −10

Original line number	Diff line number	Diff line
		@@ -1599,8 +1599,8 @@ void ivas_rend_closeCldfbRend(

		ivas_error ivas_TD_RINGBUF_Open(
		TD_RINGBUF_HANDLE ph, / i/o: Ring buffer handle */
		const uint32_t capacity_per_channel, /* i : Number of samples stored per channel */
		const uint16_t num_channels /* i : Number of channels */
		const int16_t capacity_per_channel, /* i : Number of samples stored per channel */
		const int16_t num_channels /* i : Number of channels */
		);

		void ivas_TD_RINGBUF_Close(
		@@ -1611,46 +1611,46 @@ void ivas_TD_RINGBUF_Close(
		void ivas_TD_RINGBUF_PushInterleaved(
		TD_RINGBUF_HANDLE h, /* i/o: Ring buffer handle */
		const float data, / i : Input audio in interleaved channels layout */
		const uint32_t num_samples_per_channel /* i : Number of samples per channel to push */
		const int16_t num_samples_per_channel /* i : Number of samples per channel to push */
		);

		void ivas_TD_RINGBUF_PushChannels(
		TD_RINGBUF_HANDLE h, /* i/o: Ring buffer handle */
		const float p_channels[], / i : Array of pointers to each input channel */
		const uint32_t num_samples_per_channel /* i : Number of samples per channel to store */
		const int16_t num_samples_per_channel /* i : Number of samples per channel to store */
		);

		void ivas_TD_RINGBUF_PushConstant(
		TD_RINGBUF_HANDLE h, /* i/o: Ring buffer handle */
		const float value, /* i : Value to push */
		const uint32_t num_samples_per_channel /* i : Number of samples per channel to push */
		const int16_t num_samples_per_channel /* i : Number of samples per channel to push */
		);

		void ivas_TD_RINGBUF_PopChannels(
		TD_RINGBUF_HANDLE h, /* i/o: Ring buffer handle */
		float p_channels[], / i : Array of pointers to each output channel */
		const uint32_t num_samples_per_channel /* i : Number of samples per channel to pop */
		const int16_t num_samples_per_channel /* i : Number of samples per channel to pop */
		);
		#else
		void ivas_TD_RINGBUF_Push(
		TD_RINGBUF_HANDLE h, /* i/o: Ring buffer handle */
		const float data, / i : Input data */
		const uint32_t num_samples_per_channel /* i : Number of samples per channel to store */
		const uint16_t num_samples_per_channel /* i : Number of samples per channel to store */
		);

		void ivas_TD_RINGBUF_PushZeros(
		TD_RINGBUF_HANDLE h, /* i/o: Ring buffer handle */
		const uint32_t num_samples_per_channel /* i : Number of zeros per channel to store */
		const uint16_t num_samples_per_channel /* i : Number of zeros per channel to store */
		);

		void ivas_TD_RINGBUF_Pop(
		TD_RINGBUF_HANDLE h, /* i/o: Ring buffer handle */
		float data, / i : Output data */
		const uint32_t num_samples_per_channel /* i : Number of samples per channel to retrieve*/
		const uint16_t num_samples_per_channel /* i : Number of samples per channel to retrieve*/
		);
		#endif

		uint32_t ivas_TD_RINGBUF_Size(
		int16_t ivas_TD_RINGBUF_Size(
		const TD_RINGBUF_HANDLE h /* i : Ring buffer handle */
		);

lib_rend/ivas_stat_rend.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -1381,11 +1381,11 @@ typedef struct

		typedef struct
		{
		float data; / samples in interleaved layout */
		uint32_t capacity;
		uint16_t num_channels;
		uint32_t write_pos;
		uint32_t read_pos;
		float data; / samples in interleaved layout, e.g. for channels A, B, C, samples are stored: A1, B1, C1, A2, B2, C2, ... */
		int32_t capacity; /* max number of float values that can be stored */
		int16_t num_channels;
		int32_t write_pos;
		int32_t read_pos;
		int16_t is_full;

		} TD_RINGBUF_DATA, *TD_RINGBUF_HANDLE;

lib_rend/ivas_td_ring_buffer.c

+37 −32

File changed.

Preview size limit exceeded, changes collapsed.