Commit 31073441 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '2162_ref_port_mr_2244_headrotdata_sanitizer_rend' into 'ivas-float-update' 

Port 396 - Foat MR 2169 to ivas-float-update

See merge request !2461
parents 04f6a685 90b2ab8e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ 
#define CODE_IMPROVEMENTS

#define NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS /* Nokia: issue 1339: Apply scaling to the object-part of OMASA for binaural rendering in IVAS_rend. */

#define NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING         /* Nokia: Fix OMASA to MASA1 rendering in IVAS_rend */

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





// object-editing feature porting

lib_rend/ivas_rotation.c

+7 −0
Original line number Diff line number Diff line
@@ -906,6 +906,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 )
@@ -913,6 +919,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 )