- Merge remote-tracking branch 'remotes/origin/main' into FIX_FMSW_DEC (906ae3fa) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Workspace_msvc/lib_rend.vcxproj.filters

+3 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,9 @@
		<ClCompile Include="..\lib_rend\ivas_cldfb_ring_buffer.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_rend\ivas_binRenderer_internal.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_rend\lib_rend.h" />

apps/decoder.c

+60 −0

Original line number	Diff line number	Diff line
		@@ -175,7 +175,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
		#ifdef FIX_FMSW_DEC
		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_DEC_HANDLE phIvasDec, int16_t *pcmBuf );
		#else
		@@ -791,7 +795,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 )
		@@ -1969,6 +1977,9 @@ 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 )
		{
		@@ -2005,7 +2016,11 @@ 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;
		@@ -2237,7 +2252,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 )

		{
		@@ -2245,6 +2264,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
		#ifdef DEBUGGING
		int16_t fec_seed = 12558; /* FEC_SEED */
		#endif
		@@ -2275,6 +2297,9 @@ static ivas_error decodeG192(
		int16_t vec_pos_update, vec_pos_len;
		SplitFileReadWrite *splitRendWriter = NULL;
		int16_t isSplitRend, isSplitCoded;
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		bool restartNeeded;
		#endif

		#ifdef VARIABLE_SPEED_DECODING
		if ( arg.tsmEnabled )
		@@ -2606,6 +2631,41 @@ 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;
		#ifdef FIX_FMSW_DEC
		if ( ( error = restartDecoder( &hIvasDec, codecMode, &arg ) ) != IVAS_ERR_OK )
		#else
		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;
		}
		#endif
		phIvasDec = hIvasDec; / Update for main()' s free */
		}
		#endif

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

apps/encoder.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,9 @@ 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
		@@ -623,7 +626,11 @@ 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;

apps/encoder_fmtsw.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,9 @@ int encoder_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
		@@ -731,7 +734,11 @@ int encoder_main(

		if ( arg.rtpdumpOutput && init_RtpWriter )
		{
		#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;

lib_com/common_api_types.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,10 @@
		#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