Commit 9777c8a6 authored by vaclav's avatar vaclav
Browse files

Merge branch '71-get-rid-of-define-ivas_max_num_ch' into 'main' 

Get rid of define IVAS_MAX_NUM_CH_rev3

See merge request !182
parents 3d656b64 28433411

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ typedef enum 


#define SPAR_CONFIG_BW                          FB



#define IVAS_SPAR_MAX_CH                        (2*IVAS_MAX_SBA_ORDER + 2) /* FOA + planar HOA */

#define IVAS_SPAR_MAX_CH                        (FOA_CHANNELS + 2 * ( IVAS_MAX_SBA_ORDER - 1 )) /* FOA + planar HOA */



#define IVAS_SPAR_P_LOWERTRI                    ((IVAS_SPAR_MAX_CH - 1) * (IVAS_SPAR_MAX_CH - 2)) >> 1

#define IVAS_SPAR_MAX_C_COEFF                   (IVAS_SPAR_MAX_CH - IVAS_SPAR_MAX_DMX_CHS) * ( IVAS_SPAR_MAX_DMX_CHS - 1)

lib_dec/ivas_dirac_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1814,7 +1814,7 @@ void ivas_dirac_dec( 
#ifdef DEBUG_MODE_DIRAC

    {

#ifdef HARMONIZE_SBA_NCHAN_TRANSPORT

        int16_t n, tmp[1 * L_FRAME48k];

        int16_t n, tmp[IVAS_SPAR_MAX_CH * L_FRAME48k];

#else

        int16_t n, tmp[DIRAC_MAX_TRANS_CHANS * L_FRAME48k];

#endif