Use new preprocessor switch also in apps dir (073c31e4) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -714,7 +714,7 @@ int main(
		renderConfig.roomAcoustics.override = true;
		}
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		/* 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;
		@@ -1983,7 +1983,7 @@ static ivas_error initOnFirstGoodFrame(
		ISAR_SPLIT_REND_CODEC splitRendCodec;
		int16_t splitRendCodecFrameSizeMs;
		ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrection;
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		int16_t splitRendIsarFrameSizeMs;
		int16_t lc3plusHighRes;
		#endif
		@@ -1997,11 +1997,11 @@ static ivas_error initOnFirstGoodFrame(
		if ( ( error = IVAS_DEC_GetSplitRendBitstreamHeader( hIvasDec,
		&splitRendCodec,
		&poseCorrection,
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		&splitRendIsarFrameSizeMs,
		#endif
		&splitRendCodecFrameSizeMs
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		&lc3plusHighRes
		#endif
		@@ -2020,7 +2020,7 @@ static ivas_error initOnFirstGoodFrame(
		splitRendCodec,
		poseCorrection,
		splitRendCodecFrameSizeMs
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		splitRendIsarFrameSizeMs,
		arg.output_Fs,
		@@ -2049,7 +2049,7 @@ static ivas_error initOnFirstGoodFrame(
		splitRendCodec,
		poseCorrection,
		splitRendCodecFrameSizeMs
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		splitRendIsarFrameSizeMs,
		arg.output_Fs,
		@@ -2091,7 +2091,7 @@ 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
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		splitRendBitsZero.codec_frame_size_ms = 0;
		splitRendBitsZero.isar_frame_size_ms = 20;
		#else

apps/isar_post_rend.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -730,7 +730,7 @@ 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
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		bitsBuffer.config.codec_frame_size_ms = 5;
		bitsBuffer.config.isar_frame_size_ms = 20;
		bitsBuffer.config.lc3plusHighRes = 0;
		@@ -760,7 +760,7 @@ int main(
		SplitRendBFIFileReader_open( args.splitRendBFIFilePath, &splitRendBFIReader );
		}

		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		int32_t inFileSampleRate = 0;
		#endif
		strncpy( audioFilePath, args.inputFilePath, FILENAME_MAX - 1 );
		@@ -772,7 +772,7 @@ int main(
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		&bitsBuffer.config.isar_frame_size_ms,
		&inFileSampleRate,
		@@ -800,7 +800,7 @@ int main(
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		&bitsBuffer.config.isar_frame_size_ms,
		&inFileSampleRate,
		@@ -815,7 +815,7 @@ int main(
		audioReader = NULL;
		}

		#ifndef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifndef ISAR_BITSTREAM_UPDATE_LC3PLUS
		int32_t inFileSampleRate = 0;
		#endif
		if ( audioReader != NULL )
		@@ -823,7 +823,7 @@ int main(
		error = AudioFileReader_getSamplingRate( audioReader, &inFileSampleRate );
		}
		else
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		if ( hSplitRendFileReadWrite == NULL )
		#endif
		{
		@@ -888,7 +888,7 @@ int main(
		bitsBuffer.config.codec,
		bitsBuffer.config.poseCorrection,
		bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		bitsBuffer.config.isar_frame_size_ms,
		bitsBuffer.config.lc3plusHighRes

apps/renderer.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -762,7 +762,7 @@ 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
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		bitsBuffer.config.codec_frame_size_ms = 5;
		bitsBuffer.config.isar_frame_size_ms = 20;
		bitsBuffer.config.lc3plus_highres = 0;
		@@ -1113,7 +1113,7 @@ int main(
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		/* 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;
		@@ -1384,7 +1384,7 @@ int main(
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		&bitsBuffer.config.isar_frame_size_ms
		#endif
		@@ -1403,7 +1403,7 @@ int main(
		bitsBuffer.config.codec,
		bitsBuffer.config.poseCorrection,
		bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		bitsBuffer.config.isar_frame_size_ms,
		args.sampleRate,
		@@ -1425,7 +1425,7 @@ int main(
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		&bitsBuffer.config.isar_frame_size_ms
		#endif
		@@ -1444,7 +1444,7 @@ int main(
		bitsBuffer.config.codec,
		bitsBuffer.config.poseCorrection,
		bitsBuffer.config.codec_frame_size_ms
		#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		bitsBuffer.config.isar_frame_size_ms,
		args.sampleRate,