From a30cbb586a36c7f3485b46e990ef485fd8a8da58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Tue, 13 Jan 2009 18:00:10 +0000 Subject: hopefully made 64bit able svn path=/trunk/externals/iem/iem_bin_ambi/; revision=10534 --- src/bin_ambi_calc_HRTF.c | 46 +++++++++++++++++++------------------ src/bin_ambi_reduced_decode.c | 47 ++++++++++++++++++++------------------ src/bin_ambi_reduced_decode2.c | 46 +++++++++++++++++++------------------ src/bin_ambi_reduced_decode_fft.c | 46 +++++++++++++++++++------------------ src/bin_ambi_reduced_decode_fft2.c | 44 ++++++++++++++++++----------------- src/bin_ambi_reduced_decode_fir.c | 34 ++++++++++++++------------- src/bin_ambi_reduced_decode_fir2.c | 36 +++++++++++++++-------------- 7 files changed, 157 insertions(+), 142 deletions(-) diff --git a/src/bin_ambi_calc_HRTF.c b/src/bin_ambi_calc_HRTF.c index 4003bbc..ec7a471 100644 --- a/src/bin_ambi_calc_HRTF.c +++ b/src/bin_ambi_calc_HRTF.c @@ -37,10 +37,10 @@ typedef struct _bin_ambi_calc_HRTF int *x_phi; BIN_AMBI_COMPLEX *x_spec; BIN_AMBI_COMPLEX *x_sin_cos; - float *x_beg_fade_out_hrir; - float *x_beg_hrir; - float **x_beg_hrtf_re; - float **x_beg_hrtf_im; + iemarray_t *x_beg_fade_out_hrir; + float *x_beg_hrir; + iemarray_t **x_beg_hrtf_re; + iemarray_t **x_beg_hrtf_im; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrtf_re; @@ -227,9 +227,9 @@ static void bin_ambi_calc_HRTF_check_fade_out(t_bin_ambi_calc_HRTF *x) { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -285,8 +285,9 @@ static void bin_ambi_calc_HRTF_check_arrays(t_bin_ambi_calc_HRTF *x, float finde int fs2=fftsize/2; t_garray *a; int npoints; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; - t_float *vec_hrtf_re, *vec_hrtf_im; + t_float *vec; + iemarray_t *vec_fade_out_hrir; + iemarray_t *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; t_symbol *hrir, *hrtf_re, *hrtf_im; float decr, sum; @@ -327,11 +328,11 @@ static void bin_ambi_calc_HRTF_check_arrays(t_bin_ambi_calc_HRTF *x, float finde vec = x->x_beg_hrir; vec += index * fftsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; jx_sin_cos; BIN_AMBI_COMPLEX *val = x->x_spec; - t_float *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; + t_float *vec_hrir; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; int n_ls = x->x_n_ls; if(index < 0) @@ -424,15 +426,15 @@ static void bin_ambi_calc_HRTF_calc_fft(t_bin_ambi_calc_HRTF *x, float findex) } } - vec_hrtf_re[0] = val[0].real; - vec_hrtf_im[0] = 0.0f; + iemarray_getfloat(vec_hrtf_re,0) = val[0].real; + iemarray_getfloat(vec_hrtf_im,0) = 0.0f; for( i = 1; i < fs2; i++ ) { - vec_hrtf_re[i] = 2.0f*val[i].real; - vec_hrtf_im[i] = 2.0f*val[i].imag; + iemarray_getfloat(vec_hrtf_re,i) = 2.0f*val[i].real; + iemarray_getfloat(vec_hrtf_im,i) = 2.0f*val[i].imag; } - vec_hrtf_re[fs2] = 0.0f; - vec_hrtf_im[fs2] = 0.0f; + iemarray_getfloat(vec_hrtf_re,fs2) = 0.0f; + iemarray_getfloat(vec_hrtf_im,fs2) = 0.0f; } static void bin_ambi_calc_HRTF_free(t_bin_ambi_calc_HRTF *x) @@ -537,10 +539,10 @@ static void *bin_ambi_calc_HRTF_new(t_symbol *s, int argc, t_atom *argv) x->x_spec = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); x->x_sin_cos = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); - x->x_beg_fade_out_hrir = (float *)0; + x->x_beg_fade_out_hrir = 0; x->x_beg_hrir = (float *)getbytes(x->x_fftsize * x->x_n_ls * sizeof(float)); - x->x_beg_hrtf_re = (float **)getbytes(x->x_n_ls * sizeof(float *)); - x->x_beg_hrtf_im = (float **)getbytes(x->x_n_ls * sizeof(float *)); + x->x_beg_hrtf_re = (iemarray_t **)getbytes(x->x_n_ls * sizeof(iemarray_t *)); + x->x_beg_hrtf_im = (iemarray_t **)getbytes(x->x_n_ls * sizeof(iemarray_t *)); x->x_pi_over_180 = 4.0 * atan(1.0) / 180.0; diff --git a/src/bin_ambi_reduced_decode.c b/src/bin_ambi_reduced_decode.c index 949c715..971ed64 100644 --- a/src/bin_ambi_reduced_decode.c +++ b/src/bin_ambi_reduced_decode.c @@ -45,10 +45,10 @@ typedef struct _bin_ambi_reduced_decode int *x_sym_flag; BIN_AMBI_COMPLEX *x_spec; BIN_AMBI_COMPLEX *x_sin_cos; - float *x_beg_fade_out_hrir; - float *x_beg_hrir; - float **x_beg_hrtf_re; - float **x_beg_hrtf_im; + iemarray_t *x_beg_fade_out_hrir; + float *x_beg_hrir; + iemarray_t **x_beg_hrtf_re; + iemarray_t **x_beg_hrtf_im; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrtf_re; @@ -638,9 +638,9 @@ static void bin_ambi_reduced_decode_calc_pinv(t_bin_ambi_reduced_decode *x) { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -698,8 +698,10 @@ static void bin_ambi_reduced_decode_check_arrays(t_bin_ambi_reduced_decode *x, f int fs2=fftsize/2; t_garray *a; int npoints; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; - t_float *vec_hrtf_re, *vec_hrtf_im; + iemarray_t *vec_hrir; + t_float *vec; + iemarray_t *vec_fade_out_hrir; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; t_symbol *hrir, *hrtf_re, *hrtf_im; float decr, sum; @@ -740,11 +742,11 @@ static void bin_ambi_reduced_decode_check_arrays(t_bin_ambi_reduced_decode *x, f vec = x->x_beg_hrir; vec += index * fftsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; jx_sin_cos; BIN_AMBI_COMPLEX *val = x->x_spec; - t_float *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; + t_float *vec_hrir; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; double *dv, *db=x->x_inv_work2; int n_ambi = x->x_n_ambi; int n_ambi2 = 2*n_ambi; @@ -854,15 +857,15 @@ static void bin_ambi_reduced_decode_calc_reduced(t_bin_ambi_reduced_decode *x, f } for(i = 0; ix_spec = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); x->x_sin_cos = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); - x->x_beg_fade_out_hrir = (float *)0; + x->x_beg_fade_out_hrir = 0; x->x_beg_hrir = (float *)getbytes(x->x_fftsize * x->x_n_ambi * sizeof(float)); - x->x_beg_hrtf_re = (float **)getbytes(x->x_n_ambi * sizeof(float *)); - x->x_beg_hrtf_im = (float **)getbytes(x->x_n_ambi * sizeof(float *)); + x->x_beg_hrtf_re = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); + x->x_beg_hrtf_im = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; diff --git a/src/bin_ambi_reduced_decode2.c b/src/bin_ambi_reduced_decode2.c index ea176db..d8bc40a 100644 --- a/src/bin_ambi_reduced_decode2.c +++ b/src/bin_ambi_reduced_decode2.c @@ -50,10 +50,10 @@ typedef struct _bin_ambi_reduced_decode2 int *x_sym_flag; BIN_AMBI_COMPLEX *x_spec; BIN_AMBI_COMPLEX *x_sin_cos; - float *x_beg_fade_out_hrir; + iemarray_t *x_beg_fade_out_hrir; float *x_beg_hrir; - float **x_beg_hrtf_re; - float **x_beg_hrtf_im; + iemarray_t **x_beg_hrtf_re; + iemarray_t **x_beg_hrtf_im; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrtf_re; @@ -664,9 +664,9 @@ static void bin_ambi_reduced_decode2_calc_pinv(t_bin_ambi_reduced_decode2 *x) { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -728,7 +728,8 @@ static void bin_ambi_reduced_decode2_check_HRIR_arrays(t_bin_ambi_reduced_decode t_garray *a; int npoints; t_symbol *hrir; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; + iemarray_t *vec_hrir, *vec_fade_out_hrir; + t_float *vec; float decr, sum; if(index < 0) @@ -750,11 +751,11 @@ static void bin_ambi_reduced_decode2_check_HRIR_arrays(t_bin_ambi_reduced_decode vec = x->x_beg_hrir; vec += index * fftsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; jx_fftsize; - t_float *vec_hrtf_re, *vec_hrtf_im; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; t_symbol *hrtf_re, *hrtf_im; if(index < 0) @@ -818,7 +819,8 @@ static void bin_ambi_reduced_decode2_calc_reduced(t_bin_ambi_reduced_decode2 *x, BIN_AMBI_COMPLEX old1, old2, w; BIN_AMBI_COMPLEX *sincos = x->x_sin_cos; BIN_AMBI_COMPLEX *val = x->x_spec;/*weighted decoder-matrix with n_ls lines and n_ambi columns*/ - t_float *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; + t_float *vec_hrir; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; double *dv, *db=x->x_prod; int n_ambi = x->x_n_ambi; int n_ls = x->x_n_ls; @@ -902,15 +904,15 @@ static void bin_ambi_reduced_decode2_calc_reduced(t_bin_ambi_reduced_decode2 *x, } for(i = 0; ix_spec = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); x->x_sin_cos = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); - x->x_beg_fade_out_hrir = (float *)0; - x->x_beg_hrir = (float *)getbytes(x->x_fftsize * x->x_n_ls * sizeof(float)); - x->x_beg_hrtf_re = (float **)getbytes(x->x_n_ambi * sizeof(float *)); - x->x_beg_hrtf_im = (float **)getbytes(x->x_n_ambi * sizeof(float *)); + x->x_beg_fade_out_hrir = 0; + x->x_beg_hrir = (float *)getbytes(x->x_fftsize * x->x_n_ls * sizeof(float)); + x->x_beg_hrtf_re = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); + x->x_beg_hrtf_im = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; diff --git a/src/bin_ambi_reduced_decode_fft.c b/src/bin_ambi_reduced_decode_fft.c index d99a023..696f5ea 100644 --- a/src/bin_ambi_reduced_decode_fft.c +++ b/src/bin_ambi_reduced_decode_fft.c @@ -54,10 +54,10 @@ typedef struct _bin_ambi_reduced_decode_fft int *x_sym_flag; BIN_AMBI_COMPLEX *x_spec; BIN_AMBI_COMPLEX *x_sin_cos; - float *x_beg_fade_out_hrir; + iemarray_t *x_beg_fade_out_hrir; float *x_beg_hrir; - float **x_beg_hrtf_re; - float **x_beg_hrtf_im; + iemarray_t **x_beg_hrtf_re; + iemarray_t **x_beg_hrtf_im; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrtf_re; @@ -788,9 +788,9 @@ static void bin_ambi_reduced_decode_fft_calc_pinv(t_bin_ambi_reduced_decode_fft { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -853,7 +853,8 @@ static void bin_ambi_reduced_decode_fft_check_HRIR_arrays(t_bin_ambi_reduced_dec t_garray *a; int npoints; t_symbol *hrir; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; + t_float *vec; + iemarray_t *vec_hrir, *vec_fade_out_hrir; float decr, sum; if(index < 0) @@ -875,11 +876,11 @@ static void bin_ambi_reduced_decode_fft_check_HRIR_arrays(t_bin_ambi_reduced_dec vec = x->x_beg_hrir; vec += index * fftsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; jx_fftsize; - t_float *vec_hrtf_re, *vec_hrtf_im; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; t_symbol *hrtf_re, *hrtf_im; if(index < 0) @@ -943,7 +944,8 @@ static void bin_ambi_reduced_decode_fft_calc_reduced(t_bin_ambi_reduced_decode_f BIN_AMBI_COMPLEX old1, old2, w; BIN_AMBI_COMPLEX *sincos = x->x_sin_cos; BIN_AMBI_COMPLEX *val = x->x_spec;/*weighted decoder-matrix with n_ls lines and n_ambi columns*/ - t_float *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; + t_float *vec_hrir; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; double *dv, *db=x->x_prod3; int n_ambi = x->x_n_ambi; int n_ls = x->x_n_ind_ls + x->x_n_mrg_mir_ls; @@ -1027,15 +1029,15 @@ static void bin_ambi_reduced_decode_fft_calc_reduced(t_bin_ambi_reduced_decode_f } for(i = 0; ix_spec = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); x->x_sin_cos = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); - x->x_beg_fade_out_hrir = (float *)0; - x->x_beg_hrir = (float *)getbytes(x->x_fftsize * (x->x_n_ind_ls+x->x_n_mrg_mir_ls) * sizeof(float)); - x->x_beg_hrtf_re = (float **)getbytes(x->x_n_ambi * sizeof(float *)); - x->x_beg_hrtf_im = (float **)getbytes(x->x_n_ambi * sizeof(float *)); + x->x_beg_fade_out_hrir = 0; + x->x_beg_hrir = (float *)getbytes(x->x_fftsize * (x->x_n_ind_ls+x->x_n_mrg_mir_ls) * sizeof(float)); + x->x_beg_hrtf_re = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); + x->x_beg_hrtf_im = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; diff --git a/src/bin_ambi_reduced_decode_fft2.c b/src/bin_ambi_reduced_decode_fft2.c index eb565d5..d629787 100644 --- a/src/bin_ambi_reduced_decode_fft2.c +++ b/src/bin_ambi_reduced_decode_fft2.c @@ -53,10 +53,10 @@ typedef struct _bin_ambi_reduced_decode_fft2 int *x_sym_flag; BIN_AMBI_COMPLEX *x_spec; BIN_AMBI_COMPLEX *x_sin_cos; - t_float *x_beg_fade_out_hrir; + iemarray_t *x_beg_fade_out_hrir; t_float *x_beg_hrir; - t_float **x_beg_hrtf_re; - t_float **x_beg_hrtf_im; + iemarray_t **x_beg_hrtf_re; + iemarray_t **x_beg_hrtf_im; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrtf_re; @@ -645,12 +645,12 @@ static void bin_ambi_reduced_decode_fft2_calc_pinv(t_bin_ambi_reduced_decode_fft { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; int i, n; double *dv3=x->x_prod3; double *dv2=x->x_prod2; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -745,7 +745,8 @@ static void bin_ambi_reduced_decode_fft2_check_HRIR_arrays(t_bin_ambi_reduced_de t_garray *a; int npoints; t_symbol *hrir; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; + t_float*vec; + iemarray_t *vec_hrir, *vec_fade_out_hrir; t_float decr, sum; if(index < 0) @@ -767,11 +768,11 @@ static void bin_ambi_reduced_decode_fft2_check_HRIR_arrays(t_bin_ambi_reduced_de vec = x->x_beg_hrir; vec += index * fftsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; jx_fftsize; - t_float *vec_hrtf_re, *vec_hrtf_im; + iemarray_t *vec_hrtf_re, *vec_hrtf_im; t_symbol *hrtf_re, *hrtf_im; if(index < 0) @@ -835,7 +836,8 @@ static void bin_ambi_reduced_decode_fft2_calc_reduced(t_bin_ambi_reduced_decode_ BIN_AMBI_COMPLEX old1, old2, w; BIN_AMBI_COMPLEX *sincos = x->x_sin_cos; BIN_AMBI_COMPLEX *val = x->x_spec;/*weighted decoder-matrix with n_ls lines and n_ambi columns*/ - t_float *vec_hrir, *vec_hrtf_re, *vec_hrtf_im; + t_float *vec_hrir; + iemarray_t*vec_hrtf_re, *vec_hrtf_im; double *dv, *db=x->x_prod3; int n_ambi = x->x_n_ambi; int n_ls = x->x_n_real_ls; @@ -919,15 +921,15 @@ static void bin_ambi_reduced_decode_fft2_calc_reduced(t_bin_ambi_reduced_decode_ } for(i = 0; ix_spec = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); x->x_sin_cos = (BIN_AMBI_COMPLEX *)getbytes(x->x_fftsize * sizeof(BIN_AMBI_COMPLEX)); - x->x_beg_fade_out_hrir = (t_float *)0; + x->x_beg_fade_out_hrir = 0; x->x_beg_hrir = (t_float *)getbytes(x->x_fftsize * x->x_n_real_ls * sizeof(t_float)); - x->x_beg_hrtf_re = (t_float **)getbytes(x->x_n_ambi * sizeof(t_float *)); - x->x_beg_hrtf_im = (t_float **)getbytes(x->x_n_ambi * sizeof(t_float *)); + x->x_beg_hrtf_re = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); + x->x_beg_hrtf_im = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; diff --git a/src/bin_ambi_reduced_decode_fir.c b/src/bin_ambi_reduced_decode_fir.c index 8c4059f..4f3a19c 100644 --- a/src/bin_ambi_reduced_decode_fir.c +++ b/src/bin_ambi_reduced_decode_fir.c @@ -52,9 +52,9 @@ typedef struct _bin_ambi_reduced_decode_fir int *x_phi; int *x_phi_sym; int *x_sym_flag; - float *x_beg_fade_out_hrir; - float *x_beg_hrir; - float **x_beg_hrir_red; + iemarray_t *x_beg_fade_out_hrir; + float *x_beg_hrir; + iemarray_t **x_beg_hrir_red; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrir_red; @@ -770,7 +770,7 @@ static void bin_ambi_reduced_decode_fir_calc_pinv(t_bin_ambi_reduced_decode_fir int npoints; iemarray_t *fadevec; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -834,7 +834,8 @@ static void bin_ambi_reduced_decode_fir_check_HRIR_LS_arrays(t_bin_ambi_reduced_ int npoints; t_symbol *hrir; iemarray_t *vec_hrir; - t_float *vec, *vec_fade_out_hrir; + t_float *vec; + iemarray_t *vec_fade_out_hrir; float decr, sum; if(index < 0) @@ -856,11 +857,11 @@ static void bin_ambi_reduced_decode_fir_check_HRIR_LS_arrays(t_bin_ambi_reduced_ vec = x->x_beg_hrir; vec += index * firsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; js_name, npoints); else { - x->x_beg_hrir_red[index] = vec_hrir_red; + x->x_beg_hrir_red[index] = vec_hrir_red; } } @@ -913,7 +914,8 @@ static void bin_ambi_reduced_decode_fir_calc_reduced(t_bin_ambi_reduced_decode_f int index=(int)findex - 1; int i, j; int firsize = x->x_firsize; - t_float *vec_hrir, *vec_hrir_red; + t_float *vec_hrir; + iemarray_t*vec_hrir_red; double *dv; int n_ambi = x->x_n_ambi; int n_ls = x->x_n_ind_ls + x->x_n_mrg_mir_ls; @@ -933,7 +935,7 @@ static void bin_ambi_reduced_decode_fir_calc_reduced(t_bin_ambi_reduced_decode_f vec_hrir = x->x_beg_hrir; for(i=0; ix_phi_sym = (int *)getbytes((x->x_n_ind_ls+x->x_n_mrg_mir_ls) * sizeof(int)); x->x_sym_flag = (int *)getbytes((x->x_n_ind_ls+x->x_n_mrg_mir_ls) * sizeof(int)); - x->x_beg_fade_out_hrir = (float *)0; + x->x_beg_fade_out_hrir = 0; x->x_beg_hrir = (float *)getbytes(x->x_firsize * (x->x_n_ind_ls+x->x_n_mrg_mir_ls) * sizeof(float)); - x->x_beg_hrir_red = (float **)getbytes(x->x_n_ambi * sizeof(float *)); - + x->x_beg_hrir_red = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); + x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; x->x_sqrt6_4 = sqrt(6.0) / 4.0; diff --git a/src/bin_ambi_reduced_decode_fir2.c b/src/bin_ambi_reduced_decode_fir2.c index 90b476d..8ee3de5 100644 --- a/src/bin_ambi_reduced_decode_fir2.c +++ b/src/bin_ambi_reduced_decode_fir2.c @@ -51,9 +51,9 @@ typedef struct _bin_ambi_reduced_decode_fir2 int *x_phi; int *x_phi_sym; int *x_sym_flag; - t_float *x_beg_fade_out_hrir; - t_float *x_beg_hrir; - t_float **x_beg_hrir_red; + iemarray_t *x_beg_fade_out_hrir; + t_float *x_beg_hrir; + iemarray_t **x_beg_hrir_red; t_symbol **x_hrir_filename; t_symbol **x_s_hrir; t_symbol **x_s_hrir_red; @@ -624,12 +624,12 @@ static void bin_ambi_reduced_decode_fir2_calc_pinv(t_bin_ambi_reduced_decode_fir { t_garray *a; int npoints; - t_float *fadevec; + iemarray_t *fadevec; int i, n; double *dv3=x->x_prod3; double *dv2=x->x_prod2; - if((int)(x->x_beg_fade_out_hrir) == 0) + if(x->x_beg_fade_out_hrir == 0) { if (!(a = (t_garray *)pd_findbyclass(x->x_s_fade_out_hrir, garray_class))) error("%s: no such array", x->x_s_fade_out_hrir->s_name); @@ -723,7 +723,8 @@ static void bin_ambi_reduced_decode_fir2_check_HRIR_arrays(t_bin_ambi_reduced_de t_garray *a; int npoints; t_symbol *hrir; - t_float *vec_hrir, *vec, *vec_fade_out_hrir; + t_float *vec; + iemarray_t *vec_hrir, *vec_fade_out_hrir; t_float decr, sum; if(index < 0) @@ -745,11 +746,11 @@ static void bin_ambi_reduced_decode_fir2_check_HRIR_arrays(t_bin_ambi_reduced_de vec = x->x_beg_hrir; vec += index * firsize; - if((int)(x->x_beg_fade_out_hrir)) + if(x->x_beg_fade_out_hrir) { vec_fade_out_hrir = x->x_beg_fade_out_hrir; for(j=0; jx_firsize; - t_float *vec_hrir_red; + iemarray_t *vec_hrir_red; t_symbol *hrir_red; if(index < 0) @@ -802,7 +803,8 @@ static void bin_ambi_reduced_decode_fir2_calc_reduced(t_bin_ambi_reduced_decode_ int index=(int)findex - 1; int i, j; int firsize = x->x_firsize; - t_float *vec_hrir, *vec_hrir_red; + t_float *vec_hrir; + iemarray_t*vec_hrir_red; double *dv; int n_ambi = x->x_n_ambi; int n_ls = x->x_n_real_ls; @@ -822,7 +824,7 @@ static void bin_ambi_reduced_decode_fir2_calc_reduced(t_bin_ambi_reduced_decode_ vec_hrir = x->x_beg_hrir; for(i=0; ix_phi_sym = (int *)getbytes(x->x_n_real_ls * sizeof(int)); x->x_sym_flag = (int *)getbytes(x->x_n_real_ls * sizeof(int)); - x->x_beg_fade_out_hrir = (t_float *)0; - x->x_beg_hrir = (t_float *)getbytes(x->x_firsize * x->x_n_real_ls * sizeof(t_float)); - x->x_beg_hrir_red = (t_float **)getbytes(x->x_n_ambi * sizeof(t_float *)); + x->x_beg_fade_out_hrir = 0; + x->x_beg_hrir = (t_float *)getbytes(x->x_firsize * x->x_n_real_ls * sizeof(t_float)); + x->x_beg_hrir_red = (iemarray_t **)getbytes(x->x_n_ambi * sizeof(iemarray_t *)); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; -- cgit v1.2.1