Merge remote-tracking branch 'origin/main' into FhG_object_editing_interface (fd03d1db) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+14 −14

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ variables:
		OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"
		OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"
		OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"
		OUT_FORMATS_ALL: "$OUT_FORMATS_ALL"
		OUT_FORMATS_ALL: "$OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT"
		IVAS_PIPELINE_NAME: ''
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'test-be-release' to run BE test against release codec."
		@@ -227,12 +227,12 @@ stages:
		- if [ $CLANG_NUM -eq 1 ]; then sanitizer_type="MemorySanitizer"; elif [ $CLANG_NUM -eq 2 ]; then sanitizer_type="AddressSanitizer"; elif [ $CLANG_NUM -eq 3 ]; then sanitizer_type="UndefinedBehaviorSanitizer"; else echo "Wrong CLANG_NUM $CLANG_NUM given!"; exit 1; fi

		# run encoder and decoder with 20ms renderer framesize first, use reference creation mode
		- python3 -m pytest $SELF_TEST_PRM_FILE -v --update_ref 1 -m create_ref --html=report-20ms.html --self-contained-html --junit-xml=report-junit-20ms.xml --testcase_timeout=$testcase_timeout --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec \|\| exit_code20=$?
		- python3 -m pytest tests/codec_be_on_mr_nonselection/test_param_file.py --param_file $SELF_TEST_PRM_FILE -v --update_ref 1 -m create_ref --html=report-20ms.html --self-contained-html --junit-xml=report-junit-20ms.xml --testcase_timeout=$testcase_timeout --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec \|\| exit_code20=$?
		# for 10ms and 5ms renderer framesize, we only need to run the decoder part as renderer framesize is a decoder-only option
		# set tolerance very high do ignore any BE differences due to the different renderer framesizes, those can appear due to the limiter being active
		# we are only interested in runtime errors from the sanitizers and ignore the diffs
		- python3 -m pytest $SELF_TEST_PRM_FILE -v --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only --abs_tol 100000 \|\| exit_code5=$?
		- python3 -m pytest $SELF_TEST_PRM_FILE -v --html=report-10ms.html --self-contained-html --junit-xml=report-junit-10ms.xml --dut_fr 10 --decoder_only --abs_tol 100000 \|\| exit_code10=$?
		- python3 -m pytest tests/codec_be_on_mr_nonselection/test_param_file.py --param_file $SELF_TEST_PRM_FILE -v --html=report-5ms.html --self-contained-html --junit-xml=report-junit-5ms.xml --dut_fr 5 --decoder_only --abs_tol 100000 \|\| exit_code5=$?
		- python3 -m pytest tests/codec_be_on_mr_nonselection/test_param_file.py --param_file $SELF_TEST_PRM_FILE -v --html=report-10ms.html --self-contained-html --junit-xml=report-junit-10ms.xml --dut_fr 10 --decoder_only --abs_tol 100000 \|\| exit_code10=$?

		- if [ $exit_code20 -ne 0 ] \|\| [ $exit_code10 -ne 0 ] \|\| [ $exit_code5 -ne 0 ]; then exit 1; fi

		@@ -561,7 +561,7 @@ codec-msan:
		before_script:
		- CLANG_NUM=1
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS
		- SELF_TEST_PRM_FILE="tests/codec_be_on_mr_nonselection/test_param_file.py"
		- SELF_TEST_PRM_FILE="scripts/config/self_test.prm"
		<<: *sanitizer-selftest-anchor

		# code selftest testvectors with address-sanitizer binaries
		@@ -571,7 +571,7 @@ codec-asan:
		before_script:
		- CLANG_NUM=2
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS
		- SELF_TEST_PRM_FILE="tests/codec_be_on_mr_nonselection/test_param_file.py"
		- SELF_TEST_PRM_FILE="scripts/config/self_test.prm"
		<<: *sanitizer-selftest-anchor

		# code selftest testvectors with undefined-behaviour-sanitizer binaries
		@@ -583,7 +583,7 @@ codec-usan:
		before_script:
		- CLANG_NUM=3
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS
		- SELF_TEST_PRM_FILE="tests/codec_be_on_mr_nonselection/test_param_file.py"
		- SELF_TEST_PRM_FILE="scripts/config/self_test.prm"
		<<: *sanitizer-selftest-anchor

		# compare bit-exactness between 5ms and 20 on the branch
		@@ -1661,13 +1661,13 @@ ltv-msan:
		- .sanitizer-selftest-ltv
		rules:
		- if: $SANITIZER_SCHEDULE_E
		timeout: 3 hour
		timeout: 4 hour
		tags:
		- ivas-linux-fast
		before_script:
		- CLANG_NUM=1
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS
		- SELF_TEST_PRM_FILE="tests/test_param_file_ltv.py"
		- SELF_TEST_PRM_FILE="scripts/config/self_test_ltv.prm"
		<<: *sanitizer-selftest-anchor

		# code selftest long testvectors with address-sanitizer binaries
		@@ -1677,14 +1677,14 @@ ltv-asan:
		rules:
		- if: $SANITIZER_SCHEDULE_E
		when: delayed
		start_in: 3 hours
		start_in: 4 hours
		tags:
		- ivas-linux-fast
		timeout: 3 hour
		before_script:
		- CLANG_NUM=2
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS
		- SELF_TEST_PRM_FILE="tests/test_param_file_ltv.py"
		- SELF_TEST_PRM_FILE="scripts/config/self_test_ltv.prm"
		<<: *sanitizer-selftest-anchor

		# code selftest long testvectors with undefined-behaviour-sanitizer binaries
		@@ -1694,14 +1694,14 @@ ltv-usan:
		rules:
		- if: $SANITIZER_SCHEDULE_E
		when: delayed
		start_in: 6 hours
		start_in: 7 hours
		tags:
		- ivas-linux-fast
		timeout: 3 hour
		before_script:
		- CLANG_NUM=3
		- SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS
		- SELF_TEST_PRM_FILE="tests/test_param_file_ltv.py"
		- SELF_TEST_PRM_FILE="scripts/config/self_test_ltv.prm"
		<<: *sanitizer-selftest-anchor

		.sanitizer-test-template:
		@@ -2289,7 +2289,7 @@ coverage-test-on-main-scheduled:
		&complexity-measurements-setup # create necessary environment
		- mkdir -p wmops/logs

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME)
		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME $CI_PROJECT_ID --success_only)
		- echo $job_id
		- curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts.zip
		- unzip artifacts.zip \|\| true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html

