Fixing build errors WIP (pt. 2) (68b6fc68) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+25 −4

Original line number	Diff line number	Diff line
		@@ -1800,6 +1800,9 @@ static ivas_error decodeG192(
		RotFileReader *externalOrientationFileReader,
		RotFileReader *refRotReader,
		Vector3PairFileReader *referenceVectorReader,
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		uint8_t *splitRendBitsBuf,
		#endif
		IVAS_DEC_HANDLE hIvasDec,
		int16_t *pcmBuf )

		@@ -1955,7 +1958,12 @@ static ivas_error decodeG192(
		}


		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternion, Pos ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternion, Pos
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		DEFAULT_AXIS
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -2040,7 +2048,12 @@ static ivas_error decodeG192(
		goto cleanup;
		}
		}
		error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, pcmBuf + nOutChannels * nSamplesRendered, &nSamplesRendered_loop, &needNewFrame );
		error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, pcmBuf + nOutChannels * nSamplesRendered, &nSamplesRendered_loop, &needNewFrame
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		NULL /* TODO(sgi): pass IVAS_SPLIT_REND_BITS_HANDLE or change API so that split rendering has its dedicated GetSamples function */
		#endif
		);
		nSamplesRendered += nSamplesRendered_loop;
		nSamplesToRender -= nSamplesRendered_loop;
		if ( error != IVAS_ERR_OK )
		@@ -2082,7 +2095,11 @@ static ivas_error decodeG192(
		&masaWriter,
		ismWriters,
		&nOutChannels,
		&numObj );
		&numObj
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,NULL /* TODO(sgi): see #else branch for reference */
		#endif
		);
		if ( error != IVAS_ERR_OK )
		{
		goto cleanup;
		@@ -2237,7 +2254,11 @@ static ivas_error decodeG192(
		}


		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternion, Pos ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternion, Pos
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,DEFAULT_AXIS
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;

apps/renderer.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1574,7 +1574,12 @@ int main(
		fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		if ( ( error = IVAS_REND_SetHeadRotation( hIvasRend, headRot, Pos ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_REND_SetHeadRotation( hIvasRend, headRot, Pos
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		DEFAULT_AXIS
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );
		exit( -1 );

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@
		#define API_5MS
		#ifdef API_5MS
		#define JITTER_MEM_OPTIM_RENDERING
		#define LIB_REND_API_5MS /* FhG: Adds 5ms framing capability to lib_rend */
		#define LIB_REND_API_5MS /* FhG: Adds 5ms framing capability to lib_rend / / TODO(sgi): needs to be joined with API_5MS */
		#endif
		#define LIB_REND_FIX_HRTFPARAMBIN_MEMLEAK
		// 5 ms branch switches end

lib_dec/ivas_binRenderer_internal.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1769,7 +1769,11 @@ void ivas_rend_CldfbMultiBinRendProcess(

		ivas_binRenderer( hCldfbRend,
		pMultiBinPoseData,
		*pCombinedOrientationData, sf_idx, MAX_PARAM_SPATIAL_SUBFRAMES,
		*pCombinedOrientationData,
		#ifndef API_5MS
		sf_idx,
		#endif
		MAX_PARAM_SPATIAL_SUBFRAMES,
		#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG
		&head_track_post,
		#endif

lib_dec/lib_dec.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -857,6 +857,10 @@ ivas_error IVAS_DEC_GetSamples(
		int16_t pcmBuf, / i/o: buffer for decoded PCM output. The memory must already be allocated and be able to hold the expected number of output samples, based on frame size and number of output channels */
		int16_t nOutSamples, / o : number of samples per channel written to output buffer */
		bool needNewFrame / indication that the decoder needs a new frame */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		IVAS_SPLIT_REND_BITS_HANDLE hSplitRendBits /* o : bitstream output for split rendering mode*/
		#endif
		)
		{
		ivas_error error;
		@@ -1442,7 +1446,9 @@ ivas_error IVAS_DEC_FeedHeadTrackData(
		#endif

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifndef API_5MS
		hHeadTrackData->num_quaternions = 0;
		#endif
		#else
		hIvasDec->st_ivas->hHeadTrackData->num_quaternions = 0;
		#endif
		@@ -2265,7 +2271,12 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
		nSamplesToRender = nSamplesPerChannel - nSamplesRendered;

		/* render IVAS frames directly to the output buffer */
		if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, pcmBuf + nSamplesRendered * nOutChannels, &nSamplesRendered_loop, &tmp ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, pcmBuf + nSamplesRendered * nOutChannels, &nSamplesRendered_loop, &tmp
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		NULL /* TODO(sgi): pass hSplitRendBits here or create separate get samples function for split rendering */
		#endif
		) ) != IVAS_ERR_OK )
		{
		return error;
		}