aboutsummaryrefslogtreecommitdiff
path: root/src/bin_ambi_reduced_decode_fft.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin_ambi_reduced_decode_fft.c')
-rw-r--r--src/bin_ambi_reduced_decode_fft.c46
1 files changed, 24 insertions, 22 deletions
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; j<fs2; j++)
- vec[j] = vec_hrir[j]*vec_fade_out_hrir[j];
+ vec[j] = iemarray_getfloat(vec_hrir,j)*iemarray_getfloat(vec_fade_out_hrir,j);
}
else
{
@@ -887,13 +888,13 @@ static void bin_ambi_reduced_decode_fft_check_HRIR_arrays(t_bin_ambi_reduced_dec
n = fs2 * 3;
n /= 4;
for(j=0; j<n; j++)
- vec[j] = vec_hrir[j];
+ vec[j] = iemarray_getfloat(vec_hrir,j);
sum = 1.0f;
decr = 4.0f / (float)fs2;
for(j=n, k=0; j<fs2; j++, k++)
{
sum -= decr;
- vec[j] = vec_hrir[j] * sum;
+ vec[j] = iemarray_getfloat(vec_hrir,j) * sum;
}
}
}
@@ -905,7 +906,7 @@ static void bin_ambi_reduced_decode_fft_check_HRTF_arrays(t_bin_ambi_reduced_dec
t_garray *a;
int npoints;
int fftsize = x->x_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; i<fs2; i++)
{
- vec_hrtf_re[i] = val[i].real;
- vec_hrtf_im[i] = val[i].imag;
+ iemarray_getfloat(vec_hrtf_re, i) = val[i].real;
+ iemarray_getfloat(vec_hrtf_im, i) = val[i].imag;
}
- vec_hrtf_re[fs2] = val[fs2].real;
- vec_hrtf_im[fs2] = 0.0f;
+ iemarray_getfloat(vec_hrtf_re, fs2) = val[fs2].real;
+ iemarray_getfloat(vec_hrtf_im, fs2) = 0.0f;
for(i = fs2+1; i < fftsize; i++)
{
- vec_hrtf_re[i] = 0.0f;
- vec_hrtf_im[i] = 0.0f;
+ iemarray_getfloat(vec_hrtf_re, i) = 0.0f;
+ iemarray_getfloat(vec_hrtf_im, i) = 0.0f;
}
}
}
@@ -1430,10 +1432,10 @@ static void *bin_ambi_reduced_decode_fft_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_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;