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

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@
		#define FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN /* Nokia: BASOP issue 2513: Removes extra return block */
		#define FIX_BASOP_2514_EFAP_PORTING_ERROR /* Nokia: BASOP issue 2514: Fix wrongly ported line */
		#define FIX_BASOP_2516_REND_CUSTOM_LAYOUT_PORT_BUG /* Nokia: BASOP issue 2516: Fix porting bug in setting planar state for custom layout in renderer */
		#define USE_RTPDUMP /* FhG: RTPDUMP format (rtptools standard) instead of custom format */
		#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS /* Nokia: float issue 1569: fix render config checks in renderer */
		#define FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG /* Nokia: BASOP issue 2526: Fix wrong Q variable in SPAR to MASA param mapping */
		#define FIX_BASOP_2524_MASA_REDUCE_META_BUG /* Nokia: BASOP issue 2524: Fix wrong reset of W_tmp in reduce_metadata_further_fx */

lib_util/ivas_rtp_file.c

+71 −1

Original line number	Diff line number	Diff line
		@@ -37,14 +37,26 @@
		#include "ivas_error_utils.h"
		#include "float_to_fix_ops.h"


		#define Q15 15

		#ifdef USE_RTPDUMP
		#include "rtpdump.h"

		struct IVAS_RTP_FILE
		{
		bool isFileWriter;
		RTPDUMP_HANDLE f_rtpstream;
		uint32_t offset_ms;
		};

		#else // USE_RTPDUMP

		struct IVAS_RTP_FILE
		{
		bool isFileWriter;
		FILE *f_rtpstream;
		};
		#endif // USE_RTPDUMP

		static ivas_error IvasRtpFile_Open(
		const char filePath, / i : path to CA config file */
		@@ -52,12 +64,29 @@ static ivas_error IvasRtpFile_Open(
		IVAS_RTP_FILE_HANDLE phRtpFile / o : pointer to an IVAS file reader handle */
		)
		{
		#ifdef USE_RTPDUMP
		RTPDUMP_HANDLE f_rtpstream;
		RTPDUMP_ERROR rderr;
		if ( isFileWriter )
		{
		rderr = RTPDUMP_OpenForWriting( &f_rtpstream, filePath );
		}
		else
		{
		rderr = RTPDUMP_OpenForReading( &f_rtpstream, filePath );
		}
		if ( rderr != RTPDUMP_NO_ERROR )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_FILE_OPEN, "rtpdump open error %d", rderr );
		}
		#else // USE_RTPDUMP
		const char *mode = isFileWriter ? "wb" : "rb";
		FILE *f_rtpstream = fopen( filePath, mode );
		if ( f_rtpstream == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_FILE_OPEN, "could not open: %s\n", filePath );
		}
		#endif // USE_RTPDUMP

		*phRtpFile = calloc( 1, sizeof( struct IVAS_RTP_FILE ) );
		if ( *phRtpFile != NULL )
		@@ -77,7 +106,11 @@ static ivas_error IvasRtpFile_Close(
		{
		if ( ( *phReader )->f_rtpstream != NULL )
		{
		#ifdef USE_RTPDUMP
		RTPDUMP_Close( &( *phReader )->f_rtpstream, 1 );
		#else // USE_RTPDUMP
		fclose( ( *phReader )->f_rtpstream );
		#endif // USE_RTPDUMP
		( *phReader )->f_rtpstream = NULL;
		}
		free( *phReader );
		@@ -95,9 +128,20 @@ static ivas_error IvasRtpFile_Write(
		ivas_error error = IVAS_ERR_OK;
		if ( hRtpFile->isFileWriter )
		{
		#ifdef USE_RTPDUMP
		RTPDUMP_RTPPACKET pkt;
		RTPDUMP_SetDefaultRtpPacketHeader( &pkt );
		numBytes = ( numBytes > sizeof( pkt.data ) ) ? sizeof( pkt.data ) : numBytes;
		memcpy( pkt.data, packet, numBytes );
		RTPDUMP_ParseRTPHeader( &pkt );
		pkt.payloadSize = (unsigned short) ( numBytes - pkt.headerSize );
		/* compute time offset in ms from RTP timestamp (16kHz clock) */
		error = ( RTPDUMP_WritePacket( hRtpFile->f_rtpstream, &pkt, pkt.timeStamp / 16 ) != RTPDUMP_NO_ERROR ) ? IVAS_ERR_FAILED_FILE_WRITE : IVAS_ERR_OK;
		#else // USE_RTPDUMP
		uint32_t length = (uint32_t) numBytes; /* Max packet length is < 32 bits*/
		fwrite( &length, sizeof( uint32_t ), 1, hRtpFile->f_rtpstream );
		fwrite( packet, sizeof( uint8_t ), numBytes, hRtpFile->f_rtpstream );
		#endif // USE_RTPDUMP
		}
		else
		{
		@@ -114,12 +158,35 @@ static ivas_error IvasRtpFile_Read(
		)
		{
		size_t nread = 0;
		#ifndef USE_RTPDUMP
		uint32_t length = 0;
		#endif // USE_RTPDUMP
		if ( hRtpFile->isFileWriter )
		{
		return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "File open for writing cannot be read" );
		}

		#ifdef USE_RTPDUMP
		RTPDUMP_RTPPACKET pd;
		RTPDUMP_ERROR rderr = RTPDUMP_ReadPacket( hRtpFile->f_rtpstream, &pd, &hRtpFile->offset_ms );
		if ( rderr == RTPDUMP_READ_ENDOFFILE )
		{
		return IVAS_ERR_END_OF_FILE;
		}
		if ( rderr != RTPDUMP_NO_ERROR )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_FILE_OPEN, "rtpdump read error %d", rderr );
		}

		/* copy raw data to unpack buffer */
		nread = pd.headerSize + pd.payloadSize;
		if ( nread > capacity )
		{
		return IVAS_ERR_INVALID_OUTPUT_BUFFER_SIZE;
		}
		memcpy( packet, pd.data, nread );
		*numBytes = nread;
		#else // USE_RTPDUMP
		nread = fread( &length, sizeof( uint32_t ), 1, hRtpFile->f_rtpstream ); /* Read Packet Length */
		if ( nread == 0 )
		{
		@@ -138,6 +205,7 @@ static ivas_error IvasRtpFile_Read(
		{
		return IVAS_ERR_END_OF_FILE;
		}
		#endif // USE_RTPDUMP

		return IVAS_ERR_OK;
		}
		@@ -902,6 +970,7 @@ ivas_error IVAS_RTP_WRITER_Init(
		return error;
		}

		/* initialize RTP packer header sequence only in file-based mode */
		#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API
		error = IVAS_RTP_PACK_UpdateHeader( rtp->hPack, payloadType, seqNumInitVal, SSRC, 0, NULL, 0, 0, NULL );
		#else
		@@ -935,6 +1004,7 @@ ivas_error IVAS_RTP_READER_Init(
		error = IVAS_RTP_UNPACK_Open( &rtp->hUnpack, &rtp->unpackCfg );
		if ( error == IVAS_ERR_OK )
		{
		/* Open the output file for RTPDump writing */
		error = IvasRtpFile_Open( inputBitstreamFilename, false, &rtp->hRtpFile );
		if ( error != IVAS_ERR_OK )
		{

lib_util/mime_io.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@

		*******************************************************************************************************/

		#include "options.h"
		#include "mime_io.h"
		#include "mime.h"
		#include "prot_fx.h"
		@@ -317,7 +318,11 @@ static bool readByte( FILE file, uint8_t value )
		static bool readLong( FILE file, uint16_t value )
		{
		char buffer[4] = { 0 };
		#ifdef USE_RTPDUMP
		if ( fread( buffer, 1, 4, file ) != 4U )
		#else
		if ( fread( buffer, 1, 4, file ) != 1U )
		#endif
		{
		return false;
		}

lib_util/rtpdump.c

+93 −4

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@
		#include <stdio.h>
		#include <string.h>
		#include <stdlib.h>
		#include "rtpdump.h"
		#include "options.h"
		#include "rtpdump.h"

		struct RTPDUMP
		{
		@@ -81,7 +81,7 @@ static unsigned char parseByte( unsigned char buffer, unsigned char *value )
		static int readLong( FILE file, unsigned int value )
		{
		char buffer[4] = { 0 };
		if ( fread( buffer, 1, 4, file ) != 1U )
		if ( fread( buffer, 1, 4, file ) != 4U )
		{
		return -1;
		}
		@@ -97,7 +97,7 @@ static int readLong( FILE file, unsigned int value )
		static int readShort( FILE file, unsigned short value )
		{
		char buffer[2] = { 0 };
		if ( fread( buffer, 1, 2, file ) != 1U )
		if ( fread( buffer, 1, 2, file ) != 2U )
		{
		return -1;
		}
		@@ -199,7 +199,22 @@ static int readHeader( struct RTPDUMP *hRTPDUMP )
		static int writeHeader( struct RTPDUMP *hRTPDUMP )
		{
		/* write rtpdump header */
		fprintf( hRTPDUMP->file, "#!rtpplay%s %s/%d\n", "1.0", "127.0.0.1", 5000 );
		/* Use defaults if not configured (for backward compatibility) */
		if ( hRTPDUMP->source == 0 && hRTPDUMP->port == 0 )
		{
		hRTPDUMP->source = 0x7F000001u; /* 127.0.0.1 */
		hRTPDUMP->port = 5000u;
		}

		/* Format IP address for text header */
		unsigned char ip[4];
		ip[0] = (unsigned char) ( ( hRTPDUMP->source >> 24 ) & 0xFF );
		ip[1] = (unsigned char) ( ( hRTPDUMP->source >> 16 ) & 0xFF );
		ip[2] = (unsigned char) ( ( hRTPDUMP->source >> 8 ) & 0xFF );
		ip[3] = (unsigned char) ( hRTPDUMP->source & 0xFF );

		fprintf( hRTPDUMP->file, "#!rtpplay%s %u.%u.%u.%u/%u\n", "1.0", ip[0], ip[1], ip[2], ip[3], hRTPDUMP->port );

		if ( !writeLong( hRTPDUMP->file, hRTPDUMP->startSeconds ) &&
		!writeLong( hRTPDUMP->file, hRTPDUMP->startMicroSeconds ) &&
		!writeLong( hRTPDUMP->file, hRTPDUMP->source ) &&
		@@ -257,6 +272,7 @@ RTPDUMP_OpenForWriting( RTPDUMP_HANDLE phRTPDUMP, const char filename )
		return RTPDUMP_FILE_NOT_FOUND;
		}

		/* Write header immediately (can be updated later via RTPDUMP_SetHeaderInfo) */
		if ( writeHeader( *phRTPDUMP ) != 0 )
		{
		return RTPDUMP_INIT_ERROR;
		@@ -265,6 +281,79 @@ RTPDUMP_OpenForWriting( RTPDUMP_HANDLE phRTPDUMP, const char filename )
		return RTPDUMP_NO_ERROR;
		}

		#ifdef USE_RTPDUMP
		RTPDUMP_ERROR
		RTPDUMP_SetHeaderInfo( RTPDUMP_HANDLE hRTPDUMP,
		uint32_t source,
		uint16_t port,
		uint32_t startSeconds,
		uint32_t startMicroSeconds )
		{
		if ( !hRTPDUMP )
		{
		return RTPDUMP_NOT_INITIALIZED;
		}

		hRTPDUMP->source = source;
		hRTPDUMP->port = port;
		hRTPDUMP->startSeconds = startSeconds;
		hRTPDUMP->startMicroSeconds = startMicroSeconds;

		/* If file is open for writing, seek back and rewrite the header */
		if ( hRTPDUMP->file )
		{
		long currentPos = ftell( hRTPDUMP->file );
		if ( currentPos < 0 )
		{
		return RTPDUMP_WRITE_ERROR;
		}

		/* Seek to beginning and rewrite header */
		if ( fseek( hRTPDUMP->file, 0, SEEK_SET ) != 0 )
		{
		return RTPDUMP_WRITE_ERROR;
		}

		if ( writeHeader( hRTPDUMP ) != 0 )
		{
		return RTPDUMP_WRITE_ERROR;
		}

		/* Restore file position */
		if ( fseek( hRTPDUMP->file, currentPos, SEEK_SET ) != 0 )
		{
		return RTPDUMP_WRITE_ERROR;
		}
		}

		return RTPDUMP_NO_ERROR;
		}

		RTPDUMP_ERROR
		RTPDUMP_GetHeaderInfo( RTPDUMP_HANDLE hRTPDUMP,
		uint32_t *source,
		uint16_t *port,
		uint32_t *startSeconds,
		uint32_t *startMicroSeconds )
		{
		if ( !hRTPDUMP )
		{
		return RTPDUMP_NOT_INITIALIZED;
		}

		if ( source )
		*source = hRTPDUMP->source;
		if ( port )
		*port = hRTPDUMP->port;
		if ( startSeconds )
		*startSeconds = hRTPDUMP->startSeconds;
		if ( startMicroSeconds )
		*startMicroSeconds = hRTPDUMP->startMicroSeconds;

		return RTPDUMP_NO_ERROR;
		}
		#endif

		RTPDUMP_ERROR
		RTPDUMP_ReadPacket( RTPDUMP_HANDLE hRTPDUMP,
		RTPDUMP_RTPPACKET *packet,

lib_util/rtpdump.h

+19 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ extern "C"
		{
		#endif

		#define RTPDUMP_MAX_PACKET_SIZE 12300 /* Maximum size of an RTP packet, 12300 to cover IVAS jumbo packets, 1458 for MTU size 1500 */

		typedef enum _RTPDUMP_ERROR
		{
		RTPDUMP_NO_ERROR = 0x0000,
		@@ -68,7 +70,7 @@ extern "C"
		unsigned short sequenceNumber;
		unsigned int timeStamp;
		unsigned int ssrc;
		char data[1500 + 12]; /* raw RTP packet */
		char data[RTPDUMP_MAX_PACKET_SIZE]; /* raw RTP packet */
		unsigned short headerSize;
		unsigned short payloadSize;
		} RTPDUMP_RTPPACKET;
		@@ -83,6 +85,22 @@ extern "C"
		RTPDUMP_ERROR
		RTPDUMP_OpenForWriting( RTPDUMP_HANDLE phRTPDUMP, const char filename );

		#ifdef USE_RTPDUMP
		RTPDUMP_ERROR
		RTPDUMP_SetHeaderInfo( RTPDUMP_HANDLE hRTPDUMP,
		uint32_t source,
		uint16_t port,
		uint32_t startSeconds,
		uint32_t startMicroSeconds );

		RTPDUMP_ERROR
		RTPDUMP_GetHeaderInfo( RTPDUMP_HANDLE hRTPDUMP,
		uint32_t *source,
		uint16_t *port,
		uint32_t *startSeconds,
		uint32_t *startMicroSeconds );
		#endif

		RTPDUMP_ERROR
		RTPDUMP_ReadPacket( RTPDUMP_HANDLE hRTPDUMP,
		RTPDUMP_RTPPACKET *packet,

Admin message