From df6c09d4f816253f70d2f1d9fc20c4c257dbfa9c Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 5 Oct 2022 11:15:42 +0200 Subject: [PATCH] Use MAX_INTERN_CHANNELS = 16 instead of MAX_TRANSPORT_CHANNELS = 12 within the FIX_CREND_CHANNELS --- lib_dec/ivas_crend.c | 6 +++--- lib_dec/ivas_reverb.c | 8 ++++---- lib_dec/ivas_stat_dec.h | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib_dec/ivas_crend.c b/lib_dec/ivas_crend.c index f83125fcbb..54321f0ef2 100644 --- a/lib_dec/ivas_crend.c +++ b/lib_dec/ivas_crend.c @@ -69,7 +69,7 @@ static ivas_error ivas_hrtf_init( hHrtf->index_frequency_max_diffuse = 0; #ifdef FIX_CREND_CHANNELS - for ( i = 0; i < MAX_TRANSPORT_CHANNELS; i++ ) + for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) #else for ( i = 0; i < IVAS_MAX_NUM_CH; i++ ) #endif @@ -678,7 +678,7 @@ ivas_error ivas_crend_open( hCrend->lfe_delay_line = NULL; #ifdef FIX_CREND_CHANNELS - for ( i = 0; i < MAX_TRANSPORT_CHANNELS; i++ ) + for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) #else for ( i = 0; i < IVAS_MAX_NUM_CH; i++ ) #endif @@ -833,7 +833,7 @@ ivas_error ivas_crend_close( if ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) { #ifdef FIX_CREND_CHANNELS - for ( i = 0; i < MAX_TRANSPORT_CHANNELS; i++ ) + for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) #else for ( i = 0; i < IVAS_MAX_NUM_CH; i++ ) #endif diff --git a/lib_dec/ivas_reverb.c b/lib_dec/ivas_reverb.c index 854f0685cd..fc70f12a85 100644 --- a/lib_dec/ivas_reverb.c +++ b/lib_dec/ivas_reverb.c @@ -796,10 +796,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_TRANSPORT_CHANNELS]; - float *pHrtf_set_l_im[MAX_TRANSPORT_CHANNELS]; - float *pHrtf_set_r_re[MAX_TRANSPORT_CHANNELS]; - float *pHrtf_set_r_im[MAX_TRANSPORT_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]; diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h index 16af0c47aa..5d26372155 100644 --- a/lib_dec/ivas_stat_dec.h +++ b/lib_dec/ivas_stat_dec.h @@ -1683,8 +1683,8 @@ typedef struct ivas_binaural_td_rendering_struct typedef struct ivas_hrtfs_structure { #ifdef FIX_CREND_CHANNELS - float *pOut_to_bin_re[MAX_TRANSPORT_CHANNELS][BINAURAL_CHANNELS]; - float *pOut_to_bin_im[MAX_TRANSPORT_CHANNELS][BINAURAL_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]; @@ -1693,13 +1693,13 @@ typedef struct ivas_hrtfs_structure float *pOut_to_bin_diffuse_im[BINAURAL_CHANNELS]; float latency_s; #ifdef FIX_CREND_CHANNELS - uint16_t num_iterations[MAX_TRANSPORT_CHANNELS][BINAURAL_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_TRANSPORT_CHANNELS][BINAURAL_CHANNELS]; + uint16_t *pIndex_frequency_max[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; #else uint16_t *pIndex_frequency_max[IVAS_MAX_NUM_CH][BINAURAL_CHANNELS]; #endif @@ -1708,7 +1708,7 @@ typedef struct ivas_hrtfs_structure int16_t max_num_ir; int16_t max_num_iterations; #ifdef FIX_CREND_CHANNELS - float inv_diffuse_weight[MAX_TRANSPORT_CHANNELS]; /* inverse diffuse weights array, access one inverse weight by pInvDiffuseWeight[channel] */ + 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 @@ -1853,8 +1853,8 @@ typedef struct ivas_orient_trk_state_t typedef struct ivas_crend_state_t { #ifdef FIX_CREND_CHANNELS - float *freq_buffer_re[MAX_TRANSPORT_CHANNELS]; - float *freq_buffer_im[MAX_TRANSPORT_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]; -- GitLab