Commit 289fa5c9 authored by emerit's avatar emerit
Browse files

build ok

parent a230b10f

lib_com/options.h

+3 −2
Original line number Diff line number Diff line
@@ -166,8 +166,9 @@ 
#define FIX_309_PREMPH_MEM_SCE                          /* FhG: issue 309 - fix overwriting of mem_preemph_enc in ivas preprocessing for SCE and tcxonly modes*/



#define FIX_317                                         /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */

//#define FIX_197_CREND_INTERFACE_LIB_REND_H



#ifdef FIX_197_CREND_INTERFACE

#define FIX_197_CREND_INTERFACE_LIB_REND_H

#endif

/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_dec/ivas_stat_dec.h

+4 −6
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#endif

#endif



#ifndef FIX_197_CREND_INTERFACE

#if !defined( FIX_197_CREND_INTERFACE ) || defined( FIX_197_CREND_INTERFACE_LIB_REND_H )



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

 * Output configuration for renderer (e.g. DirAC, MASA, Binaural Renderer...)
@@ -824,7 +824,7 @@ typedef struct ivas_spar_md_dec_state_t 
    int16_t spar_hoa_md_flag;

} ivas_spar_md_dec_state_t;



#ifndef FIX_197_CREND_INTERFACE

#if !defined( FIX_197_CREND_INTERFACE ) || defined( FIX_197_CREND_INTERFACE_LIB_REND_H )



/* AGC structure */

typedef struct ivas_agc_dec_chan_state_t
@@ -997,7 +997,7 @@ typedef struct mct_dec_data_structure 


} MCT_DEC_DATA, *MCT_DEC_HANDLE;



#ifndef FIX_197_CREND_INTERFACE

#if !defined( FIX_197_CREND_INTERFACE ) || defined( FIX_197_CREND_INTERFACE_LIB_REND_H )



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

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


} MASA_DECODER, *MASA_DECODER_HANDLE;



#ifndef FIX_197_CREND_INTERFACE

#if !defined( FIX_197_CREND_INTERFACE ) || defined( FIX_197_CREND_INTERFACE_LIB_REND_H )



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

 * Binaural Rendering structure
@@ -1903,7 +1903,6 @@ typedef struct decoder_config_structure 


} DECODER_CONFIG, *DECODER_CONFIG_HANDLE;



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

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

 * Loudspeaker Configuration Conversion structure

 *----------------------------------------------------------------------------------*/
@@ -1965,7 +1964,6 @@ typedef enum 
    CHANNEL_TYPE_LFE

} ChannelType;



#endif

#endif

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

 *

lib_rend/ivas_crend.c

+1 −3
Original line number Diff line number Diff line
@@ -41,11 +41,9 @@ 
#include "ivas_rom_binaural_crend_head.h"

#ifdef FIX_197_CREND_INTERFACE

#include "ivas_stat_rend.h"

#include "lib_rend.h"

#else

#endif

#include "lib_rend.h"

#include "ivas_lib_rend_internal.h"

#endif

#ifdef DEBUGGING

#include "debug.h"

#endif

lib_rend/ivas_lib_rend_internal.h

+24 −5
Original line number Diff line number Diff line
@@ -41,7 +41,16 @@ 
#ifndef IVAS_LIB_REND_INTERNALS_H

#define IVAS_LIB_REND_INTERNALS_H



#ifdef FIX_197_CREND_INTERFACE

AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig(

    IVAS_REND_AudioConfig config );



IVAS_REND_AudioConfig getRendAudioConfigFromIvasAudioConfig(

    AUDIO_CONFIG config );

#endif



#ifndef FIX_197_CREND_INTERFACE



typedef struct

{

    int8_t headRotEnabled;
@@ -49,9 +58,6 @@ typedef struct 
    float crossfade[L_FRAME48k / RENDERER_HEAD_POSITIONS_PER_FRAME];

} IVAS_REND_HeadRotData;



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#endif

#endif

typedef struct

{

    int32_t binaural_latency_ns;
@@ -60,8 +66,7 @@ typedef struct 
} TDREND_WRAPPER;



#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H

#ifndef FIX_197_CREND_INTERFACE

#endif



typedef struct

{

    int32_t binaural_latency_ns;
@@ -69,6 +74,8 @@ typedef struct 
    HRTFS_HANDLE hHrtfCrend;

} CREND_WRAPPER;



#endif



IVAS_REND_AudioConfigType getAudioConfigType(

    const IVAS_REND_AudioConfig config );
@@ -76,8 +83,10 @@ ivas_error getAudioConfigNumChannels( 
    const IVAS_REND_AudioConfig config,

    int16_t *numChannels );



#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H

AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig(

    IVAS_REND_AudioConfig config );

#endif



ivas_error ivas_rend_openCrend(

    CREND_WRAPPER *pCrend,
@@ -119,6 +128,16 @@ ivas_error ivas_rend_crendConvolver( 
    const int16_t i_ts );

#endif



#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

typedef struct

{

    int32_t binaural_latency_ns;

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd;

    TDREND_HRFILT_FiltSet_t *hHrtfTD;

} TDREND_WRAPPER;



#endif



ivas_error ivas_rend_TDObjRenderFrame(

    const TDREND_WRAPPER *pTDRend,                   /* i  : TD Renderer wrapper structure     */

    const IVAS_REND_AudioConfig inConfig,            /* i  : Input audio configuration         */

lib_rend/ivas_rom_rend.h

+5 −1
Original line number Diff line number Diff line
@@ -39,10 +39,14 @@ 
#include "debug.h"

#endif

#include "ivas_cnst.h"

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#ifndef FIX_197_CREND_INTERFACE

#include "ivas_stat_dec.h"

#else

#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

#include "ivas_stat_rend.h"

#else

#include "ivas_stat_dec.h"

#endif

#endif



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