[cleanup] accept FIX_I173_I174 in renderer_standalone.c to fix pipeline (202bcfa4) · Commits · IVAS Codec Public Collaboration / IVAS Codec

scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c

+0 −38

Original line number	Diff line number	Diff line
		@@ -52,11 +52,7 @@
		------------------------------------------------------------------------------------------/

		#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */
		#ifdef FIX_I173_I174
		#define NUM_ISM_METADATA_PER_LINE 4 /* Number of ISM metadata per line in a metadata file */
		#else
		#define NUM_ISM_METADATA_PER_LINE 5 /* Number of ISM metadata per line in a metadata file */
		#endif

		/---------------------------------------------------------------------
		* Local function prototypes
		@@ -130,9 +126,6 @@ int main( int argc, char *argv[] )
		FILE *f_input;
		FILE *f_output;
		FILE *f_quat_traj;
		#ifndef FIX_I173_I174
		int32_t tmp;
		#endif
		float x, y, z, w;
		FILE *f_metadata[MAX_NUM_OBJECTS];
		Decoder_Struct st_ivas_static;
		@@ -166,9 +159,7 @@ int main( int argc, char *argv[] )
		{
		return IVAS_ERR_FAILED_ALLOC;
		}
		#ifdef FIX_I173_I174
		st_ivas->hDecoderConfig->Opt_Headrotation = FALSE;
		#endif

		/* ISm metadata handles */
		for ( n = 0; n < MAX_NUM_OBJECTS; n++ )
		@@ -325,9 +316,7 @@ int main( int argc, char *argv[] )
		fprintf( stderr, "Can not allocate memory for head-tracking\n" );
		exit( -1 );
		}
		#ifdef FIX_I173_I174
		st_ivas->hDecoderConfig->Opt_Headrotation = TRUE;
		#endif
		}
		else
		{
		@@ -407,11 +396,7 @@ int main( int argc, char *argv[] )
		{
		for ( i = 0; i < 4; i++ ) /* MAX_PARAM_SPATIAL_SUBFRAMES = 4 */
		{
		#ifdef FIX_I173_I174
		if ( 4 == fscanf( f_quat_traj, "%f,%f,%f,%f", &w, &x, &y, &z ) )
		#else
		if ( 5 == fscanf( f_quat_traj, "%d,%f,%f,%f,%f", &tmp, &w, &x, &y, &z ) )
		#endif
		{
		st_ivas->hHeadTrackData->num_quaternions = -1;

		@@ -559,9 +544,6 @@ static void readMetadata(
		float meta_prm[NUM_ISM_METADATA_PER_LINE];
		char *char_ptr;
		int16_t j;
		#ifndef FIX_I173_I174
		int32_t time_stamp;
		#endif

		if ( fgets( char_buff, META_LINE_LENGTH, file ) == NULL )
		{
		@@ -569,33 +551,13 @@ static void readMetadata(
		exit( -1 );
		}

		#ifdef FIX_I173_I174
		j = 0;
		char_ptr = strtok( char_buff, "," );
		meta_prm[j++] = (float) atof( char_ptr );
		#else
		char_ptr = strtok( char_buff, "," );
		#ifndef FIX_I173_I174
		time_stamp = (int32_t) atoi( char_ptr );

		if ( time_stamp != frame )
		{
		fprintf( stderr, "\n!!!Error: Wrong time-stamp while reading ISM metadata input file. Exiting!!!\n\n" );
		exit( -1 );
		}
		#endif

		j = 0;
		#endif
		while ( char_ptr != NULL && j < NUM_ISM_METADATA_PER_LINE )
		{
		#ifndef FIX_I173_I174
		meta_prm[j++] = (float) atof( char_ptr );
		char_ptr = strtok( NULL, "," );
		#else
		char_ptr = strtok( NULL, "," );
		meta_prm[j++] = (float) atof( char_ptr );
		#endif
		}

		hIsmMetaData->azimuth = meta_prm[0];