Merge remote-tracking branch 'origin/main' into RTP_revision (8d45a595) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -2084,12 +2084,16 @@ static ivas_error initOnFirstGoodFrame(
		fParamsSR = fopen( srParamsFile, "w" );
		if ( NULL != fParamsSR )
		{
		#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		fprintf( fParamsSR, "DOF = %d;\nLC3PLUS_HIGHRES = %d;\n", poseCorrection, lc3plusHighRes );
		#else
		fprintf( fParamsSR, "CODEC = %s;\nDOF = %d;\nFRAMESIZE = %d;\nRENDERSIZE = %d;\nLC3PLUS_HIGHRES = %d;\n",
		splitRendCodec == ISAR_SPLIT_REND_CODEC_LC3PLUS ? "LC3PLUS" : "LCLD",
		poseCorrection,
		splitRendCodecFrameSizeMs,
		splitRendIsarFrameSizeMs,
		lc3plusHighRes );
		#endif
		fclose( fParamsSR );
		fParamsSR = NULL;
		}
		@@ -3288,8 +3292,10 @@ static ivas_error printBitstreamInfoVoip(
		case IVAS_DEC_INPUT_FORMAT_RTPDUMP:
		case IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF:
		#ifdef IVAS_RTPDUMP
		#ifndef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		#ifdef RTP_S4_251135_CR26253_0016_REV1
		if ( ( error = IVAS_RTP_READER_Init( &ivasRtp, 0, arg.inputBitstreamFilename, arg.piOutputFilename, arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL, arg.outputWavFilename ) ) != IVAS_ERR_OK )
		#endif
		#else
		if ( ( error = IVAS_RTP_READER_Init( &ivasRtp, arg.inputBitstreamFilename, arg.piOutputFilename, arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL, arg.outputWavFilename ) ) != IVAS_ERR_OK )
		#endif
		@@ -3456,7 +3462,11 @@ static ivas_error decodeVoIP(
		#ifdef IVAS_RTPDUMP
		IVAS_RTP ivasRtp = { 0 };
		IVAS_RTP srRtp = { 0 };
		#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		IVAS_RTP_SR_INFO srInfo = { true, false, 0, 20, IVAS_SR_TRANSPORT_LCLD };
		#else
		IVAS_RTP_SR_INFO srInfo = { true, false, 0, IVAS_SR_TRANSPORT_LCLD };
		#endif
		int32_t initialTsOffsetSystemAndRTP = 0;
		#else
		FILE *f_rtpstream = NULL;
		@@ -3536,8 +3546,10 @@ static ivas_error decodeVoIP(
		case IVAS_DEC_INPUT_FORMAT_RTPDUMP:
		case IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF:
		#ifdef IVAS_RTPDUMP
		#ifndef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		#ifdef RTP_S4_251135_CR26253_0016_REV1
		if ( ( error = IVAS_RTP_READER_Init( &ivasRtp, 0, arg.inputBitstreamFilename, arg.piOutputFilename, arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL, arg.outputWavFilename ) ) != IVAS_ERR_OK )
		#endif
		#else
		if ( ( error = IVAS_RTP_READER_Init( &ivasRtp, arg.inputBitstreamFilename, arg.piOutputFilename, arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL, arg.outputWavFilename ) ) != IVAS_ERR_OK )
		#endif
		@@ -4156,6 +4168,7 @@ static ivas_error decodeVoIP(
		{
		srInfo.bitrateKbps = splitRendBits->bits_written * 1000 / splitRendBits->codec_frame_size_ms;
		srInfo.codec = ( splitRendBits->codec == ISAR_SPLIT_REND_CODEC_LC3PLUS ) ? IVAS_SR_TRANSPORT_LC3PLUS : IVAS_SR_TRANSPORT_LCLD;
		srInfo.codecFrameSizeMs = (uint32_t) splitRendBits->codec_frame_size_ms;
		if ( ( error = IVAS_RTP_WriteNextFrame( &srRtp, splitRendBits->bits_buf, &srInfo, (int16_t) splitRendBits->bits_written, false, false ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError %s while pushing SR audio bitstream to RTP pack\n", ivas_error_to_string( error ) );

apps/isar_post_rend.c

+77 −0

Original line number	Diff line number	Diff line
		@@ -749,6 +749,9 @@ static void trim( char *str )

		static ivas_error parseSRParamsFile(
		const char *srParamsFilePath,
		#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		const char *rtpFilePath,
		#endif
		ISAR_SPLIT_REND_CODEC *codec,
		ISAR_SPLIT_REND_POSE_CORRECTION_MODE *poseCorrection,
		int16_t *codec_frame_size_ms,
		@@ -775,6 +778,24 @@ static ivas_error parseSRParamsFile(
		trim( key );
		trim( value );

		#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		if ( 0 == strncmp( key, "DOF", 3 ) )
		{
		int val = atoi( value );
		if ( val == 0 \|\| val == 1 )
		{
		*poseCorrection = ( val == 0 ) ? ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE : ISAR_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB;
		}
		}
		else if ( 0 == strncmp( key, "LC3PLUS_HIGHRES", 15 ) )
		{
		int val = atoi( value );
		if ( val == 0 \|\| val == 1 )
		{
		*lc3plusHighRes = (int16_t) val;
		}
		}
		#else
		if ( 0 == strncmp( key, "CODEC", 5 ) )
		{
		codec = ( 0 == strncmp( value, "LCLD", 4 ) ) ? ISAR_SPLIT_REND_CODEC_LCLD : codec;
		@@ -812,10 +833,52 @@ static ivas_error parseSRParamsFile(
		*lc3plusHighRes = (int16_t) val;
		}
		}
		#endif
		}
		}

		fclose( fParamSR );

		#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		{
		/* Peek the RTP stream to ascertain the codec and codec_frame_size */
		ivas_error error = IVAS_ERR_OK;
		IVAS_RTP srRtp = { 0 };
		if ( ( error = IVAS_RTP_READER_Init( &srRtp, rtpFilePath, NULL, false, NULL ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "error in IVAS_RTP_READER_Init() for sr RTP peek: %d\n", error );
		return error;
		}

		/* read a frame */
		while ( 1 )
		{
		bool qBit = false;
		IVAS_RTP_SR_INFO srInfo = { 0 };
		uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3];
		int16_t auSize = 0;
		uint16_t rtpSequenceNumber = 0;
		uint32_t rtpTimeStamp = 0, nextPacketRcvTime_ms = 0;

		error = IVAS_RTP_ReadNextFrame( &srRtp, au, &auSize, &rtpTimeStamp, &rtpSequenceNumber, &nextPacketRcvTime_ms, &srInfo, &qBit );
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_RTP_ReadNextFrame, error code: %d\n", error );
		return error;
		}

		if ( srInfo.valid )
		{
		*codec = ( srInfo.codec == IVAS_SR_TRANSPORT_LCLD ) ? ISAR_SPLIT_REND_CODEC_LCLD : ISAR_SPLIT_REND_CODEC_LC3PLUS;
		*codec_frame_size_ms = (int16_t) srInfo.codecFrameSizeMs;
		isar_frame_size_ms = codec_frame_size_ms; /* for rtp force codec framesize as isar renderer frame size */
		break;
		}
		}
		IVAS_RTP_Term( &srRtp );
		}
		#endif

		return IVAS_ERR_OK;
		}
		#endif
		@@ -949,6 +1012,9 @@ int main(
		if ( ( args.inConfig.numBinBuses > 0 ) && ( args.inConfig.binBuses[0].srRtp ) )
		{
		error = parseSRParamsFile( args.srParamsFilePath,
		#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		args.inputFilePath,
		#endif
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms,
		@@ -960,12 +1026,20 @@ int main(
		goto cleanup;
		}

		#ifndef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		if ( ( error = IVAS_RTP_READER_Init( &srRTP, (uint32_t) bitsBuffer.config.codec_frame_size_ms, args.inputFilePath, NULL, false, NULL ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_RTP_READER_Init( &srRTP, args.inputFilePath, NULL, false, NULL ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "error in IVAS_RTP_READER_Init(): %d\n", error );
		goto cleanup;
		}
		audioReader = NULL;
		#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		/* Force owerwrite of command line provided rendersize to align with codec frame size */
		args.render_framesize = bitsBuffer.config.isar_frame_size_ms / 5;
		#endif
		}
		/if split renderer is running in post renderer mode/
		else if ( ( args.inConfig.numBinBuses > 0 ) && ( args.inConfig.binBuses[0].audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) )
		@@ -1195,6 +1269,9 @@ int main(
		if ( error == IVAS_ERR_END_OF_FILE )
		{
		numSamplesRead = 0;
		#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		break;
		#endif
		}
		else
		{

lib_com/options.h

100755 → 100644

+1 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@
		#define ISM_PI_DATA /* Add reading and packing/unpacking of ISM PI data */
		#define REVERSE_ISM_PI_DATA /* Add reading and packing/unpacking of reverse ISM PI data */
		#define DECODER_FORMAT_SWITCHING /* Re-initialize the decoder when the format/subformat of the incoming stream is changed */
		#define RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE /* CR for split rendering codec framesize signalling in Toc Byte*/
		#define FIX_SPLIT_RENDERING_ON_DECODER_RESTART /* Re-configure split rendering on decoder restart */

		/* ################### Start BE switches ################################# */

lib_util/ivas_rtp_api.h

+8 −3

Original line number	Diff line number	Diff line
		@@ -275,6 +275,9 @@ typedef struct
		bool valid; /* Valid Split Rendering Info for/in the ToC */
		bool diegetic; /* SR content digetic */
		uint32_t bitrateKbps; /* SR bitrate in kbps */
		#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		uint32_t codecFrameSizeMs; /* SR transport codec framesize in ms (5/10/20) */
		#endif
		IVAS_RTP_SR_TRANSPORT codec; /* SR Transport Codec used*/
		} IVAS_RTP_SR_INFO;
		#endif /* RTP_S4_251135_CR26253_0016_REV1 */
		@@ -420,9 +423,11 @@ typedef struct IVAS_RTP_UNPACK IVAS_RTP_UNPACK_HANDLE; / rtp unpacker handle t
		typedef struct
		{
		uint32_t maxFramesPerPacket; /* maximum no of frame per packet expected during the session */
		#ifndef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		#ifdef RTP_S4_251135_CR26253_0016_REV1
		uint32_t srCodecFrameSizeMs; /* split rendering transport codec frame size in ms (5/10/20) set by sdp negotiation */
		#endif
		#endif
		} IVAS_RTP_UNPACK_CONFIG;

		/* Open an instance of the RTP unpacker and return a handle to rtp unpacker on success

lib_util/ivas_rtp_file.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -871,8 +871,10 @@ ivas_error IVAS_RTP_WRITER_Init(

		ivas_error IVAS_RTP_READER_Init(
		IVAS_RTP rtp, / i/o : IVAS RTP File reader handle */
		#ifndef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		#ifdef RTP_S4_251135_CR26253_0016_REV1
		uint32_t srCodecFrameSizeMs, /* i : SR Codec Framesize in ms */
		#endif
		#endif
		const char inputBitstreamFilename, / i : Input rtpdump filename */
		const char piOutputFilename, / i : Output PI data json filename */
		@@ -885,7 +887,9 @@ ivas_error IVAS_RTP_READER_Init(
		memset( rtp, 0, sizeof( IVAS_RTP ) );

		rtp->unpackCfg.maxFramesPerPacket = IVAS_MAX_FRAMES_PER_RTP_PACKET;
		#ifndef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE
		rtp->unpackCfg.srCodecFrameSizeMs = srCodecFrameSizeMs;
		#endif
		rtp->rtpPacket.buffer = rtp->packet;
		rtp->rtpPacket.capacity = sizeof( rtp->packet );