From a7147ee0e3b0b902dfb495931c460957bb8971c7 Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 10 Oct 2022 15:19:57 +0200 Subject: [PATCH] fix build when FIX_DIRAC_CHANNELS and HARMONIZE_SBA_NCHAN_TRANSPORT are deactivated --- lib_com/ivas_cnst.h | 6 ++++-- lib_com/ivas_prot.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 02250e0f7f..3d9cf4e7a1 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -165,11 +165,13 @@ typedef enum #define HEAD_ROTATION_HOA_ORDER 3 /* HOA 3rd order */ #define MAX_CICP_CHANNELS 16 /* max channels for loudspeaker layouts (16 for custom layouts)*/ #define MAX_OUTPUT_CHANNELS 16 /* Maximum number of output channels (HOA 3rd order) */ - -#define FOA_CHANNELS 4 /* number of FOA channels */ +#ifndef FIX_DIRAC_CHANNELS +#define IVAS_MAX_NUM_CH 16 /* == MAX_OUTPUT_CHANNELS */ +#endif #define BINAURAL_CHANNELS 2 /* number of channels for binaural output configuration */ #define CPE_CHANNELS 2 /* number of CPE (stereo) channels */ +#define FOA_CHANNELS 4 /* number of FOA channels */ #define MAX_NUM_OBJECTS 4 /* max. number of audio objects */ #define MAX_SCE MAX_NUM_OBJECTS /* max. number of SCEs */ diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index a7f5987e38..15bee01553 100644 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -3034,7 +3034,7 @@ void ivas_sba_config( int16_t *nCPE, /* o : number of CPEs */ int16_t *element_mode /* o : element mode of the core coder */ #ifndef HARMONIZE_SBA_NCHAN_TRANSPORT - const SBA_MODE sba_mode /* i : SBA mode */ + ,const SBA_MODE sba_mode /* i : SBA mode */ #endif ); -- GitLab