Commit e95d53d0 authored by multrus's avatar multrus
Browse files

Merge branch 'main' into 2035-makefile-remove-dependencies-on-include_split

parents b05f3c8d 3c94b6f1

Workspace_msvc/lib_util.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
    </Lib>

  </ItemDefinitionGroup>

  <ItemGroup>

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

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

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

    <ClCompile Include="..\lib_util\bitstream_reader.c" />
@@ -126,6 +127,7 @@ 
    <ClCompile Include="..\lib_util\split_rend_bfi_file_reader.c" />

  </ItemGroup>

  <ItemGroup>

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

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

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

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

apps/decoder.c

+359 −9

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+92 −5

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/common_api_types.h

+27 −2
Original line number Diff line number Diff line
@@ -178,11 +178,19 @@ typedef enum 
typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;

typedef struct ivas_masa_decoder_ext_out_meta_struct *IVAS_MASA_DECODER_EXT_OUT_META_HANDLE;



typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;

#ifdef FIX_CREND_SIMPLIFY_CODE

typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_TD_HANDLE;

typedef struct ivas_hrtf_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;

typedef struct ivas_hrtf_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;

typedef struct ivas_hrtf_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;

typedef struct ivas_hrtf_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;

#else

typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_TD_HANDLE;

typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;

typedef struct ivas_hrtfs_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;

typedef struct ivas_hrtfs_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;

typedef struct ivas_hrtfs_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;

#endif

typedef struct cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;



typedef struct ivas_LS_setup_custom *IVAS_LSSETUP_CUSTOM_HANDLE;
@@ -216,6 +224,18 @@ typedef struct _IVAS_JBM_TRACE_DATA 


} IVAS_JBM_TRACE_DATA;



#ifdef FIX_CREND_SIMPLIFY_CODE

typedef enum _ivas_binaural_renderer_type

{

    IVAS_BIN_RENDERER_TYPE_NONE,

    IVAS_BIN_RENDERER_TYPE_CREND,

    IVAS_BIN_RENDERER_TYPE_FASTCONV,

    IVAS_BIN_RENDERER_TYPE_PARAMBIN,

    IVAS_BIN_RENDERER_TYPE_TDREND,

    IVAS_BIN_RENDERER_TYPE_DEFAULT,



} IVAS_BIN_RENDERER_TYPE;

#endif



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

 * Split rendering API constants, structures, and enums
@@ -254,6 +274,7 @@ typedef enum 


} ISAR_SPLIT_REND_CODEC;



#ifndef FIX_HRTF_LOAD

typedef enum

{

    ISAR_SPLIT_REND_RENDERER_SELECTION_CREND,
@@ -263,7 +284,7 @@ typedef enum 
    ISAR_SPLIT_REND_RENDERER_SELECTION_DEFAULT,



} ISAR_SPLIT_REND_RENDERER_SELECTION;



#endif

typedef struct _ISAR_SPLIT_REND_BITS_DATA

{

    uint8_t *bits_buf;
@@ -294,7 +315,11 @@ typedef struct _ISAR_SPLIT_REND_CONFIG 
    int16_t codec_frame_size_ms; /* Codec frame size in milliseconds, only relevant with LC3plus */

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode;

    ISAR_SPLIT_REND_CODEC codec;

#ifdef FIX_HRTF_LOAD

    IVAS_BIN_RENDERER_TYPE rendererSelection;

#else

    ISAR_SPLIT_REND_RENDERER_SELECTION rendererSelection;

#endif

    int16_t lc3plus_highres;



} ISAR_SPLIT_REND_CONFIG_DATA, *ISAR_SPLIT_REND_CONFIG_HANDLE;

lib_com/ivas_cnst.h

+7 −3
Original line number Diff line number Diff line
@@ -1652,6 +1652,7 @@ typedef enum 


#define BINAURAL_COHERENCE_DIFFERENCE_BINS      9                           /* Number of bins for direction-dependent diffuse-field binaural coherence */



#ifndef FIX_CREND_SIMPLIFY_CODE

typedef enum 

{

    BINAURAL_INPUT_AUDIO_CONFIG_INVALID,
@@ -1662,14 +1663,12 @@ typedef enum 
    BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED       /* Not used */



} BINAURAL_INPUT_AUDIO_CONFIG;



#endif

#define HEADROT_ORDER                           3

#define HEADROT_SHMAT_DIM                       ( ( HEADROT_ORDER + 1 ) * ( HEADROT_ORDER + 1 ) )

#define HEADROT_SHMAT_DIM2                      ( HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM )









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

 * TD Binaural Object renderer

 *----------------------------------------------------------------------------------*/
@@ -1700,6 +1699,11 @@ typedef enum 
#define ONE_BY_360_Q15                          ( 91 )          // Q15

#define ONE_BY_180_Q31                          ( 11930465 )    // Q31



#ifdef FIX_989_TD_REND_ROM

#define RESAMPLE_FACTOR_16_48_FX ( 5461 )  // Q14

#define RESAMPLE_FACTOR_32_48_FX ( 10922 ) // Q14

#endif



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



typedef enum