Commit d3b2a082 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_406_IVAS_POSITION

parent af6ff52f

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -1416,11 +1416,7 @@ static ivas_error decodeG192( 
    ivas_error error = IVAS_ERR_UNKNOWN;

    uint16_t numObj = 0;

    IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;

#ifdef FIX_406_IVAS_POSITION

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

#else

    IVAS_POSITION Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

#endif



    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];

    for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -536,11 +536,7 @@ int main( 
    int32_t delayTimeScale = 0;

    int16_t i, numChannels;

    ivas_error error = IVAS_ERR_OK;

#ifdef FIX_406_IVAS_POSITION

    IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME];

#else

    IVAS_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME];

#endif



#ifdef WMOPS

    reset_wmops();

lib_com/common_api_types.h

+0 −7
Original line number Diff line number Diff line
@@ -93,13 +93,6 @@ typedef struct 
    float x, y, z;

} IVAS_VECTOR3;



#ifndef FIX_406_IVAS_POSITION

typedef struct

{

    float x, y, z;



} IVAS_POSITION;

#endif



typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;

typedef struct ivas_masa_decoder_ext_out_meta_struct *MASA_DECODER_EXT_OUT_META_HANDLE;

lib_com/options.h

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


#define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */



#define FIX_406_IVAS_POSITION                           /* Eri: Issue 406: Unify IVAS_POSITION to use IVAS_VECTOR3 instead */

#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */

#define FIX_419_ISM_MD_FIX                              /* VA: Issue 419: fix the upper value limitation for parameter angle1_diff_cnt */

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -881,11 +881,7 @@ ivas_error IVAS_DEC_GetMasaMetadata( 
ivas_error IVAS_DEC_FeedHeadTrackData(

    IVAS_DEC_HANDLE hIvasDec,     /* i/o: IVAS decoder handle                        */

    IVAS_QUATERNION *orientation, /* i  : head-tracking data, listener orientation   */

#ifdef FIX_406_IVAS_POSITION

    IVAS_VECTOR3 *Pos /* i  : listener position                          */

#else

    IVAS_POSITION *Pos /* i  : listener position                          */

#endif

)

{

    HEAD_TRACK_DATA_HANDLE hHeadTrackData;