Commit 7f16d08e authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Port float MR 2244 to ivas-float-update

parent 7e946ced

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ 
#define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

#define NONBE_FIX_1197_OMASA_META_BUFFER                /* Nokia: OMASA ISM_MASA_MODE_PARAM_ONE_OBJ history zero in rateswitching - port 251 */

#define FIX_1383_HEAD_TRACK_SANITIZER                   /* Nok: issue 1383: Fix head tracking struc values reading in renderer */



// object-editing feature porting

#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

lib_rend/ivas_rotation.c

+7 −0
Original line number Diff line number Diff line
@@ -910,6 +910,12 @@ ivas_error combine_external_and_head_orientations_rend( 
    int16_t i;



    sr_pose_pred_axis = DEFAULT_AXIS;

#ifdef FIX_1383_HEAD_TRACK_SANITIZER

    if ( hHeadTrackData->headRotEnabled )

    {

        headRotQuaternions = hHeadTrackData->headPositions;

        listenerPos = hHeadTrackData->Pos;

#else

    if ( hHeadTrackData != NULL )

    {

        if ( hHeadTrackData->headRotEnabled )
@@ -917,6 +923,7 @@ ivas_error combine_external_and_head_orientations_rend( 
            headRotQuaternions = hHeadTrackData->headPositions;

            listenerPos = hHeadTrackData->Pos;

        }

#endif

        sr_pose_pred_axis = hHeadTrackData->sr_pose_pred_axis;

    }

    else if ( hExtOrientationData != NULL )