merge from main (e6fe5489) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_util.vcxproj

+2 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,7 @@
		<ClCompile Include="..\lib_util\obj_edit_file_reader.c" />
		<ClCompile Include="..\lib_util\render_config_reader.c" />
		<ClCompile Include="..\lib_util\rotation_file_reader.c" />
		<ClCompile Include="..\lib_util\requests_file_reader.c" />
		<ClCompile Include="..\lib_util\rtpdump.c" />
		<ClCompile Include="..\lib_util\split_render_file_read_write.c" />
		<ClCompile Include="..\lib_util\split_rend_bfi_file_reader.c" />
		@@ -164,6 +165,7 @@
		<ClInclude Include="..\lib_util\masa_file_writer.h" />
		<ClInclude Include="..\lib_util\render_config_reader.h" />
		<ClInclude Include="..\lib_util\rotation_file_reader.h" />
		<ClInclude Include="..\lib_util\requests_file_reader.h" />
		<ClInclude Include="..\lib_util\rtpdump.h" />
		<ClInclude Include="..\lib_util\tinywavein_c.h" />
		<ClInclude Include="..\lib_util\tinywaveout_c.h" />

apps/decoder.c

+49 −0

Original line number	Diff line number	Diff line
		@@ -159,7 +159,11 @@ typedef struct

		static bool parseCmdlIVAS_dec( int16_t argc, char *argv, DecArguments arg );
		static void usage_dec( void );
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE phIvasDec, int16_t *pcmBuf );
		#else
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t pcmBuf );
		#endif
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_RENDER_CONFIG_DATA renderConfig, IVAS_DEC_HANDLE phIvasDec, int16_t pcmBuf );
		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 );
		static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS editableParameters, ObjectEditFileReader objectEditFileReader );
		@@ -668,7 +672,11 @@ int main(
		}
		else
		{
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, &hIvasDec, pcmBuf );
		#else
		error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );
		#endif
		}

		if ( error == IVAS_ERR_OK \|\| error == IVAS_ERR_END_OF_FILE )
		@@ -2002,7 +2010,11 @@ static ivas_error decodeG192(
		Vector3PairFileReader *referenceVectorReader,
		ObjectEditFileReader *objectEditFileReader,
		ISAR_SPLIT_REND_BITS_DATA *splitRendBits,
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		IVAS_DEC_HANDLE *phIvasDec,
		#else
		IVAS_DEC_HANDLE hIvasDec,
		#endif
		int16_t *pcmBuf )

		{
		@@ -2010,6 +2022,9 @@ static ivas_error decodeG192(
		uint16_t bit_stream[IVAS_MAX_BITS_PER_FRAME + 4 * 8];
		int16_t i, num_bits;
		int16_t bfi = 0;
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		IVAS_DEC_HANDLE hIvasDec = *phIvasDec;
		#endif
		AudioFileWriter *afWriter = NULL;
		MasaFileWriter *masaWriter = NULL;
		bool decodedGoodFrame = false;
		@@ -2033,6 +2048,9 @@ static ivas_error decodeG192(
		int16_t isSplitRend, isSplitCoded;
		IVAS_RENDER_CONFIG_DATA renderConfig;
		RenderConfigReader *renderConfigReader = NULL;
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		bool restartNeeded;
		#endif

		#ifdef VARIABLE_SPEED_DECODING
		if ( arg.tsmEnabled )
		@@ -2289,6 +2307,37 @@ static ivas_error decodeG192(
		return error;
		}

		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( ( error = IVAS_DEC_isRestartNeeded( hIvasDec, &restartNeeded ) ) != IVAS_ERR_OK )
		{
		return error;
		}

		if ( restartNeeded )
		{
		IVAS_DEC_BS_FORMAT tempFormat;
		if ( ( error = IVAS_DEC_GetFormat( hIvasDec, &tempFormat ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetFormat, code: %d\n", error );
		goto cleanup;
		}
		IVAS_DEC_MODE codecMode = ( tempFormat == IVAS_DEC_BS_MONO ) ? IVAS_DEC_MODE_EVS : IVAS_DEC_MODE_IVAS;
		error = restartDecoder(
		&hIvasDec,
		codecMode,
		&arg,
		NULL, /* ToDo : Provide rendererConfig */
		NULL /* ToDo : Provide LS Custom Data */
		);
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nFailed to restart decoder\n" );
		goto cleanup;
		}
		phIvasDec = hIvasDec; / Update for main()' s free */
		}
		#endif

		/* Placeholder for memory reallocation */
		/* ... */

apps/encoder.c

+62 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,9 @@
		#include "masa_file_reader.h"
		#include "rotation_file_reader.h"
		#include "ivas_rtp_file.h"
		#ifdef FIX_1527_CMR_BITRATE_IDX
		#include "requests_file_reader.h"
		#endif
		#include "wmc_auto.h"


		@@ -165,6 +168,9 @@ typedef struct
		char *sceneOrientationTrajFileName;
		char *deviceOrientationTrajFileName;

		#ifdef FIX_1527_CMR_BITRATE_IDX
		char *requestsFileName;
		#endif
		} EncArguments;


		@@ -221,6 +227,9 @@ int main(
		uint8_t au[IVAS_MAX_BITS_PER_FRAME / 8];
		IVAS_RTP ivasRtp = { 0 };

		#ifdef FIX_1527_CMR_BITRATE_IDX
		ReqFileReader *requestsFileReader = NULL;
		#endif
		/* Ideally ssrc is negotiated via SDP and sequence number is radomized but we
		use fixed seed for random num generator for regression based tests. Any realtime
		application should implement this initialization seperately */
		@@ -658,6 +667,20 @@ int main(
		}
		}

		#ifdef FIX_1527_CMR_BITRATE_IDX
		/------------------------------------------------------------------------------------------
		* Open remote requests file for rtp packing (E-bytes)
		------------------------------------------------------------------------------------------/
		if ( arg.requestsFileName != NULL )
		{
		if ( ( error = RequestsFileReader_open( arg.requestsFileName, &requestsFileReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Can't open requests file %s \n\n", arg.requestsFileName );
		goto cleanup;
		}
		}
		#endif

		/------------------------------------------------------------------------------------------
		* Run the encoder
		------------------------------------------------------------------------------------------/
		@@ -867,6 +890,17 @@ int main(
		}
		}

		#ifdef FIX_1527_CMR_BITRATE_IDX
		if ( requestsFileReader )
		{
		if ( ( error = ReadNextRequests( requestsFileReader, ivasRtp.remoteRequests, &ivasRtp.remoteRequestBitmap ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError %s while reading requests from %s\n", IVAS_ENC_GetErrorMessage( error ), RequestsFileReader_getFilePath( requestsFileReader ) );
		goto cleanup;
		}
		}
		#endif

		if ( ( error = IVAS_ENC_EncodeFrameToCompact( hIvasEnc, pcmBuf, pcmBufSize, au, &numBits ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nencodeFrame failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		@@ -962,6 +996,13 @@ cleanup:
		fclose( f_bitrateProfile );
		}

		#ifdef FIX_1527_CMR_BITRATE_IDX
		if ( requestsFileReader )
		{
		RequestsFileReader_close( &requestsFileReader );
		}
		#endif

		if ( sceneOrientationFileReader )
		{
		RotationFileReader_close( &sceneOrientationFileReader );
		@@ -1008,6 +1049,9 @@ static bool parseCmdlIVAS_enc(
		/-----------------------------------------------------------------
		* Set default values
		-----------------------------------------------------------------/
		#ifdef FIX_1527_CMR_BITRATE_IDX
		memset( arg, 0, sizeof( *arg ) );
		#endif

		arg->inputWavFilename = NULL;
		arg->outputBitstreamFilename = NULL;
		@@ -1874,6 +1918,20 @@ static bool parseCmdlIVAS_enc(
		arg->deviceOrientationTrajFileName = argv[i];
		i++;
		}
		#ifdef FIX_1527_CMR_BITRATE_IDX
		else if ( strcmp( argv_to_upper, "-REQUESTS" ) == 0 )
		{
		i++;
		if ( argc - i <= 4 \|\| argv[i][0] == '-' )
		{
		fprintf( stderr, "Error: Remote requests file name not specified!\n\n" );
		usage_enc();
		return false;
		}
		arg->requestsFileName = argv[i];
		i++;
		}
		#endif

		/-----------------------------------------------------------------
		* Option not recognized
		@@ -2093,6 +2151,10 @@ static void usage_enc( void )
		fprintf( stdout, " EVS RTP Payload Format is used. Optional N represents number of frames per RTP packet\n" );
		fprintf( stdout, "-scene_orientation : Scene orientation trajectory file. Only used with rtpdump output.\n" );
		fprintf( stdout, "-device_orientation : Device orientation trajectory file. Only used with rtpdump output.\n" );
		#ifdef FIX_1527_CMR_BITRATE_IDX
		fprintf( stdout, "-requests : Remote requests file, Only used with rtpdump output.\n" );
		#endif

		fprintf( stdout, "\n" );

		return;

lib_com/basop_util.c

+60 −0

Original line number	Diff line number	Diff line
		@@ -714,6 +714,66 @@ Word16 getScaleFactor16( /* o: measured headroom in range [
		return i;
		}

		#ifdef OPTIMIZE_FFT_STACK
		/* o: measured headroom in range [0..31], 0 if all x[i] == 0 */
		Word16 getScaleFactor32_cmplx(
		cmplx x, / i: array containing 32-bit data */
		const Word16 len_x /* i: length of the array to scan */
		)
		{
		Word16 i, i_min, i_max, i_re, i_im;
		Word32 x_min_re, x_max_re, x_min_im, x_max_im;

		x_max_re = 0;
		move32();
		x_min_re = 0;
		move32();
		x_max_im = 0;
		move32();
		x_min_im = 0;
		move32();
		FOR( i = 0; i < len_x; i++ )
		{
		if ( x[i].re >= 0 )
		x_max_re = L_max( x_max_re, x[i].re );
		if ( x[i].re < 0 )
		x_min_re = L_min( x_min_re, x[i].re );
		if ( x[i].im >= 0 )
		x_max_im = L_max( x_max_im, x[i].im );
		if ( x[i].im < 0 )
		x_min_im = L_min( x_min_im, x[i].im );
		}

		i_max = 0x20;
		move16();
		i_min = 0x20;
		move16();

		if ( x_max_re != 0 )
		i_max = norm_l( x_max_re );

		if ( x_min_re != 0 )
		i_min = norm_l( x_min_re );

		i_re = s_and( s_min( i_max, i_min ), 0x1F );

		i_max = 0x20;
		move16();
		i_min = 0x20;
		move16();

		if ( x_max_im != 0 )
		i_max = norm_l( x_max_im );

		if ( x_min_im != 0 )
		i_min = norm_l( x_min_im );

		i_im = s_and( s_min( i_max, i_min ), 0x1F );

		return s_min( i_re, i_im );
		}
		#endif


		/********************************************************************/
		/*!

lib_com/basop_util.h

+12 −3

Original line number	Diff line number	Diff line
		@@ -216,10 +216,19 @@ void BASOP_Util_Sqrt_InvSqrt_MantExp( Word16 mantissa, /!< mantissa /
		and -32768 <= x <= -16384 for negative x
		*/

		Word16 getScaleFactor16( /* o: measured headroom in range [0..15], 0 if all x[i] == 0 */
		/* o: measured headroom in range [0..15], 0 if all x[i] == 0 */
		Word16 getScaleFactor16(
		const Word16 x, / i: array containing 16-bit data */
		const Word16 len_x ); /* i: length of the array to scan */

		#ifdef OPTIMIZE_FFT_STACK
		/* o: measured headroom in range [0..31], 0 if all x[i] == 0 */
		Word16 getScaleFactor32_cmplx(
		cmplx x, / i: array containing 32-bit data */
		const Word16 len_x /* i: length of the array to scan */
		);
		#endif

		/********************************************************************/
		/*!
		\brief Calculates the scalefactor needed to normalize input array

Admin message