[cleanup] accept FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API (e49c4306) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -1991,9 +1991,7 @@ static ivas_error initOnFirstGoodFrame(
		uint16_t rtpDecSeed = RANDOM_INITSEED_DEC;
		uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) & 0x0000FFFF ) \| ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) << 16 );
		uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpDecSeed );
		#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API
		uint8_t payloadType = DEFAULT_IVAS_PAYLOAD_TYPE; /* Dynamic PT are in range [96, 127] */
		#endif

		if ( ( error = IVAS_DEC_GetDelay( hIvasDec, delayNumSamples_temp, &delayTimeScale_temp ) ) != IVAS_ERR_OK )
		{
		@@ -2030,11 +2028,7 @@ static ivas_error initOnFirstGoodFrame(


		/* Split Rendering RTPDump Output file */
		#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API
		if ( ( error = IVAS_RTP_WRITER_Init( srRtp, arg.outputWavFilename, 1000 / ( IVAS_NUM_FRAMES_PER_SEC * splitRendCodecFrameSizeMs ), payloadType, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_RTP_WRITER_Init( srRtp, arg.outputWavFilename, 1000 / ( IVAS_NUM_FRAMES_PER_SEC * splitRendCodecFrameSizeMs ), ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError: Can't open SR output bitstream file for RTP output %s \n\n", arg.outputWavFilename );
		return error;

+0 −6

Original line number	Diff line number	Diff line
		@@ -233,9 +233,7 @@ int main(
		uint16_t rtpEncSeed = RANDOM_INITSEED_ENC;
		uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) & 0x0000FFFF ) \| ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) << 16 );
		uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpEncSeed );
		#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API
		uint8_t payloadType = DEFAULT_IVAS_PAYLOAD_TYPE; /* Dynamic PT are in range [96, 127] */
		#endif

		/------------------------------------------------------------------------------------------
		* Parse command-line arguments
		@@ -651,11 +649,7 @@ int main(

		if ( arg.rtpdumpOutput )
		{
		#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API
		if ( ( error = IVAS_RTP_WRITER_Init( &ivasRtp, arg.outputBitstreamFilename, arg.numFramesPerPacket, payloadType, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_RTP_WRITER_Init( &ivasRtp, arg.outputBitstreamFilename, arg.numFramesPerPacket, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError: Can't open output bitstream file for RTP output %s \n\n", arg.outputBitstreamFilename );
		goto cleanup;

+0 −2

Original line number	Diff line number	Diff line
		@@ -70,10 +70,8 @@
		#define IVAS_TIME_SCALE_MIN 50 /* min. time-scaling [%] */
		#define IVAS_TIME_SCALE_MAX 150 /* max. time-scaling [%] */

		#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API
		/* RTP constants */
		#define DEFAULT_IVAS_PAYLOAD_TYPE ( 96 )
		#endif

		/----------------------------------------------------------------------------------
		* Common API enum for output audio configurations

+0 −1

Original line number	Diff line number	Diff line
		@@ -173,7 +173,6 @@
		/* any switch which is non-be wrt. TS 26.258 V3.0 */

		#define FIX_1521_SBA_LOUDNESS_STEREO /* FhG: issue 1521: Fix loudness for SBA to stereo rendering */
		#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API /* Expose Payload Type setting in RTP Header */
		#define FIX_2500_RENDCONF_REFACTOR /* Eri: Basop issue #2500: Renderer configuration range check before conversion to fixed point. Harmonize between BASOP/float */
		#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION /* Eri: Basop issue 2023: Distance attenuation scaling, synch with BASOP updates and adding clamping of distance att input and listener position */
		#define FIX_1574_EFAP_CODE_LINT /* FhG: issue 1574: Code quality fixes in ivas_efap.c */

+0 −13

Original line number	Diff line number	Diff line
		@@ -306,7 +306,6 @@ void IVAS_RTP_PACK_Close(
		);

		/* Update the RTP Header structure */
		#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API
		ivas_error IVAS_RTP_PACK_UpdateHeader(
		IVAS_RTP_PACK_HANDLE hIvasPack, /* i/o: pointer to an IVAS rtp packer handle to be opened */
		uint8_t payloadType, /* i : 7-bit payload type indication, negotiated via sdp */
		@@ -318,18 +317,6 @@ ivas_error IVAS_RTP_PACK_UpdateHeader(
		uint16_t numExtensionBytes, /* i : length of the extension data */
		uint8_t extData / i : extension data pointer */
		);
		#else
		ivas_error IVAS_RTP_PACK_UpdateHeader(
		IVAS_RTP_PACK_HANDLE hIvasPack, /* i/o: pointer to an IVAS rtp packer handle to be opened */
		uint16_t seqNumInitVal, /* i : Initial sequence number to be used for 1st packet */
		uint32_t ssrc, /* i : Unique 32-bit Source ID as negotiated during SDP */
		uint8_t numCC, /* i : numCC indicates no. of contributing sources */
		uint32_t csrc, / i : SSRCs of contributing Sources for a mixed stream */
		uint16_t extHeaderId, /* i : extension header ID */
		uint16_t numExtensionBytes, /* i : length of the extension data */
		uint8_t extData / i : extension data pointer */
		);
		#endif

		/* Add requests for remote sender using a key value pair api
		* each key must be provided with a corresponding value type