Add missing preprocessor switches (77b8796b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -713,11 +713,12 @@ int main(
		}
		renderConfig.roomAcoustics.override = true;
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		/* ISAR frame size is set from command line, not renderer config file.
		* This will be ignored if output format is not split rendering. */
		renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) arg.renderFramesize /* given in number of 5ms subframes / 5;
		#endif
		#endif

		if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )
		@@ -2073,8 +2074,12 @@ static ivas_error initOnFirstGoodFrame(
		splitRendBitsZero.buf_len = 0;
		splitRendBitsZero.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;
		splitRendBitsZero.pose_correction = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		splitRendBitsZero.codec_frame_size_ms = 0;
		splitRendBitsZero.isar_frame_size_ms = 20;
		#else
		splitRendBitsZero.codec_frame_size_ms = 20;
		#endif

		if ( split_rend_write_bitstream_to_file( *splitRendWriter, splitRendBitsZero.bits_buf, &splitRendBitsZero.bits_read, &splitRendBitsZero.bits_written ) != IVAS_ERR_OK )
		{

apps/isar_post_rend.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -730,10 +730,12 @@ int main(
		bitsBuffer.config.bufLenInBytes = 0;
		bitsBuffer.config.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;
		bitsBuffer.config.poseCorrection = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		bitsBuffer.config.codec_frame_size_ms = 5;
		bitsBuffer.config.isar_frame_size_ms = 20;
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		bitsBuffer.config.lc3plusHighRes = 0;
		#else
		bitsBuffer.config.codec_frame_size_ms = 20;
		#endif


		@@ -769,11 +771,12 @@ int main(
		args.inMetadataFilePaths[0],
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms,
		&bitsBuffer.config.isar_frame_size_ms
		&bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		,
		&inFileSampleRate, &bitsBuffer.config.lc3plusHighRes
		&bitsBuffer.config.isar_frame_size_ms,
		&inFileSampleRate,
		&bitsBuffer.config.lc3plusHighRes
		#endif
		);
		if ( error != IVAS_ERR_OK )
		@@ -796,11 +799,12 @@ int main(
		args.inputFilePath,
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms,
		&bitsBuffer.config.isar_frame_size_ms
		&bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		,
		&inFileSampleRate, &bitsBuffer.config.lc3plusHighRes
		&bitsBuffer.config.isar_frame_size_ms,
		&inFileSampleRate,
		&bitsBuffer.config.lc3plusHighRes
		#endif
		);
		if ( error != IVAS_ERR_OK )
		@@ -883,10 +887,10 @@ int main(
		if ( ( error = ISAR_REND_SetSplitRendBitstreamHeader( hIsarPostRend,
		bitsBuffer.config.codec,
		bitsBuffer.config.poseCorrection,
		bitsBuffer.config.isar_frame_size_ms,
		bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		,
		bitsBuffer.config.isar_frame_size_ms,
		bitsBuffer.config.lc3plusHighRes
		#endif
		) ) != IVAS_ERR_OK )

apps/renderer.c

+17 −5

Original line number	Diff line number	Diff line
		@@ -762,10 +762,12 @@ int main(
		bitsBuffer.config.bufLenInBytes = 0;
		bitsBuffer.config.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;
		bitsBuffer.config.poseCorrection = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		bitsBuffer.config.codec_frame_size_ms = 5;
		bitsBuffer.config.isar_frame_size_ms = 20;
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		bitsBuffer.config.lc3plus_highres = 0;
		#else
		bitsBuffer.config.codec_frame_size_ms = 20;
		#endif
		#endif
		for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )
		@@ -1111,9 +1113,11 @@ int main(
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		/* ISAR frame size is set from command line, not renderer config file.
		* This will be ignored if output format is not split rendering. */
		renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) args.render_framesize /* given in number of 5ms subframes / 5;
		#endif
		#endif

		if ( ( error = IVAS_REND_FeedRenderConfig( hIvasRend, renderConfig ) ) != IVAS_ERR_OK )
		@@ -1379,8 +1383,12 @@ int main(
		IVAS_REND_GetSplitRendBitstreamHeader( hIvasRend,
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.isar_frame_size_ms,
		&bitsBuffer.config.codec_frame_size_ms );
		&bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		,
		&bitsBuffer.config.isar_frame_size_ms
		#endif
		);

		if ( IVAS_REND_GetDelay( hIvasRend, &delayNumSamples_temp, &delayTimeScale_temp ) != IVAS_ERR_OK )
		{
		@@ -1416,8 +1424,12 @@ int main(
		IVAS_REND_GetSplitRendBitstreamHeader( hIvasRend,
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.isar_frame_size_ms,
		&bitsBuffer.config.codec_frame_size_ms );
		&bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		,
		&bitsBuffer.config.isar_frame_size_ms
		#endif
		);

		if ( IVAS_REND_GetDelay( hIvasRend, &delayNumSamples_temp, &delayTimeScale_temp ) != IVAS_ERR_OK )
		{

lib_com/common_api_types.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -257,10 +257,10 @@ typedef struct _ISAR_SPLIT_REND_BITS_DATA
		int32_t bits_written;
		int32_t bits_read;
		int16_t codec_frame_size_ms;
		int16_t isar_frame_size_ms;
		ISAR_SPLIT_REND_CODEC codec;
		ISAR_SPLIT_REND_POSE_CORRECTION_MODE pose_correction;
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		int16_t isar_frame_size_ms;
		int16_t lc3plus_highres;
		#endif

		@@ -278,7 +278,9 @@ typedef struct _ISAR_SPLIT_REND_CONFIG
		3 - (3dof correction. By default YAW, PITCH and ROLL correction)
		*/
		int16_t codec_delay_ms; /PLACEHOLDER (currently being ignored) : look ahead delay of the codec that is used to code BIN signal output of pre-renderer/
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		int16_t isar_frame_size_ms; /* ISAR bit stream frame size in milliseconds */
		#endif
		int16_t codec_frame_size_ms; /* Codec frame size in milliseconds, only relevant with LC3plus */
		ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode;
		ISAR_SPLIT_REND_CODEC codec;

lib_com/ivas_error.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -104,9 +104,11 @@ typedef enum
		* input data errors *
		----------------------------------------/
		IVAS_ERR_INVALID_BITSTREAM = 0x2000,
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef LC3PLUS_RTP_PAYLOAD_FORMAT
		IVAS_ERR_UNEXPECTED_LC3PLUS_BITSTREAM,
		IVAS_ERR_UNEXPECTED_LC3PLUS_BITSTREAM_CONFIG,
		#endif
		#endif

		/----------------------------------------