Commit e0245af3 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 123_basop_test-for-ci-with-ivas-codec-ref

parents 6b214de0 ba2aad75

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ 
#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */

#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

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

lib_rend/ivas_rotation_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -1515,6 +1515,12 @@ ivas_error combine_external_and_head_orientations_rend( 


    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 )
@@ -1522,6 +1528,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 )