Commit 0467f4a1 authored by sagnowski's avatar sagnowski
Browse files

Fix build when FIX_197_CREND_INTERFACE is disabled

parent aa7883ff

lib_dec/ivas_stat_dec.h

+14 −11
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
 * Output configuration for renderer (e.g. DirAC, MASA, Binaural Renderer...)

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



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#if !defined FIX_197_CREND_INTERFACE || defined FIX_197_CREND_INTERFACE_LIB_REND_H



typedef struct ivas_output_setup_structure

{
@@ -817,7 +817,7 @@ typedef struct ivas_spar_md_dec_state_t 
    int16_t spar_hoa_md_flag;

} ivas_spar_md_dec_state_t;



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#if !defined FIX_197_CREND_INTERFACE || defined FIX_197_CREND_INTERFACE_LIB_REND_H



/* AGC structure */

typedef struct ivas_agc_dec_chan_state_t
@@ -857,7 +857,7 @@ typedef struct ivas_td_decorr_state_t 


} ivas_td_decorr_state_t;



#endif

#endif /* !defined FIX_197_CREND_INTERFACE || defined FIX_197_CREND_INTERFACE_LIB_REND_H */



/* PCA structure */

typedef struct
@@ -990,7 +990,7 @@ typedef struct mct_dec_data_structure 


} MCT_DEC_DATA, *MCT_DEC_HANDLE;



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#if !defined FIX_197_CREND_INTERFACE || defined FIX_197_CREND_INTERFACE_LIB_REND_H



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

 * EFAP structures
@@ -1179,7 +1179,7 @@ typedef struct ivas_masa_decoder_struct 


} MASA_DECODER, *MASA_DECODER_HANDLE;



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#if !defined  FIX_197_CREND_INTERFACE || defined FIX_197_CREND_INTERFACE_LIB_REND_H



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

 * Binaural Rendering structure
@@ -1302,7 +1302,7 @@ typedef struct ivas_hrtfs_fastconv_struct 
    float fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX];

} HRTFS_FASTCONV, *HRTFS_FASTCONV_HANDLE;



#endif

#endif /* HRTF_BINARY_FILE */



#ifdef HRTF_BINARY_FILE

typedef struct ivas_hrtfs_parambin_struct
@@ -1315,7 +1315,7 @@ typedef struct ivas_hrtfs_parambin_struct 
    float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX];

} HRTFS_PARAMBIN, *HRTFS_PARAMBIN_HANDLE;



#endif

#endif /* HRTF_BINARY_FILE */



typedef struct ivas_binaural_rendering_struct

{
@@ -1815,10 +1815,11 @@ typedef struct ivas_hrtfs_file_header_t 


} ivas_hrtfs_file_header_t;



#endif

#endif /* HRTF_BINARY_FILE */



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#ifdef FIX_197_CREND_INTERFACE



/* Main Crend wrapper structure */

typedef struct ivas_binaural_crend_wrapper_struct

{
@@ -1826,8 +1827,9 @@ typedef struct ivas_binaural_crend_wrapper_struct 
    CREND_HANDLE hCrend;

    HRTFS_HANDLE hHrtfCrend;

} CREND_WRAPPER, *CREND_WRAPPER_HANDLE;

#endif

#endif



#endif /* FIX_197_CREND_INTERFACE */

#endif /* FIX_197_CREND_INTERFACE_LIB_REND_H */



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

 * LFE decoder structure
@@ -1898,7 +1900,8 @@ typedef struct decoder_config_structure 


} DECODER_CONFIG, *DECODER_CONFIG_HANDLE;



#endif

#endif /* !defined  FIX_197_CREND_INTERFACE || defined FIX_197_CREND_INTERFACE_LIB_REND_H */



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

 *

 * Main IVAS decoder structure

lib_rend/lib_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#define RENDERER_MAX_SBA_INPUTS  1

#define RENDERER_MAX_MASA_INPUTS 1



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#if !defined FIX_197_CREND_INTERFACE || defined FIX_197_CREND_INTERFACE_LIB_REND_H



#define RENDERER_HEAD_POSITIONS_PER_FRAME 4