Commit 7effe8d1 authored by hsd's avatar hsd
Browse files

Moved HEAD_ORIENT_TRK_T to common_api_types.h to avoid including the private... 

Moved HEAD_ORIENT_TRK_T to common_api_types.h to avoid including the private ivas_cnst.h header in the decoder/renderer APIs
parent 1958d7df

lib_com/common_api_types.h

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

} IVAS_VECTOR3;



#ifdef FIX_439_OTR_PARAMS

typedef enum

{

  HEAD_ORIENT_TRK_NONE,

  HEAD_ORIENT_TRK_REF,

  HEAD_ORIENT_TRK_AVG,

  HEAD_ORIENT_TRK_REF_VEC,

  HEAD_ORIENT_TRK_REF_VEC_LEV

} HEAD_ORIENT_TRK_T;

#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/ivas_cnst.h

+1 −10
Original line number Diff line number Diff line
@@ -1595,21 +1595,12 @@ typedef enum 
} SFX_OpMode_t;





#ifndef FIX_439_OTR_PARAMS

/*----------------------------------------------------------------------------------*

 * Orientation tracking constants

 *----------------------------------------------------------------------------------*/



/* Orientation tracking types */

#ifdef FIX_439_OTR_PARAMS

typedef enum

{

    HEAD_ORIENT_TRK_NONE,

    HEAD_ORIENT_TRK_REF,

    HEAD_ORIENT_TRK_AVG,

    HEAD_ORIENT_TRK_REF_VEC,

    HEAD_ORIENT_TRK_REF_VEC_LEV

} HEAD_ORIENT_TRK_T;

#else

#define IVAS_ORIENT_TRK_NONE                    0

#define IVAS_ORIENT_TRK_REF                     1

#define IVAS_ORIENT_TRK_AVG                     2

lib_dec/lib_dec.h

+0 −4
Original line number Diff line number Diff line
@@ -34,12 +34,8 @@ 
#define LIB_DEC_H



#include "common_api_types.h"

#ifdef FIX_439_OTR_PARAMS

#include "ivas_cnst.h"

#endif

#include <stdbool.h>





/*---------------------------------------------------------------------*

 * Decoder enums

 *---------------------------------------------------------------------*/

lib_rend/lib_rend.h

+5 −1
Original line number Diff line number Diff line
@@ -250,7 +250,11 @@ ivas_error IVAS_REND_SetHeadRotation( 


ivas_error IVAS_REND_SetOrientationTrackingMode(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: Renderer handle                                     */

#ifdef FIX_439_OTR_PARAMS

    HEAD_ORIENT_TRK_T otrMode   /* i  : Head orientation tracking mode */

#else

    const uint8_t otrMode       /* i  : Orientation tracking mode   */

#endif

);



ivas_error IVAS_REND_SetReferenceRotation(