Commit 64d562a0 authored by vaclav's avatar vaclav
Browse files

add notes to highlight cases when public and internal constants are the same

parent 2a2436dc

lib_com/cnst.h

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
#define PCM16_TO_FLT_FAC                32768.0f

#define MDFT_NORM_SCALING               ( 1.0f / PCM16_TO_FLT_FAC )

#define MAX_FRAME_COUNTER               200

#define MAX_BITS_PER_FRAME              10240           /* Bits per frame for max. bitrate 512kbps */

#define MAX_BITS_PER_FRAME              10240           /* Bits per frame for max. bitrate 512kbps, == IVAS_MAX_BITS_PER_FRAME */



#define ENC                             0               /* Index for "encoder" */

#define DEC                             1               /* Index for "decoder" */
@@ -621,8 +621,8 @@ enum 


#define L_HP20_MEM                          4                      /* HP20 filter memory length */



#define CLDFB_NO_CHANNELS_MAX               60                     /* CLDFB resampling - max number of CLDFB channels */

#define CLDFB_NO_COL_MAX                    16                     /* CLDFB resampling - max number of CLDFB col. */

#define CLDFB_NO_CHANNELS_MAX               60                     /* CLDFB resampling - max number of CLDFB channels, == IVAS_CLDFB_NO_CHANNELS_MAX */

#define CLDFB_NO_COL_MAX                    16                     /* CLDFB resampling - max number of CLDFB col., == IVAS_CLDFB_NO_COL_MAX */

#define CLDFB_NO_COL_MAX_SWITCH             6                      /* CLDFB resampling - max number of CLDFB col. for switching */

#define CLDFB_NO_COL_MAX_SWITCH_BFI         10                     /* CLDFB resampling - max number of CLDFB col. for switching, BFI */

#define CLDFB_OVRLP_MIN_SLOTS               3                      /* CLDFB resampling - minimize processing to minimum required for transition frame ACELP->TCX/HQ */

lib_com/common_api_types.h

+3 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#define IVAS_NUM_FRAMES_PER_SEC 50

#define IVAS_MAX_FRAME_SIZE     ( 48000 / IVAS_NUM_FRAMES_PER_SEC )



#define IVAS_MAX_BITS_PER_FRAME     ( 512000 / 50 )

#define IVAS_MAX_BITS_PER_FRAME     ( 512000 / IVAS_NUM_FRAMES_PER_SEC )

#define IVAS_MAX_NUM_OBJECTS        4

#define IVAS_MAX_INPUT_CHANNELS     16

#define IVAS_MAX_OUTPUT_CHANNELS    16
@@ -63,10 +63,8 @@ 


#define IVAS_ROOM_ABS_COEFF 6

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define IVAS_NUM_FRAMES_PER_SEC 50



#define MAX_SPLIT_REND_BITRATE                        768000

#define IVAS_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )

#define IVAS_MAX_SPLIT_REND_BITRATE                   768000

#define IVAS_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) IVAS_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )

#endif



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

lib_com/ivas_cnst.h

+3 −3
Original line number Diff line number Diff line
@@ -143,12 +143,12 @@ typedef enum 
 * IVAS general constants

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



#define MAX_INPUT_CHANNELS                      16                          /* Maximum number of input channels (HOA 3rd order) */

#define MAX_INPUT_CHANNELS                      16                          /* Maximum number of input channels (HOA 3rd order), == IVAS_MAX_INPUT_CHANNELS */

#define MAX_TRANSPORT_CHANNELS                  12                          /* Maximum number of transport channels */

#define MAX_INTERN_CHANNELS                     16                          /* Maximum number of intern channels (HOA 3rd order) */

#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 MAX_OUTPUT_CHANNELS                     16                          /* Maximum number of output channels (HOA 3rd order), == IVAS_MAX_OUTPUT_CHANNELS */

#define MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN     2                           /* Maximum number of output channels with non diegetic panning */



#define BINAURAL_CHANNELS                       2                           /* number of channels for binaural output configuration */
@@ -157,7 +157,7 @@ typedef enum 
#define HOA2_CHANNELS                           9

#define HOA3_CHANNELS                           16



#define MAX_NUM_OBJECTS                         4                           /* max. number of audio objects */

#define MAX_NUM_OBJECTS                         4                           /* max. number of audio objects, == IVAS_MAX_NUM_OBJECTS */



#define MAX_SCE                                 MAX_NUM_OBJECTS             /* max. number of SCEs */

#define MAX_CPE                                 ( MAX_TRANSPORT_CHANNELS / CPE_CHANNELS )    /* max. number of CPEs */