Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... (b9b2d1d4) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/isar_post_rend.vcxproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -148,8 +148,6 @@
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\apps\isar_post_rend.c" />
		<ClCompile Include="..\lib_com\enh64.c" />
		<ClCompile Include="..\lib_com\enhUL32.c" />
		</ItemGroup>
		<ItemGroup>
		<ProjectReference Include="lib_debug.vcxproj">

Workspace_msvc/lib_com.vcxproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,6 @@
		<ClCompile Include="..\lib_com\basop_util.c" />
		<ClCompile Include="..\lib_com\bitallocsum_fx.c" />
		<ClCompile Include="..\lib_com\bitalloc_fx.c" />
		<ClCompile Include="..\lib_com\bitstream.c" />
		<ClCompile Include="..\lib_com\bitstream_fx.c" />
		<ClCompile Include="..\lib_com\bits_alloc_fx.c" />
		<ClCompile Include="..\lib_com\cb_shape_fx.c" />

Workspace_msvc/lib_com.vcxproj.filters

+294 −292

File changed.

Preview size limit exceeded, changes collapsed.

apps/decoder.c

+53 −51

Original line number	Diff line number	Diff line
		@@ -373,6 +373,7 @@ int main(
		}
		}

		#ifndef FIX_1158_FASTCONV_REVERB_HRTF
		/------------------------------------------------------------------------------------------
		* Open renderer configuration reader file
		------------------------------------------------------------------------------------------/
		@@ -393,6 +394,7 @@ int main(
		goto cleanup;
		}
		}
		#endif

		/------------------------------------------------------------------------------------------
		* Configure the decoder
		@@ -431,7 +433,7 @@ int main(
		{
		if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		fprintf( stderr, "\nSplit rendering configure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		@@ -482,6 +484,14 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_1158_FASTCONV_REVERB_HRTF
		if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );
		goto cleanup;
		}
		#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 );
		@@ -512,8 +522,7 @@ int main(
		goto cleanup;
		}
		#endif
		if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\|
		arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		{
		if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS &&
		( renderConfig.split_rend_config.poseCorrectionMode == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE \|\|
		@@ -563,6 +572,7 @@ int main(
		}
		renderConfig.roomAcoustics.override = true;
		}

		/* ISAR frame size is set from command line, not renderer config file.
		* This will be ignored if output format is not split rendering. */
		renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) arg.renderFramesize /* given in number of 5ms subframes / 5;
		@@ -1207,7 +1217,7 @@ static bool parseCmdlIVAS_dec(
		arg->outputMdFilename = argv[i + 1];
		if ( arg->outputMdFilename[0] == '\0' )
		{
		fprintf( stderr, "Error: output metadata file path not specified\n\n" );
		fprintf( stderr, "Error: Split rendering output metadata file path not specified\n\n" );
		usage_dec();
		return false;
		}
		@@ -1632,6 +1642,7 @@ static ivas_error initOnFirstGoodFrame(
		uint16_t pNumObj, / o : */
		SplitFileReadWrite **splitRendWriter )
		{
		int16_t isSplitRend, isSplitCoded;
		ivas_error error = IVAS_ERR_UNKNOWN;

		/* Now delay, number of output channels and frame size are known */
		@@ -1641,7 +1652,19 @@ static ivas_error initOnFirstGoodFrame(
		return error;
		}

		if ( IVAS_DEC_is_split_rendering_enabled( hIvasDec ) )
		if ( ( error = IVAS_DEC_is_split_rendering_enabled( hIvasDec, &isSplitRend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_enabled, code: %d\n", error );
		return error;
		}

		if ( ( error = IVAS_DEC_is_split_rendering_coded_out( hIvasDec, &isSplitCoded ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_coded_out, code: %d\n", error );
		return error;
		}

		if ( isSplitRend )
		{
		pFullDelayNumSamples[0] = 0;
		}
		@@ -1666,7 +1689,7 @@ static ivas_error initOnFirstGoodFrame(
		return error;
		}

		if ( IVAS_DEC_is_split_rendering_enabled( hIvasDec ) )
		if ( isSplitRend )
		{
		/* Open split rendering metadata writer */
		int16_t delayNumSamples_temp[3];
		@@ -1683,29 +1706,15 @@ static ivas_error initOnFirstGoodFrame(
		return error;
		}

		if ( ( error = IVAS_DEC_GetSplitRendBitstreamHeader( hIvasDec,
		&splitRendCodec,
		&poseCorrection,
		&splitRendIsarFrameSizeMs,
		&splitRendCodecFrameSizeMs,
		&lc3plusHighRes ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_GetSplitRendBitstreamHeader( hIvasDec, &splitRendCodec, &poseCorrection, &splitRendIsarFrameSizeMs, &splitRendCodecFrameSizeMs, &lc3plusHighRes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to get split renderer bitstream header: %s\n", ivas_error_to_string( error ) );
		return error;
		}

		if ( IVAS_DEC_is_split_rendering_coded_out( hIvasDec ) )
		if ( isSplitCoded )
		{
		if ( ( error = split_rend_writer_open( splitRendWriter,
		arg.outputWavFilename,
		delayNumSamples_temp[0],
		delayTimeScale_temp,
		splitRendCodec,
		poseCorrection,
		splitRendCodecFrameSizeMs,
		splitRendIsarFrameSizeMs,
		arg.output_Fs,
		lc3plusHighRes ) ) != IVAS_ERR_OK )
		if ( ( error = split_rend_writer_open( splitRendWriter, arg.outputWavFilename, delayNumSamples_temp[0], delayTimeScale_temp, splitRendCodec, poseCorrection, splitRendCodecFrameSizeMs, splitRendIsarFrameSizeMs, arg.output_Fs, lc3plusHighRes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to open output split rendering metadata file %s\n", arg.outputWavFilename );
		return error;
		@@ -1719,16 +1728,7 @@ static ivas_error initOnFirstGoodFrame(
		return IVAS_ERR_INVALID_SPLIT_REND_CONFIG;
		}

		if ( ( error = split_rend_writer_open( splitRendWriter,
		arg.outputMdFilename,
		delayNumSamples_temp[0],
		delayTimeScale_temp,
		splitRendCodec,
		poseCorrection,
		splitRendCodecFrameSizeMs,
		splitRendIsarFrameSizeMs,
		arg.output_Fs,
		lc3plusHighRes ) ) != IVAS_ERR_OK )
		if ( ( error = split_rend_writer_open( splitRendWriter, arg.outputMdFilename, delayNumSamples_temp[0], delayTimeScale_temp, splitRendCodec, poseCorrection, splitRendCodecFrameSizeMs, splitRendIsarFrameSizeMs, arg.output_Fs, lc3plusHighRes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to open output split rendering metadata file %s\n", arg.outputWavFilename );
		return error;
		@@ -1736,7 +1736,7 @@ static ivas_error initOnFirstGoodFrame(
		}
		}

		if ( IVAS_DEC_is_split_rendering_coded_out( hIvasDec ) == 0 )
		if ( !isSplitCoded )
		{
		/* Open audio writer and write all previously skipped bad frames now that frame size is known */
		if ( ( error = AudioFileWriter_open( ppAfWriter, arg.outputWavFilename, arg.output_Fs, *pNumOutChannels ) ) != IVAS_ERR_OK )
		@@ -1771,7 +1771,6 @@ static ivas_error initOnFirstGoodFrame(
		}
		else
		{

		if ( pRemainingDelayNumSamples < numOutSamples )
		{
		if ( ( error = AudioFileWriter_write( ppAfWriter, zeroBuf, numOutSamples * pNumOutChannels - ( pRemainingDelayNumSamples * *pNumOutChannels ) ) ) != IVAS_ERR_OK )
		@@ -1941,11 +1940,23 @@ static ivas_error decodeG192(
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 } };
		int16_t vec_pos_update, vec_pos_len;
		SplitFileReadWrite *splitRendWriter = NULL;

		int16_t isSplitRend, isSplitCoded;
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		IVAS_RENDER_CONFIG_DATA renderConfig;
		RenderConfigReader *renderConfigReader = NULL;

		if ( ( error = IVAS_DEC_is_split_rendering_enabled( hIvasDec, &isSplitRend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_enabled, code: %d\n", error );
		return error;
		}

		if ( ( error = IVAS_DEC_is_split_rendering_coded_out( hIvasDec, &isSplitCoded ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_coded_out, code: %d\n", error );
		return error;
		}

		if ( arg.renderConfigEnabled )
		{
		if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )
		@@ -1976,7 +1987,6 @@ static ivas_error decodeG192(
		/* we always start with needing a new frame */
		needNewFrame = true;


		if ( !arg.quietModeEnabled )
		{
		fprintf( stdout, "\n------ Running the decoder ------\n\n" );
		@@ -2008,13 +2018,13 @@ static ivas_error decodeG192(
		return error;
		}


		/------------------------------------------------------------------------------------------
		* Loop for every packet (frame) of bitstream data
		* - Read the bitstream packet
		* - Run the decoder
		* - Write the synthesized signal into output file
		------------------------------------------------------------------------------------------/

		while ( 1 )
		{
		/* Read next frame if not enough samples availble */
		@@ -2184,7 +2194,7 @@ static ivas_error decodeG192(
		}
		}

		if ( IVAS_DEC_is_split_rendering_enabled( hIvasDec ) )
		if ( isSplitRend )
		{
		if ( ( error = IVAS_DEC_GetSplitBinauralBitstream( hIvasDec, (Word16 ) ( pcmBuf + nOutChannels nSamplesRendered ), splitRendBits, &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )
		{
		@@ -2249,7 +2259,7 @@ static ivas_error decodeG192(
		/* Write current frame */
		if ( decodedGoodFrame )
		{
		if ( IVAS_DEC_is_split_rendering_enabled( hIvasDec ) )
		if ( isSplitRend )
		{
		if ( split_rend_write_bitstream_to_file( splitRendWriter, splitRendBits->bits_buf, &splitRendBits->bits_read, &splitRendBits->bits_written ) != IVAS_ERR_OK )
		{
		@@ -2258,7 +2268,7 @@ static ivas_error decodeG192(
		}
		}

		if ( IVAS_DEC_is_split_rendering_coded_out( hIvasDec ) == 0 )
		if ( !isSplitCoded )
		{
		if ( delayNumSamples < nOutSamples )
		{
		@@ -2825,8 +2835,7 @@ static ivas_error decodeVoIP(
		{
		if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ),
		RotationFileReader_getFilePath( headRotReader ) );
		fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), RotationFileReader_getFilePath( headRotReader ) );
		goto cleanup;
		}
		}
		@@ -2834,8 +2843,7 @@ static ivas_error decodeVoIP(

		for ( i = 0; i < num_subframes; i++ )
		{
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i,
		DEFAULT_AXIS ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i, DEFAULT_AXIS ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -3062,14 +3070,10 @@ static ivas_error decodeVoIP(
		}
		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
		frame++;
		#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
		if ( vec_pos_update == 0 )
		{
		systemTime_ms += vec_pos_len * systemTimeInc_ms;
		}
		#else
		systemTime_ms += systemTimeInc_ms;
		#endif

		#ifdef WMOPS
		update_mem();
		@@ -3078,7 +3082,6 @@ static ivas_error decodeVoIP(
		}


		#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
		int16_t nSamplesFlushed = 0;

		/* decode and get samples */
		@@ -3158,7 +3161,6 @@ static ivas_error decodeVoIP(
		}
		}
		}
		#endif


		/------------------------------------------------------------------------------------------

apps/isar_post_rend.c

+36 −7

Original line number	Diff line number	Diff line
		@@ -31,9 +31,6 @@
		*******************************************************************************************************/

		#include "lib_isar_post_rend.h"
		//#undef IVAS_FLOAT_FIXED


		#include <assert.h>
		#include <math.h>
		#include <string.h>
		@@ -268,9 +265,6 @@ static int16_t getTotalNumInChannels(
		return totalNumInChannels;
		}

		/------------------------------------------------------------------------------------------
		* Local functions
		------------------------------------------------------------------------------------------/

		static const CmdLnParser_Option *findOptionById(
		const int32_t id )
		@@ -433,6 +427,7 @@ static bool checkRequiredArgs(
		return !missingRequiredArg;
		}


		static CmdlnArgs defaultArgs(
		const char *executableName )
		{
		@@ -463,6 +458,7 @@ static CmdlnArgs defaultArgs(
		return args;
		}


		static void parseOption(
		const int32_t optionId,
		char **optionValues,
		@@ -555,6 +551,7 @@ static void parseOption(
		return;
		}


		static CmdlnArgs parseCmdlnArgs(
		const int argc,
		char **argv )
		@@ -631,6 +628,7 @@ static void convertInputBuffer(
		return;
		}


		/--------------------------------------------------------------------------
		* convertOutputBuffer()
		*
		@@ -672,6 +670,7 @@ static void convertOutputBuffer(
		return;
		}


		/------------------------------------------------------------------------------------------
		* main()
		*
		@@ -731,12 +730,20 @@ int main(
		bitsBuffer.config.isar_frame_size_ms = 20;
		bitsBuffer.config.lc3plusHighRes = 0;

		/------------------------------------------------------------------------------------------
		* Parse command-line arguments
		------------------------------------------------------------------------------------------/

		CmdlnArgs args = parseCmdlnArgs( argc, argv );

		convert_backslash( args.inputFilePath );
		convert_backslash( args.outputFilePath );
		convert_backslash( args.headRotationFilePath );

		/------------------------------------------------------------------------------------------
		* Open head-rotation file
		------------------------------------------------------------------------------------------/

		if ( !isEmptyString( args.headRotationFilePath ) )
		{
		if ( RotationFileReader_open( args.headRotationFilePath, &headRotReader ) != IVAS_ERR_OK )
		@@ -746,6 +753,10 @@ int main(
		}
		}

		/------------------------------------------------------------------------------------------
		* Open BFI file
		------------------------------------------------------------------------------------------/

		if ( !isEmptyString( args.splitRendBFIFilePath ) )
		{
		convert_backslash( args.splitRendBFIFilePath );
		@@ -844,6 +855,10 @@ int main(
		}
		}

		/------------------------------------------------------------------------------------------
		* Open ISAR handle
		------------------------------------------------------------------------------------------/

		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, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		@@ -852,7 +867,10 @@ int main(
		goto cleanup;
		}

		/* === Configure === */
		/------------------------------------------------------------------------------------------
		* Configuration
		------------------------------------------------------------------------------------------/

		if ( ( error = ISAR_POST_REND_InitConfig( hIsarPostRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in Renderer Config Init: %s\n", ivas_error_to_string( error ) );
		@@ -906,6 +924,10 @@ int main(
		goto cleanup;
		}

		/------------------------------------------------------------------------------------------
		* Allocate processing buffers
		------------------------------------------------------------------------------------------/

		inBufferSize = frameSize_smpls * totalNumInChannels;
		outBufferSize = frameSize_smpls * numOutChannels;
		inpInt16Buffer = malloc( inBufferSize * sizeof( int16_t ) );
		@@ -961,6 +983,13 @@ int main(
		fprintf( stdout, "\n\n-- Start the ISAR post renderer (quiet mode) --\n\n" );
		}

		/------------------------------------------------------------------------------------------
		* Loop for every frame of data
		* - Read the input data
		* - Run the post-rendering
		* - Write the data into output file
		------------------------------------------------------------------------------------------/

		while ( 1 )
		{
		int16_t num_in_channels;