Commit 01098e87 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1178_ref_fix_forward_vector' into 'float-pc' 

patched MR1317 into float-pc.

See merge request !970
parents 2be7f25a 8b238a61

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
#define NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO            /* Eri: issue 1233: Address possible division by zero in hf_spectrum_sparseness() */



#define NONE_BE_FIX_BASOP_1044_OSBA_PRERENDER_MIX_GAINS /* DLB: adjust prerendering and mixing gain in OSBA encoder. This is fix to float codes*/

#define FIX_954_OTR_REF_VEC                             /* FhG: Fix forward vector direction for OTR REF VEC mode */

#define NONBE_1211_DTX_BR_SWITCHING                     /* VA: port float issue 1211: fix crash in MASA DTX bitrate switching */

#define NONBE_FIX_1189_GSC_IVAS_OMASA                   /* VA: Fix for issue 1189: Bitstream desynchornization due to reading/writing of the GSC_IVAS_mode parameter */

#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

lib_rend/ivas_orient_trk.c

+12 −0
Original line number Diff line number Diff line
@@ -564,7 +564,11 @@ ivas_error ivas_orient_trk_SetReferenceVector( 
        case IVAS_HEAD_ORIENT_TRK_REF:

        case IVAS_HEAD_ORIENT_TRK_AVG:

        case IVAS_HEAD_ORIENT_TRK_REF_VEC:

#ifdef FIX_954_OTR_REF_VEC

            acousticFrontVector = VectorSubtract( refPos, listenerPos );

#else

            acousticFrontVector = VectorSubtract( listenerPos, refPos );

#endif

            break;

        case IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV:

            /* ignore the height difference between listener position and reference position */
@@ -573,7 +577,11 @@ ivas_error ivas_orient_trk_SetReferenceVector( 
            listenerPosLevel.y = listenerPos.y;

            refPosLevel.x = refPos.x;

            refPosLevel.y = refPos.y;

#ifdef FIX_954_OTR_REF_VEC

            acousticFrontVector = VectorSubtract( refPosLevel, listenerPosLevel );

#else

            acousticFrontVector = VectorSubtract( listenerPosLevel, refPosLevel );

#endif

            break;

        default:

            return IVAS_ERR_WRONG_PARAMS;
@@ -587,7 +595,11 @@ ivas_error ivas_orient_trk_SetReferenceVector( 
        return IVAS_ERR_WRONG_PARAMS;

    }



#ifdef FIX_954_OTR_REF_VEC

    ivasForwardVector.x = 1.0f;

#else

    ivasForwardVector.x = -1.0f;

#endif

    ivasForwardVector.y = 0.0f;

    ivasForwardVector.z = 0.0f;

    VectorRotationToQuaternion( ivasForwardVector, acousticFrontVector, &pOTR->refRot );