Commit 35b1df0b authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into basop-2095-remove-unused-isar-tables

parents 9d4615b3 f93f11a5

lib_com/common_api_types.h

+3 −1
Original line number Diff line number Diff line
@@ -163,9 +163,11 @@ typedef struct 


typedef struct

{



    float x, y, z;



#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    Word32 x_fx, y_fx, z_fx; /* qfact, qfact, qfact */

    Word32 x_fx, y_fx, z_fx; /* q_fact, q_fact, q_fact */

#else

    Word32 x_fx, y_fx, z_fx;

#endif

lib_com/ivas_prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -1939,7 +1939,7 @@ void TDREND_MIX_LIST_SetPos_fx( 
    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                          */

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    const Word32 *Pos_p,                                        /* i  : Listener's position                         */

    const Word16 Pos_q                                          /* i  : Listener's position Q value                 */

    const Word16 Pos_q                                          /* i  : Listener's position Q                       */

#else

    const Word32 *Pos_p                                         /* i  : Listener's position                         */

#endif

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 


#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION         /* Eri: Basop issue 2023: Distance attenuation scaling, adding clamping of distance att input and listener position */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION_BUGFIX  /* Eri: Bug discovered in cleanup of basop issue 2023 */

#define USE_RTPDUMP                                     /* FhG: RTPDUMP format (rtptools standard) instead of custom format */

#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */

#define FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG        /* Nokia: BASOP issue 2526: Fix wrong Q variable in SPAR to MASA param mapping */

lib_rend/ivas_objectRenderer_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1023,7 +1023,11 @@ ivas_error ivas_td_binaural_renderer_ext_fx( 
        IF( *hCombinedOrientationData != NULL && ( *hCombinedOrientationData )->listenerPos != NULL )

        {

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION_BUGFIX

            ( *hCombinedOrientationData )->listenerPos[idx].q_fact = pos_q;

#else

            pos_q = ( *hCombinedOrientationData )->listenerPos[idx].q_fact;

#endif

            move16();

#else

            ( *hCombinedOrientationData )->listenerPos[idx].x_fx = L_shr( ( *hCombinedOrientationData )->listenerPos[idx].x_fx, sub( ( *hCombinedOrientationData )->listenerPos[idx].q_fact, pos_q ) );

lib_rend/ivas_objectRenderer_mix_fx.c

+2 −3
Original line number Diff line number Diff line
@@ -56,9 +56,8 @@ static ivas_error DefaultBSplineModel_fx( TDREND_HRFILT_FiltSet_t *HrFiltSet_p, 
void TDREND_MIX_LIST_SetPos_fx(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle      */

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    const Word32 *Pos_p,

    /* i  : Listener's position     */ // Q Pos_fx->q_fact

    const Word16 Pos_q                 /* i  : Listener's position Q value                 */

    const Word32 *Pos_p, /* i  : Listener's position     */

    const Word16 Pos_q   /* i  : Listener's position Q   */

#else

    const Word32 *Pos_p /* i  : Listener's position     */ // Q Pos_fx->q_fact

#endif