Commit a8ed2426 authored by vaclav's avatar vaclav
Browse files

remove more dependencies

parent 25e5631b

lib_com/common_api_types.h

+62 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ 
#define IVAS_CLDFB_NO_CHANNELS_MAX  ( 60 )

#define IVAS_MAX_INPUT_LFE_CHANNELS 4



#define RENDERER_HEAD_POSITIONS_PER_FRAME 4 // todo  (Marc) -> renanr IVAS_RENDERER_HEAD_POSITIONS_PER_FRAME ?





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

 * Common API structures

 *----------------------------------------------------------------------------------*/
@@ -86,6 +89,8 @@ typedef struct 
typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;

typedef struct ivas_masa_qmetadata_frame_struct *IVAS_MASA_QMETADATA_HANDLE;



typedef float IVAS_REND_LfePanMtx[IVAS_MAX_INPUT_LFE_CHANNELS][IVAS_MAX_OUTPUT_CHANNELS];



typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;

#ifdef HRTF_BINARY_FILE

typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
@@ -157,4 +162,61 @@ typedef struct _IVAS_JBM_TRACE_DATA 
} IVAS_JBM_TRACE_DATA;





typedef enum

{

    IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED = 0,

    IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS,

    IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED,

    IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL,

    IVAS_REND_AUDIO_CONFIG_TYPE_MASA,

    IVAS_REND_AUDIO_CONFIG_TYPE_UNKNOWN,

} IVAS_REND_AudioConfigType;



/* TODO(sgi): Harmonize with AUDIO_CONFIG */

/*

    Note: numerical values carry specific information here.



    MSB                                                                            LSB

    --------------------------------------------------------------------------------

    ... unused (assumed all 0) ... | config type (1 byte) | config variant (1 byte) |

    --------------------------------------------------------------------------------



    Where "config type" is the general type from the following list:

        - unknown

        - channel-based

        - ambisonics

        - object-based

        - binaural

        - MASA



    Config variants are concrete configs of each type.

 */

typedef enum

{

    IVAS_REND_AUDIO_CONFIG_MONO = IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED << 8 | 0,

    IVAS_REND_AUDIO_CONFIG_STEREO = IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED << 8 | 1,

    IVAS_REND_AUDIO_CONFIG_5_1 = IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED << 8 | 2,

    IVAS_REND_AUDIO_CONFIG_7_1 = IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED << 8 | 3,

    IVAS_REND_AUDIO_CONFIG_5_1_2 = IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED << 8 | 4,

    IVAS_REND_AUDIO_CONFIG_5_1_4 = IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED << 8 | 5,

    IVAS_REND_AUDIO_CONFIG_7_1_4 = IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED << 8 | 6,

    IVAS_REND_AUDIO_CONFIG_LS_CUSTOM = IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED << 8 | 255,



    IVAS_REND_AUDIO_CONFIG_FOA = IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS << 8 | 0,

    IVAS_REND_AUDIO_CONFIG_HOA2 = IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS << 8 | 1,

    IVAS_REND_AUDIO_CONFIG_HOA3 = IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS << 8 | 2,



    IVAS_REND_AUDIO_CONFIG_OBJECT = IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED << 8 | 0,



    IVAS_REND_AUDIO_CONFIG_BINAURAL = IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL << 8 | 0,

    IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM = IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL << 8 | 1,



    IVAS_REND_AUDIO_CONFIG_MASA1 = IVAS_REND_AUDIO_CONFIG_TYPE_MASA << 8 | 0,

    IVAS_REND_AUDIO_CONFIG_MASA2 = IVAS_REND_AUDIO_CONFIG_TYPE_MASA << 8 | 1,



    IVAS_REND_AUDIO_CONFIG_UNKNOWN = IVAS_REND_AUDIO_CONFIG_TYPE_UNKNOWN << 8 | 0,

} IVAS_REND_AudioConfig;



typedef uint16_t IVAS_REND_InputId;



#endif /* COMMON_API_TYPES_H */

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <stdint.h>

#include "options.h"

#include "cnst.h"

#include "ivas_error.h"

//#include "ivas_error.h"



/* clang-format off */

lib_dec/ivas_corecoder_dec_reconfig.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "ivas_prot.h"

#include "ivas_rom_com.h"

#include "ivas_stat_enc.h"

#include "lib_dec.h"

//#include "lib_dec.h"

#include "prot.h"

#include <assert.h>

#include <math.h>

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "ivas_prot_rend.h"

#include "ivas_rom_com.h"

#include "ivas_stat_enc.h"

#include "lib_dec.h"

//#include "lib_dec.h"

#include "prot.h"

#include <assert.h>

#include <math.h>

lib_dec/ivas_stat_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
#include <stdint.h>

#include "options.h"

#include "cnst.h"

#include "stat_dec.h"

#include "ivas_cnst.h"

#include "stat_dec.h"

#include "ivas_stat_com.h"

#include "ivas_stat_rend.h"

#ifndef FIX_197_CREND_INTERFACE