Commit 8e2fe898 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into discISM_DTX

parents 827e95d8 589bd13c

Workspace_msvc/lib_util.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ 
    <ClCompile Include="..\lib_util\evs_rtp_payload.c" />

    <ClCompile Include="..\lib_util\g192.c" />

    <ClCompile Include="..\lib_util\head_rotation_file_reader.c" />

    <ClCompile Include="..\lib_util\vector3_pair_file_reader.c" />

    <ClCompile Include="..\lib_util\hrtf_file_reader.c" />

    <ClCompile Include="..\lib_util\ism_file_reader.c" />

    <ClCompile Include="..\lib_util\ism_file_writer.c" />
@@ -167,6 +168,7 @@ 
    <ClInclude Include="..\lib_util\cmdl_tools.h" />

    <ClInclude Include="..\lib_util\evs_rtp_payload.h" />

    <ClInclude Include="..\lib_util\g192.h" />

    <ClInclude Include="..\lib_util\vector3_pair_file_reader.h" />

    <ClInclude Include="..\lib_util\head_rotation_file_reader.h" />

    <ClInclude Include="..\lib_util\hrtf_file_reader.h" />

    <ClInclude Include="..\lib_util\ism_file_reader.h" />

apps/decoder.c

+230 −45

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+23 −24

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+289 −36

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/common_api_types.h

+27 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ typedef struct _IVAS_ISM_METADATA 
    float radius;

    float spread;

    float gainFactor;

#ifdef TD5

    float yaw;

    float pitch;

#endif

} IVAS_ISM_METADATA;



typedef struct
@@ -86,6 +90,21 @@ typedef struct 


} IVAS_QUATERNION;



#ifdef OTR_REFERENCE_VECTOR_TRACKING

typedef struct

{

    float x, y, z;

} IVAS_VECTOR3;

#endif /* OTR_REFERENCE_VECTOR_TRACKING */



#ifdef TD5

typedef struct

{

    float x, y, z;



} IVAS_POSITION;

#endif



typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;

#ifdef FIX_350_MASA_DELAY_COMP

typedef struct ivas_masa_decoder_ext_out_meta_struct *MASA_DECODER_EXT_OUT_META_HANDLE;
@@ -111,6 +130,11 @@ typedef struct 
{

    float azimuth;

    float elevation;

#ifdef TD5

    float radius;

    float yaw;

    float pitch;

#endif

} IVAS_REND_AudioObjectPosition;



typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
@@ -132,6 +156,9 @@ typedef struct _IVAS_RENDER_CONFIG 
    IVAS_RENDER_TYPE_OVERRIDE renderer_type_override;

#endif

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA room_acoustics;

#ifdef TD5

    float directivity[3];

#endif

} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;



typedef struct _IVAS_LS_CUSTOM_LAYOUT