Commit 45395356 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_CREND_CHANNELS

parent 1869f2e1

lib_com/ivas_cnst.h

+0 −3
Original line number Diff line number Diff line
@@ -165,9 +165,6 @@ 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) */

#ifndef FIX_CREND_CHANNELS

#define IVAS_MAX_NUM_CH                         16                          /* == MAX_OUTPUT_CHANNELS */

#endif



#define FOA_CHANNELS                            4                           /* number of FOA channels */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
#define FIX_I98_HANDLES_TO_NULL                         /* Issue 98: do the setting of all handles to NULL in one place */

#define FIX_I102_SWB_TBE_SWITCH                         /* Issue 102: avoid IO->SWB switching code for IVAS, generate SHB ACB mem with lerp in case of switch */

#define FIX_DIRAC_CHANNELS                              /* Issue 71: lower number of DirAC analysis channels */

#define FIX_CREND_CHANNELS                              /* Issue 71: fix number of Crend channels */

#define HARMONIZE_SBA_NCHAN_TRANSPORT                   /* harmonize setting of number of transport channels in SBA */

#define DRAM_REDUCTION_MCT_IGF                          /* Issue 121: reduce dynamic RAM consumption in MCT IGF */

#define FIX_I13_TCX_TNS_ISSUE                           /* Issue 13: Fix reported artifacts. Bug in TNS with TCX5 */

lib_dec/ivas_crend.c

+0 −12
Original line number Diff line number Diff line
@@ -68,11 +68,7 @@ static ivas_error ivas_hrtf_init( 
    hHrtf->gain_lfe = 0;

    hHrtf->index_frequency_max_diffuse = 0;



#ifdef FIX_CREND_CHANNELS

    for ( i = 0; i < MAX_INTERN_CHANNELS; i++ )

#else

    for ( i = 0; i < IVAS_MAX_NUM_CH; i++ )

#endif

    {

        hHrtf->inv_diffuse_weight[i] = 0;

        for ( j = 0; j < BINAURAL_CHANNELS; j++ )
@@ -677,11 +673,7 @@ ivas_error ivas_crend_open( 


    hCrend->lfe_delay_line = NULL;



#ifdef FIX_CREND_CHANNELS

    for ( i = 0; i < MAX_INTERN_CHANNELS; i++ )

#else

    for ( i = 0; i < IVAS_MAX_NUM_CH; i++ )

#endif

    {

        hCrend->freq_buffer_re[i] = NULL;

        hCrend->freq_buffer_im[i] = NULL;
@@ -832,11 +824,7 @@ ivas_error ivas_crend_close( 
    {

        if ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD )

        {

#ifdef FIX_CREND_CHANNELS

            for ( i = 0; i < MAX_INTERN_CHANNELS; i++ )

#else

            for ( i = 0; i < IVAS_MAX_NUM_CH; i++ )

#endif

            {

                if ( st_ivas->hCrend->freq_buffer_re[i] != NULL )

                {

lib_dec/ivas_reverb.c

+0 −7
Original line number Diff line number Diff line
@@ -795,17 +795,10 @@ static void set_reverb_acoustic_data( 
{

    int16_t nr_out_ch, hrtf_idx, offset, iter_idx, bin_idx;

    float ln_1e6_inverted, delay_diff, exp_argument;

#ifdef FIX_CREND_CHANNELS

    float *pHrtf_set_l_re[MAX_INTERN_CHANNELS];

    float *pHrtf_set_l_im[MAX_INTERN_CHANNELS];

    float *pHrtf_set_r_re[MAX_INTERN_CHANNELS];

    float *pHrtf_set_r_im[MAX_INTERN_CHANNELS];

#else

    float *pHrtf_set_l_re[IVAS_MAX_NUM_CH];

    float *pHrtf_set_l_im[IVAS_MAX_NUM_CH];

    float *pHrtf_set_r_re[IVAS_MAX_NUM_CH];

    float *pHrtf_set_r_im[IVAS_MAX_NUM_CH];

#endif



    /* use crend hrtf filters */

    if ( hHrtf != NULL )

lib_dec/ivas_stat_dec.h

+0 −22
Original line number Diff line number Diff line
@@ -1682,36 +1682,19 @@ typedef struct ivas_binaural_td_rendering_struct 


typedef struct ivas_hrtfs_structure

{

#ifdef FIX_CREND_CHANNELS

    float *pOut_to_bin_re[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];

    float *pOut_to_bin_im[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];

#else

    float *pOut_to_bin_re[IVAS_MAX_NUM_CH][BINAURAL_CHANNELS];

    float *pOut_to_bin_im[IVAS_MAX_NUM_CH][BINAURAL_CHANNELS];

#endif

    float *pOut_to_bin_diffuse_re[BINAURAL_CHANNELS];

    float *pOut_to_bin_diffuse_im[BINAURAL_CHANNELS];

    float latency_s;

#ifdef FIX_CREND_CHANNELS

    uint16_t num_iterations[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];

#else

    uint16_t num_iterations[IVAS_MAX_NUM_CH][BINAURAL_CHANNELS];

#endif

    uint16_t num_iterations_diffuse[BINAURAL_CHANNELS];

#ifdef FIX_CREND_CHANNELS

    uint16_t *pIndex_frequency_max[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];

#else

    uint16_t *pIndex_frequency_max[IVAS_MAX_NUM_CH][BINAURAL_CHANNELS];

#endif

    uint16_t *pIndex_frequency_max_diffuse[BINAURAL_CHANNELS];

    uint16_t index_frequency_max_diffuse;

    int16_t max_num_ir;

    int16_t max_num_iterations;

#ifdef FIX_CREND_CHANNELS

    float inv_diffuse_weight[MAX_INTERN_CHANNELS]; /* inverse diffuse weights array, access one inverse weight by pInvDiffuseWeight[channel] */

#else

    float inv_diffuse_weight[IVAS_MAX_NUM_CH]; /* inverse diffuse weights array, access one inverse weight by pInvDiffuseWeight[channel] */

#endif

    float gain_lfe;



} HRTFS_DATA, *HRTFS_HANDLE;
@@ -1852,13 +1835,8 @@ typedef struct ivas_orient_trk_state_t 
/* Crend structures */

typedef struct ivas_crend_state_t

{

#ifdef FIX_CREND_CHANNELS

    float *freq_buffer_re[MAX_INTERN_CHANNELS];

    float *freq_buffer_im[MAX_INTERN_CHANNELS];

#else

    float *freq_buffer_re[IVAS_MAX_NUM_CH];

    float *freq_buffer_im[IVAS_MAX_NUM_CH];

#endif

    float *freq_buffer_re_diffuse;

    float *freq_buffer_im_diffuse;

    float *prev_out_buffer[BINAURAL_CHANNELS];