Commit c9863d31 authored by vaclav's avatar vaclav
Browse files

rename MAX_CICP_CHANNELS -> MAX_LS_CHANNELS

parent 5cac7996

lib_com/ivas_cnst.h

+3 −3
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ typedef enum 
#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), == IVAS_MAX_LS_CHANNELS */

#define MAX_LS_CHANNELS                         16                          /* max channels for loudspeaker layouts (16 for custom layouts), == IVAS_MAX_LS_CHANNELS */

#define MAX_OUTPUT_CHANNELS                     16                          /* Maximum number of output channels (HOA 3rd order or IVAS_MAX_LS_CHANNELS) without separate objects in combined formats */

#define MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN     2                           /* Maximum number of output channels with non diegetic panning */
@@ -1510,7 +1510,7 @@ typedef enum 
 * TD Binaural Object renderer

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



#define MAX_NUM_TDREND_CHANNELS                 MAX_CICP_CHANNELS           /* max. number of channels in TD renderer (objects or loudspeaker channels) */

#define MAX_NUM_TDREND_CHANNELS                 MAX_LS_CHANNELS             /* max. number of channels in TD renderer (objects or loudspeaker channels) */



#define SFX_SPAT_BIN_MAX_NO_OF_OUTPUT_SAMPLES   288                         /* 288 = 6 msec @ 48 kHz.                                           */

#define HRTF_MODEL_N_SECTIONS                   3                           /* No. sections used in approximate evaluation of model             */
@@ -1613,7 +1613,7 @@ typedef enum 


#define IVAS_MAX_FB_MIXER_OUT_CH                IVAS_SPAR_MAX_CH

#define IVAS_MAX_SPAR_FB_MIXER_IN_CH            IVAS_SPAR_MAX_CH

#define IVAS_MAX_FB_MIXER_IN_CH                 MAX_CICP_CHANNELS

#define IVAS_MAX_FB_MIXER_IN_CH                 MAX_LS_CHANNELS



#define MAX_NUM_BANDS_DIFF_NON48K               3

lib_com/ivas_prot.h

+3 −3
Original line number Diff line number Diff line
@@ -5325,9 +5325,9 @@ void ivas_ls_setup_conversion_process_mdct_param_mc( 
void ivas_lssetupconversion_process_param_mc(

    Decoder_Struct *st_ivas,                                    /* i/o: LS setup conversion renderer handle             */

    const int16_t num_timeslots,                                /* i  : number of time slots to process                 */

    float Cldfb_RealBuffer_InOut[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals                                         */

    float Cldfb_ImagBuffer_InOut[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals                                         */

    int16_t channel_active[MAX_CICP_CHANNELS]                                                                /* i  : bitmap indicating which output channels are active */

    float Cldfb_RealBuffer_InOut[MAX_LS_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals                                         */

    float Cldfb_ImagBuffer_InOut[MAX_LS_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals                                         */

    int16_t channel_active[MAX_LS_CHANNELS]                                                                /* i  : bitmap indicating which output channels are active */

);

lib_com/ivas_rom_com.c

+1 −1
Original line number Diff line number Diff line
@@ -1826,7 +1826,7 @@ const int16_t param_mc_coding_band_mapping_10[10] = 
    1, 1, 1, 1, 1, 0, 0, 0, 0, 0

};













const int16_t Param_MC_index[MAX_CICP_CHANNELS] =













const int16_t Param_MC_index[MAX_LS_CHANNELS] =















{















    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11















};

































lib_com/ivas_rom_com.h



+1
−1




























Original line number
Diff line number
Diff line








@@ -219,7 +219,7 @@ extern const int16_t param_mc_start_bin_per_band_14[14];













extern const int16_t param_mc_active_bins_per_band_14[14];















extern const int16_t param_mc_start_bin_per_band_10[10];















extern const int16_t param_mc_active_bins_per_band_10[10];













extern const int16_t Param_MC_index[MAX_CICP_CHANNELS];













extern const int16_t Param_MC_index[MAX_LS_CHANNELS];















extern const PARAM_MC_CONF ivas_param_mc_conf[PARAM_MC_NUM_CONFIGS];















extern const float ivas_param_mc_quant_ild_5d1_48[PARAM_MC_SZ_ILD_QUANTIZER_4BITS];















extern const float ivas_param_mc_quant_icc[PARAM_MC_SZ_ICC_QUANTIZER];

































lib_com/ivas_stat_com.h



+3
−3




























Original line number
Diff line number
Diff line








@@ -561,9 +561,9 @@ typedef struct ivas_param_mc_ild_mapping_struct













{















    int16_t ild_map_size_wo_lfe;















    int16_t ild_map_size_lfe;













    int16_t ild_index[MAX_CICP_CHANNELS];













    int16_t num_ref_channels[MAX_CICP_CHANNELS];













    int16_t ref_channel_idx[MAX_CICP_CHANNELS][PARAM_MC_MAX_ILD_REF_CHANNELS];













    int16_t ild_index[MAX_LS_CHANNELS];













    int16_t num_ref_channels[MAX_LS_CHANNELS];













    int16_t ref_channel_idx[MAX_LS_CHANNELS][PARAM_MC_MAX_ILD_REF_CHANNELS];































} PARAM_MC_ILD_MAPPING, *HANDLE_PARAM_MC_ILD_MAPPING;