Changeset 812b376 for src

Timestamp:

Nov 4, 2007, 4:44:54 PM (17 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

3c707f7

Parents:

274839f

Message:

hist.c: move hist cent to a structure

File:

• src/hist.c (modified) (5 diffs)

src/hist.c

@@ -31 +31 @@
         uint_t nelems;
         uint_t channels;
-        smpl_t * cent;
+        fvec_t * cent;
         aubio_scale_t *scaler;
 };
@@ -46 +46 @@
         s->nelems = nelems;
   s->hist = new_fvec(nelems, channels);
-        s->cent = AUBIO_ARRAY(smpl_t, nelems);
+        s->cent = new_fvec(nelems, 1);
         
         /* use scale to map ilow/ihig -> 0/nelems */
         s->scaler = new_aubio_scale(ilow,ihig,0,nelems);
         /* calculate centers now once */
-        s->cent[0] = ilow + 0.5 * step;
+        s->cent->data[0][0] = ilow + 0.5 * step;
         for (i=1; i < s->nelems; i++, accum+=step )
-                s->cent[i] = s->cent[0] + accum;
+                s->cent->data[0][i] = s->cent->data[0][0] + accum;
         
         return s;       
@@ -60 +60 @@
 void del_aubio_hist(aubio_hist_t *s) {
   del_fvec(s->hist);
-        AUBIO_FREE(s->cent);
+        del_fvec(s->cent);
         del_aubio_scale(s->scaler);
         AUBIO_FREE(s);
@@ -121 +121 @@
 
         /* recalculate centers */
-        s->cent[0] = ilow + 0.5f * step;
+        s->cent->data[0][0] = ilow + 0.5f * step;
         for (i=1; i < s->nelems; i++)
-                s->cent[i] = s->cent[0] + i * step;
+                s->cent->data[0][i] = s->cent->data[0][0] + i * step;
 
         /* scale */     
@@ -149 +149 @@
         for (i=0; i < s->channels; i++)
                 for (j=0; j < s->nelems; j++) {
-                        s->hist->data[i][j] *= s->cent[j];
+                        s->hist->data[i][j] *= s->cent->data[0][j];
                 }
 }