Commit 6cb44cee authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_BASOP_2023_TDREND_DISTATT_PRECISION

parent 7d276345

lib_com/common_api_types.h

+0 −2
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ 
#define IVAS_REVERB_PREDELAY_MAX         20 /* Max input delay for reverb module */

#define IVAS_ER_LIST_HEIGHT              1.6f

#define IVAS_DEFAULT_AEID                65535

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

#define IVAS_LISTENER_POSITION_MAX 327.67f

#endif





/* JBM constants for adaptive-playout */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ 
/* #################### Start NON-BE switches ############################ */

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



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

#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_1452_DEFAULT_REVERB                         /* Nokia/Philips/FhG: Fix default room presets and their usage in renderer */

#define FIX_1559                                        /* Eri/FhG: fix for Issue 1559 in FD CNG with bitrate/bw switching */

lib_dec/lib_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -2758,11 +2758,9 @@ ivas_error IVAS_DEC_FeedHeadTrackData( 
        return error;

    }



#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

    Pos.x = max( min( IVAS_LISTENER_POSITION_MAX, Pos.x ), -IVAS_LISTENER_POSITION_MAX );

    Pos.y = max( min( IVAS_LISTENER_POSITION_MAX, Pos.y ), -IVAS_LISTENER_POSITION_MAX );

    Pos.z = max( min( IVAS_LISTENER_POSITION_MAX, Pos.z ), -IVAS_LISTENER_POSITION_MAX );

#endif

    hHeadTrackData->Pos[subframe_idx].x = Pos.x;

    hHeadTrackData->Pos[subframe_idx].y = Pos.y;

    hHeadTrackData->Pos[subframe_idx].z = Pos.z;

lib_util/render_config_reader.c

+0 −2
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ 
#define IVAS_ER_LIST_ORIGIN_X 0.0f

#define IVAS_ER_LIST_ORIGIN_Y 0.0f



#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

#define DIST_ATT_MIN_MAXDIST     0.0f

#define DIST_ATT_MIN_REFDIST     0.0f

#define DIST_ATT_MIN_ROLLOFF     0.0f
@@ -85,7 +84,6 @@ 
#define DIRECTIVITY_MAX_ANGLE    360.0f

#define DIRECTIVITY_MIN_ATT_FAC  0.0f

#define DIRECTIVITY_MAX_ATT_FAC  1.0f

#endif



#ifndef TRUE

#define TRUE 1

lib_util/rotation_file_reader.c

+0 −8
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <string.h>

#include <stdbool.h>



#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

#ifndef min

#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )

#endif
@@ -43,7 +42,6 @@ 
#ifndef max

#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )

#endif

#endif





struct RotFileReader
@@ -135,15 +133,9 @@ ivas_error HeadRotationFileReading( 
    pQuaternion->z = z;

    if ( pPos != NULL )

    {

#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION

        pPos->x = max( min( IVAS_LISTENER_POSITION_MAX, posx ), -IVAS_LISTENER_POSITION_MAX );

        pPos->y = max( min( IVAS_LISTENER_POSITION_MAX, posy ), -IVAS_LISTENER_POSITION_MAX );

        pPos->z = max( min( IVAS_LISTENER_POSITION_MAX, posz ), -IVAS_LISTENER_POSITION_MAX );

#else

        pPos->x = posx;

        pPos->y = posy;

        pPos->z = posz;

#endif

    }



    return IVAS_ERR_OK;