Commit 9d22ad52 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1067_QUATERNIONSLERP_INACCURACIES

parent 42d74c67

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1067_QUATERNIONSLERP_INACCURACIES     /* Philips: issue 1067: QuaternionSlerp inaccuracies in corner cases */

#define NONBE_FIX_1065_ISM_MD_HANDLE                    /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

lib_rend/ivas_orient_trk.c

+0 −26
Original line number Diff line number Diff line
@@ -49,9 +49,7 @@ 
 *------------------------------------------------------------------------------------------*/



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

#ifdef NONBE_FIX_1067_QUATERNIONSLERP_INACCURACIES

#define COS_ONE_TENTH_DEGREE ( 0.999998476913288f )

#endif



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

 * Local functions
@@ -159,7 +157,6 @@ void QuaternionSlerp( 
    const float t,

    IVAS_QUATERNION *const r )

{

#ifdef NONBE_FIX_1067_QUATERNIONSLERP_INACCURACIES

    IVAS_QUATERNION r1, r2;

    float phi, sinPhi, cosPhi, s1, s2;
@@ -198,29 +195,6 @@ void QuaternionSlerp( 
        r->y = ( s1 * r1.y + s2 * r2.y ) / sinPhi;

        r->z = ( s1 * r1.z + s2 * r2.z ) / sinPhi;

    }

#else

    float angle, denom, s, s2;



    s = QuaternionDotProduct( q1, q2 );



    if ( fabsf( s ) >= 1.0f )

    {



        *r = q2;

        return;

    }



    angle = acosf( s );

    denom = sinf( angle );



    s = sinf( ( 1 - t ) * angle );

    s2 = sinf( t * angle );

    r->x = ( q1.x * s + q2.x * s2 ) / denom;

    r->y = ( q1.y * s + q2.y * s2 ) / denom;

    r->z = ( q1.z * s + q2.z * s2 ) / denom;

    r->w = ( q1.w * s + q2.w * s2 ) / denom;



#endif

    QuaternionNormalize( *r, r );



    return;