Commit 0ad6de35 authored by emerit's avatar emerit
Browse files

ready to merge

parent c11c21eb

apps/decoder.c

+4 −2
Original line number Diff line number Diff line
@@ -157,9 +157,11 @@ typedef struct 
{

    hrtfFileReader *hrtfReader;

    char *hrtfFileName;



#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND

    IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD;

#else

    IVAS_DEC_HRTF_HANDLE *hHrtfTD;



#endif

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics;



    IVAS_BIN_RENDERER_TYPE binaural_renderer;

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -702,7 +702,11 @@ int main( 
    IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;

    IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

    IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND

    IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD = NULL;

#else

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

#endif

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

    IsmPositionProvider *positionProvider = NULL;

    LfeRoutingConfig *lfeRoutingConfigs[RENDERER_MAX_MC_INPUTS];

lib_com/common_api_types.h

+4 −0
Original line number Diff line number Diff line
@@ -186,7 +186,11 @@ 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;



#ifdef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND

typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_TD_HANDLE;

#else

typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;

#endif

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;

lib_com/ivas_cnst.h

+2 −2
Original line number Diff line number Diff line
@@ -1518,7 +1518,7 @@ typedef enum 
#define LOW_BIT_RATE_BINAURAL_EQ_OFFSET         14                          /* Offset of bins where the low-bit-rate EQ starts*/



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



#ifndef FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND

typedef enum 

{

    BINAURAL_INPUT_AUDIO_CONFIG_INVALID,
@@ -1529,7 +1529,7 @@ 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 )

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ 
/* ################### Start FIXES switches ########################### */



#define TEMP_FIX_2088_MSAN_INIT_ERROR                   /* Eri: Temporary fix for Issue 2088 - MSAN error. Will come with later port of JBM+Split rendering update */

#define FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND /* OR : Fix issue basop 2201 hrtf_file_reader crend differs between basop ivas-main and ivas-float-update */



/* #################### End FIXES switches ############################ */