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

Accept FIX_BASOP_2023_TDREND_DISTATT_PRECISION

parent 0e508bf3

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -1658,11 +1658,7 @@ static void resetHeadRotation( 
        pPos[i].x_fx = 0;

        pPos[i].y_fx = 0;

        pPos[i].z_fx = 0;

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

        pPos[i].q_fact = 31;

#else

        pPos[i].q_fact = 25;

#endif

    }



    return;

lib_com/common_api_types.h

+0 −10
Original line number Diff line number Diff line
@@ -63,10 +63,8 @@ 
#define IVAS_ER_LIST_HEIGHT              1.6f

#define IVAS_ER_LIST_HEIGHT_FX           6710886 /* 1.6f in Q.22 */

#define IVAS_DEFAULT_AEID                65535

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

#define IVAS_LISTENER_POSITION_MAX     327.67f

#define IVAS_LISTENER_POSITION_MAX_Q22 1374347592 /* 327.67 in Q22 */

#endif



/* JBM constants for adaptive-playout */

#define IVAS_TIME_SCALE_MIN 50  /* min. time-scaling [%] */
@@ -164,11 +162,7 @@ typedef struct 


    float x, y, z;



#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

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

#else

    Word32 x_fx, y_fx, z_fx;

#endif

    Word16 q_fact;



} IVAS_VECTOR3;
@@ -359,11 +353,7 @@ typedef struct _IVAS_RENDER_CONFIG 
    float directivity[IVAS_MAX_NUM_OBJECTS * 3];

    Word16 directivity_fx[IVAS_MAX_NUM_OBJECTS * 3]; // has the following q-factor pattern: {6, 6, 15, 6, 6, 15, 6, 6, 15, 6, 6, 15}

    float distAtt[3];

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    Word32 distAtt_fx[3]; /* {Q25, Q28, Q28} */

#else

    Word32 distAtt_fx[3]; /* {Q27, Q30, Q30} */

#endif



} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1588,11 +1588,9 @@ typedef enum 
#define RESAMPLE_FACTOR_16_48_FX                ( 5461 )  // Q14

#define RESAMPLE_FACTOR_32_48_FX                ( 10922 ) // Q14



#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

#define DIST_ATT_DEFAULT_MAXDIST_Q25 528482304 /* Q25 */                      /* Default maxDist based on maximum radius in encoded metadata (2^ISM_RADIUS_NBITS-1)*0.25 */ 

#define DIST_ATT_DEFAULT_REFDIST_Q28 ONE_IN_Q28 /* Q28 */                     /* Default refDist 1.0 in Q28 */                                      

#define DIST_ATT_DEFAULT_ROLLOFF_Q28 ONE_IN_Q28 /* Q28 */                     /* Default rolloffFactor 1.0 in Q28 */                                      

#endif



/* ----- Enums - TD Renderer ----- */

lib_com/ivas_prot_fx.h

+0 −4
Original line number Diff line number Diff line
@@ -1928,12 +1928,8 @@ ivas_error TDREND_MIX_LIST_SetOrient_fx( 


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                       */

#else

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

#endif

);



ivas_error TDREND_Update_listener_orientation_fx(

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.251 V3.0 */



#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 FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW     /* Orange: float issue 1548: Harmonize non diegetic panning law in ISM and renderers */

#define FIX_1452_DEFAULT_REVERB                         /* Nokia/Philips/FhG: Fix default room presets and their usage in renderer */