Commit 16f9905e authored by vaclav's avatar vaclav
Browse files

remove unused MAX_NUM_DATA + formatting + add comment

parent f41ca76f

lib_com/ivas_cnst.h

+2 −2
Original line number Diff line number Diff line
@@ -1293,13 +1293,13 @@ typedef enum 


#define MIN_LFE_NRG                             0.5f

#ifdef ADJUST_MCT_CHANNELS_MAX   

#define MCT_MAX_CHANNELS                        11

#define MCT_MAX_CHANNELS                        11                          /* == 7.1.4 LS channels without the LFE channel */

#define MCT_MAX_BLOCKS                          ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/

#else

#define MCT_MAX_CHANNELS                        12

#define MCT_MAX_BLOCKS                          ( MCT_MAX_CHANNELS / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/

#endif

#define MAX_NUM_DATA                            max( MCT_MAX_CHANNELS, 4 )

#endif



#define NBBITS_MCT_RATIO                        4

#define BITRATE_MCT_RATIO_RANGE                 ( 1 << NBBITS_MCT_RATIO )   /* Range of the coded bitrate distribution ratio */

lib_dec/ivas_mct_core_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ void ivas_mct_core_dec( 
        }

        i++;

    }

#endif



#endif

    bfi = sts[0]->bfi;



    for ( ch = 0; ch < nChannels; ch++ )

lib_enc/ivas_mct_core_enc.c

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ void ivas_mct_core_enc( 
#ifdef ADJUST_MCT_CHANNELS_MAX

            }

#endif



            if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )

            {

                i++;