Commit 5455d28a authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

fix leftover merge artefact in ivas_stat_rend.h and whitespace changes to avoid merge conflicts

parent 760e43fc

lib_dec/ivas_stat_dec.h

+2 −0
Original line number Diff line number Diff line
@@ -1762,6 +1762,7 @@ typedef struct ivas_reverb_state_t 


} REVERB_DATA, *REVERB_HANDLE;





#ifndef FIX_I109_ORIENTATION_TRACKING

typedef struct ivas_orient_trk_state_t

{
@@ -1791,6 +1792,7 @@ typedef struct ivas_orient_trk_state_t 
} ivas_orient_trk_state_t;

#endif





/* Main Crend structure */

typedef struct ivas_crend_state_t

{

lib_rend/ivas_crend.c

+1 −0
Original line number Diff line number Diff line
@@ -2187,6 +2187,7 @@ ivas_error ivas_rend_openCrend( 
            hCrend->hTrack = NULL;

        }

#endif



        if ( ( hRendCfg != NULL ) && ( hRendCfg->roomAcoustics.late_reverb_on ) )

        {

            if ( ( error = ivas_reverb_open( &( hCrend->hReverb ),

lib_rend/ivas_orient_trk.c

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
/* TODO relate to frame rate - assumed here 50Hz, i.e. 20ms frame length */

#define OTR_UPDATE_RATE ( 50.0f ) /* rate of the Process() calls [Hz]; 1x per IVAS frame */





/*------------------------------------------------------------------------------------------*

 * Local functions

 *------------------------------------------------------------------------------------------*/
@@ -303,6 +304,7 @@ void ivas_orient_trk_Init( 
    /* Track relative to a reference orientation */

    pOTR->trackingType = OTR_TRACKING_REF_ORIENT;

#endif



    /* configuration parameters */

    pOTR->centerAdaptationRate = 1.0f / 30.0f;

    pOTR->offCenterAdaptationRate = 1.0f / 8.0f;
@@ -433,6 +435,7 @@ ivas_error ivas_orient_trk_SetAbsoluteOrientation( 
}

#endif





/*-------------------------------------------------------------------*

 * ivas_orient_trk_Process()

 *
@@ -643,6 +646,7 @@ ivas_error ivas_orient_trk_Process( 
    return IVAS_ERR_OK;

}





/*-------------------------------------------------------------------*

 * ivas_orient_trk_GetTrackedOrientation()

 *

lib_rend/ivas_rotation.c

+3 −0
Original line number Diff line number Diff line
@@ -70,12 +70,14 @@ ivas_error ivas_headTrack_open( 
    ( *hHeadTrackData )->lrSwitchedCurrent = 0;

    ( *hHeadTrackData )->lrSwitchedNext = 0;

#ifdef FIX_I109_ORIENTATION_TRACKING

    

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

    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" );

    }

    ivas_orient_trk_Init( ( *hHeadTrackData )->OrientationTracker );

#endif



    /* Initialise Rmat_prev to I, Rmat will be computed later */

    for ( i = 0; i < 3; i++ )

    {
@@ -215,6 +217,7 @@ void Quat2Euler( 
}

#endif





/*-------------------------------------------------------------------------

 * rotateAziEle()

 *

lib_rend/ivas_stat_rend.h

+1 −3
Original line number Diff line number Diff line
@@ -209,8 +209,6 @@ typedef struct 
    float lfeOutputGains[IVAS_MAX_INPUT_LFE_CHANNELS][IVAS_MAX_OUTPUT_CHANNELS];

} IVAS_REND_LfeRouting;



<<<<<<< HEAD

=======

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H



typedef struct
@@ -219,7 +217,6 @@ typedef struct 
    IVAS_QUATERNION headPositions[RENDERER_HEAD_POSITIONS_PER_FRAME];

    float crossfade[L_FRAME48k / RENDERER_HEAD_POSITIONS_PER_FRAME];

} IVAS_REND_HeadRotData;

>>>>>>> main



#endif

/*----------------------------------------------------------------------------------*
@@ -720,6 +717,7 @@ typedef struct ivas_orient_trk_state_t 
} ivas_orient_trk_state_t;

#endif





/*----------------------------------------------------------------------------------*

 * TD ISm Object Renderer structure

 *----------------------------------------------------------------------------------*/