Commit 979faade authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'cleanup_20221108_fix' into 'main' 

forgotten acceptance of FIX_I173_I174

See merge request !244
parents d9695bf5 4d1c9792

scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c

+0 −20
Original line number Diff line number Diff line
@@ -160,9 +160,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++ )
@@ -318,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

    }



    /* Init limiter */
@@ -544,9 +540,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 )

    {
@@ -554,22 +547,9 @@ 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, "," );

    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 );

    }



    j = 0;

#endif

    while ( char_ptr != NULL && j < NUM_ISM_METADATA_PER_LINE )

    {

        char_ptr = strtok( NULL, "," );