Commit 6d911641 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Fix for renderer standalone and orientation tracking

parent e2cbade9

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ 
#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define ITD_WINNER_GAIN_MODIFY */                     /* ITD optimization - WORK IN PROGRESS */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define FIX_I109_ORIENTATION_TRACKING*/               /* Issue 109: Harmonize head and orientation tracking */

#define FIX_I109_ORIENTATION_TRACKING                   /* Issue 109: Harmonize head and orientation tracking */

#define FIX_I1_113                                      /* under review : MCT bit distribution optimization for SBA high bitrates*/

#define PRINT_SBA_ORDER                                 /* Issue 179: print-out also the SBA order of IVAS SBA format to stdout */

#define EXT_RENDERER                                    /* FhG: external renderer library and standalone application */
@@ -154,7 +154,6 @@ 
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define FIX_AGC_WINFUNC_MEMORY                          /* Issue 62: lower agc_com.winFunc memory consumption */

#define REMOVE_SID_HARM_LEFTOVERS                       /* Issue 192: remove leftovers from the SID bitrate harmonization */

#define FIX_MCT_UNINIT_MEM                              /* Issue 166: Reading of uninitialized memory in TCX range coder */

scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c

+14 −0
Original line number Diff line number Diff line
@@ -317,6 +317,14 @@ int main( int argc, char *argv[] ) 
            exit( -1 );

        }

        st_ivas->hDecoderConfig->Opt_Headrotation = TRUE;



#ifdef FIX_I109_ORIENTATION_TRACKING

        if ( ( st_ivas->hHeadTrackData->OrientationTracker = (ivas_orient_trk_state_t *) count_malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL )

        {

            fprintf( stderr, "Cannot allocate memory for orientation tracker\n" );

            exit( -1 );

        }

#endif

    }

#ifdef EXT_RENDERER

    else
@@ -489,6 +497,12 @@ int main( int argc, char *argv[] ) 


    if ( st_ivas->hHeadTrackData != NULL )

    {

#ifdef FIX_I109_ORIENTATION_TRACKING

        if ( st_ivas->hHeadTrackData->OrientationTracker )

        {

            count_free( st_ivas->hHeadTrackData->OrientationTracker );

        }

#endif

        count_free( st_ivas->hHeadTrackData );

        fclose( f_quat_traj );

    }