Workspace_msvc/lib_util.vcxproj

+2 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@
		</Lib>
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\lib_util\aeid_file_reader.c" />
		<ClCompile Include="..\lib_util\audio_file_reader.c" />
		<ClCompile Include="..\lib_util\audio_file_writer.c" />
		<ClCompile Include="..\lib_util\bitstream_reader.c" />
		@@ -126,6 +127,7 @@
		<ClCompile Include="..\lib_util\tsm_scale_file_reader.c" />
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_util\aeid_file_reader.h" />
		<ClInclude Include="..\lib_util\audio_file_reader.h" />
		<ClInclude Include="..\lib_util\audio_file_writer.h" />
		<ClInclude Include="..\lib_util\bitstream_reader.h" />

apps/decoder.c

+65 −102

Original line number	Diff line number	Diff line
		@@ -43,6 +43,9 @@
		#include "masa_file_writer.h"
		#include "render_config_reader.h"
		#include "rotation_file_reader.h"
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		#include "aeid_file_reader.h"
		#endif
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#include "split_render_file_read_write.h"
		#endif
		@@ -495,7 +498,7 @@ int main(
		{
		if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		fprintf( stderr, "\nSplit rendering configure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		@@ -677,8 +680,7 @@ int main(
		}
		#endif
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\|
		arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS &&
		( renderConfig.split_rend_config.poseCorrectionMode == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE \|\|
		@@ -728,6 +730,7 @@ int main(
		}
		renderConfig.roomAcoustics.override = true;
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		/* ISAR frame size is set from command line, not renderer config file.
		@@ -1490,7 +1493,7 @@ static bool parseCmdlIVAS_dec(
		arg->outputMdFilename = argv[i + 1];
		if ( arg->outputMdFilename[0] == '\0' )
		{
		fprintf( stderr, "Error: output metadata file path not specified\n\n" );
		fprintf( stderr, "Error: Split rendering output metadata file path not specified\n\n" );
		usage_dec();
		return false;
		}
		@@ -1559,65 +1562,25 @@ static bool parseCmdlIVAS_dec(
		if ( !is_digits_only( argv[i] ) )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		uint16_t k;
		char *s = argv[i];
		char *token = argv[i];

		for ( k = 0; s[k]; )
		{
		s[k] == ',' ? k++ : *s++;
		}
		k++;
		aeidFileReader *aeidReader = NULL;

		if ( k == 0 )
		if ( aeidFileReader_open( argv[i], &aeidReader ) != IVAS_ERR_OK )
		{
		fprintf( stdout, "Error: Invalid acoustic environment sequence specified: %s\n\n", argv[i] );
		fprintf( stderr, "\nError: Can't open aeid file %s \n", argv[i] );
		usage_dec();
		return false;
		}

		if ( NULL == ( arg->aeSequence.pID = malloc( sizeof( uint16_t ) * k ) ) \|\|
		NULL == ( arg->aeSequence.pValidity = malloc( sizeof( uint16_t ) * k ) ) )
		if ( aeidFileReading( aeidReader, &arg->aeSequence.count, &arg->aeSequence.pID, &arg->aeSequence.pValidity ) != IVAS_ERR_OK )
		{
		fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", argv[i] );
		fprintf( stderr, "\nError while reading aeid from %s\n", argv[i] );
		usage_dec();
		return false;
		}

		arg->aeSequence.count = k;

		k = 0;
		token = strtok( argv[i++], ":" );
		aeidFileReader_close( &aeidReader );

		while ( token != NULL )
		{
		if ( !is_number( token ) )
		{
		fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, argv[i] );
		usage_dec();
		return false;
		}
		arg->aeSequence.pID[k] = (uint16_t) atoi( token );

		token = strtok( NULL, "," );
		if ( !is_number( token ) )
		{
		fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, argv[i] );
		usage_dec();
		return false;
		}
		arg->aeSequence.pValidity[k] = (uint16_t) atoi( token );

		token = strtok( NULL, ":" );
		k++;
		}

		if ( k != arg->aeSequence.count )
		{
		fprintf( stdout, "Error while parsing acoustic environment sequence: %s\n\n", argv[i] );
		usage_dec();
		return false;
		}
		i++;
		#else
		fprintf( stdout, "Error: Invalid acoustic environment ID specified: %s\n\n", argv[i] );
		usage_dec();
		@@ -1897,10 +1860,8 @@ static void usage_dec( void )
		fprintf( stdout, " ISMs 1,2,3 and 4 respectively. This options needs to be accompanied by a render_config file,\n" );
		fprintf( stdout, " otherwise a default directivity pattern is used.\n" );
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		fprintf( stdout, "-aeid ID : Acoustic environment ID (number > 0) or\n" );
		fprintf( stdout, " a sequence thereof in the format [ID1:duration1,ID2:duration2...]\n" );
		fprintf( stdout, " without braces and spaces, with ':' character separating ID from duration and ',' separating\n" );
		fprintf( stdout, " ID and duration pairs, where duration is specified in frames\n" );
		fprintf( stdout, "-aeid ID \| File : Acoustic environment ID (number > 0)\n" );
		fprintf( stdout, " alternatively, it can be a text file where each line contains \"ID duration\"\n" );
		fprintf( stdout, " for BINAURAL_ROOM_REVERB output configuration.\n" );
		#else
		fprintf( stdout, "-aeid ID : Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration\n" );
		@@ -1967,6 +1928,9 @@ static ivas_error initOnFirstGoodFrame(
		#endif
		)
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		int16_t isSplitRend, isSplitCoded;
		#endif
		ivas_error error = IVAS_ERR_UNKNOWN;

		/* Now delay, number of output channels and frame size are known */
		@@ -1977,7 +1941,19 @@ static ivas_error initOnFirstGoodFrame(
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( IVAS_DEC_is_split_rendering_enabled( hIvasDec ) )
		if ( ( error = IVAS_DEC_is_split_rendering_enabled( hIvasDec, &isSplitRend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_enabled, code: %d\n", error );
		return error;
		}

		if ( ( error = IVAS_DEC_is_split_rendering_coded_out( hIvasDec, &isSplitCoded ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_coded_out, code: %d\n", error );
		return error;
		}

		if ( isSplitRend )
		{
		pFullDelayNumSamples[0] = 0;
		}
		@@ -2004,7 +1980,7 @@ static ivas_error initOnFirstGoodFrame(
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( IVAS_DEC_is_split_rendering_enabled( hIvasDec ) )
		if ( isSplitRend )
		{
		/* Open split rendering metadata writer */
		int16_t delayNumSamples_temp[3];
		@@ -2023,39 +1999,23 @@ static ivas_error initOnFirstGoodFrame(
		return error;
		}

		if ( ( error = IVAS_DEC_GetSplitRendBitstreamHeader( hIvasDec,
		&splitRendCodec,
		&poseCorrection,
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		&splitRendIsarFrameSizeMs,
		#endif
		&splitRendCodecFrameSizeMs
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		&lc3plusHighRes
		if ( ( error = IVAS_DEC_GetSplitRendBitstreamHeader( hIvasDec, &splitRendCodec, &poseCorrection, &splitRendIsarFrameSizeMs, &splitRendCodecFrameSizeMs, &lc3plusHighRes ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_GetSplitRendBitstreamHeader( hIvasDec, &splitRendCodec, &poseCorrection, &splitRendCodecFrameSizeMs ) ) != IVAS_ERR_OK )
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to get split renderer bitstream header: %s\n", ivas_error_to_string( error ) );
		return error;
		}

		if ( IVAS_DEC_is_split_rendering_coded_out( hIvasDec ) )
		if ( isSplitCoded )
		{
		if ( ( error = split_rend_writer_open( splitRendWriter,
		arg.outputWavFilename,
		delayNumSamples_temp[0],
		delayTimeScale_temp,
		splitRendCodec,
		poseCorrection,
		splitRendCodecFrameSizeMs
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		splitRendIsarFrameSizeMs,
		arg.output_Fs,
		lc3plusHighRes
		if ( ( error = split_rend_writer_open( splitRendWriter, arg.outputWavFilename, delayNumSamples_temp[0], delayTimeScale_temp, splitRendCodec, poseCorrection, splitRendCodecFrameSizeMs, splitRendIsarFrameSizeMs, arg.output_Fs, lc3plusHighRes ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = split_rend_writer_open( splitRendWriter, arg.outputWavFilename, delayNumSamples_temp[0], delayTimeScale_temp, splitRendCodec, poseCorrection, splitRendCodecFrameSizeMs ) ) != IVAS_ERR_OK )
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to open output split rendering metadata file %s\n", arg.outputWavFilename );
		return error;
		@@ -2069,20 +2029,11 @@ static ivas_error initOnFirstGoodFrame(
		return IVAS_ERR_INVALID_SPLIT_REND_CONFIG;
		}

		if ( ( error = split_rend_writer_open( splitRendWriter,
		arg.outputMdFilename,
		delayNumSamples_temp[0],
		delayTimeScale_temp,
		splitRendCodec,
		poseCorrection,
		splitRendCodecFrameSizeMs
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		splitRendIsarFrameSizeMs,
		arg.output_Fs,
		lc3plusHighRes
		if ( ( error = split_rend_writer_open( splitRendWriter, arg.outputMdFilename, delayNumSamples_temp[0], delayTimeScale_temp, splitRendCodec, poseCorrection, splitRendCodecFrameSizeMs, splitRendIsarFrameSizeMs, arg.output_Fs, lc3plusHighRes ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = split_rend_writer_open( splitRendWriter, arg.outputMdFilename, delayNumSamples_temp[0], delayTimeScale_temp, splitRendCodec, poseCorrection, splitRendCodecFrameSizeMs ) ) != IVAS_ERR_OK )
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to open output split rendering metadata file %s\n", arg.outputWavFilename );
		return error;
		@@ -2090,7 +2041,7 @@ static ivas_error initOnFirstGoodFrame(
		}
		}

		if ( IVAS_DEC_is_split_rendering_coded_out( hIvasDec ) == 0 )
		if ( !isSplitCoded )
		{
		#endif
		/* Open audio writer and write all previously skipped bad frames now that frame size is known */
		@@ -2328,6 +2279,19 @@ static ivas_error decodeG192(
		int16_t vec_pos_update, vec_pos_len;
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		SplitFileReadWrite *splitRendWriter = NULL;
		int16_t isSplitRend, isSplitCoded;

		if ( ( error = IVAS_DEC_is_split_rendering_enabled( hIvasDec, &isSplitRend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_enabled, code: %d\n", error );
		return error;
		}

		if ( ( error = IVAS_DEC_is_split_rendering_coded_out( hIvasDec, &isSplitCoded ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_coded_out, code: %d\n", error );
		return error;
		}
		#endif
		#ifdef OBJ_EDITING_API
		IVAS_EDITABLE_PARAMETERS editableParameters;
		@@ -2358,6 +2322,7 @@ static ivas_error decodeG192(
		}
		}
		#endif

		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		{
		ismWriters[i] = NULL;
		@@ -2724,7 +2689,7 @@ static ivas_error decodeG192(
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( IVAS_DEC_is_split_rendering_enabled( hIvasDec ) )
		if ( isSplitRend )
		{
		if ( ( error = IVAS_DEC_GetSplitBinauralBitstream( hIvasDec, (void ) ( pcmBuf + nOutChannels nSamplesRendered ), splitRendBits, &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )
		{
		@@ -2740,10 +2705,8 @@ static ivas_error decodeG192(
		#endif
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, IVAS_DEC_PCM_INT16, (void ) ( pcmBuf + nOutChannels nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )

		#else
		if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )

		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -2806,7 +2769,7 @@ static ivas_error decodeG192(
		if ( decodedGoodFrame )
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( IVAS_DEC_is_split_rendering_enabled( hIvasDec ) )
		if ( isSplitRend )
		{
		if ( split_rend_write_bitstream_to_file( splitRendWriter, splitRendBits->bits_buf, &splitRendBits->bits_read, &splitRendBits->bits_written ) != IVAS_ERR_OK )
		{
		@@ -2815,7 +2778,7 @@ static ivas_error decodeG192(
		}
		}

		if ( IVAS_DEC_is_split_rendering_coded_out( hIvasDec ) == 0 )
		if ( !isSplitCoded )
		{
		#endif
		if ( delayNumSamples < nOutSamples )
		@@ -3088,6 +3051,7 @@ static ivas_error decodeG192(
		------------------------------------------------------------------------------------------/

		memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) );

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( afWriter != NULL )
		{
		@@ -3505,12 +3469,11 @@ static ivas_error decodeVoIP(

		for ( i = 0; i < num_subframes; i++ )
		{
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		DEFAULT_AXIS
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i, DEFAULT_AXIS ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i ) ) != IVAS_ERR_OK )
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;

apps/isar_post_rend.c

+46 −10

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+42 −94

File changed.

Preview size limit exceeded, changes collapsed.