Changeset c34336e

Timestamp:

Dec 17, 2013, 5:13:28 PM (11 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:

941c9f9

Parents:

5d10ac1

Message:

src/fvec.h: clean up fvec api

Files:

• examples/aubionotes.c (modified) (2 diffs)
• examples/aubioonset.c (modified) (1 diff)
• examples/aubiopitch.c (modified) (3 diffs)
• examples/aubiotrack.c (modified) (2 diffs)
• examples/jackio.c (modified) (1 diff)
• src/fvec.c (modified) (3 diffs)
• src/fvec.h (modified) (5 diffs)
• tests/src/spectral/test-phasevoc-jack.c (modified) (1 diff)
• tests/src/spectral/test-phasevoc.c (modified) (1 diff)

examples/aubionotes.c

@@ -52 +52 @@
 
   aubio_pitch_do (pitch, ibuf, pitch_obuf);
-  smpl_t new_pitch = fvec_read_sample(pitch_obuf, 0);
+  smpl_t new_pitch = fvec_get_sample(pitch_obuf, 0);
   if(median){
     note_append(note_buffer, new_pitch);
@@ -59 +59 @@
   /* curlevel is negatif or 1 if silence */
   smpl_t curlevel = aubio_level_detection(ibuf, silence_threshold);
-  if (fvec_read_sample(onset, 0)) {
+  if (fvec_get_sample(onset, 0)) {
     /* test for silence */
     if (curlevel == 1.) {

examples/aubioonset.c

@@ -34 +34 @@
   fvec_zeros(obuf);
   aubio_onset_do (o, ibuf, onset);
-  is_onset = fvec_read_sample(onset, 0);
+  is_onset = fvec_get_sample(onset, 0);
   if ( is_onset ) {
     aubio_wavetable_play ( wavetable );

examples/aubiopitch.c

@@ -33 +33 @@
   fvec_zeros(obuf);
   aubio_pitch_do (o, ibuf, pitch);
-  smpl_t freq = fvec_read_sample(pitch, 0);
+  smpl_t freq = fvec_get_sample(pitch, 0);
   aubio_wavetable_set_amp ( wavetable, aubio_level_lin (ibuf) );
   aubio_wavetable_set_freq ( wavetable, freq );
@@ -45 +45 @@
 void
 process_print (void) {
-  smpl_t pitch_found = fvec_read_sample(pitch, 0);
+  smpl_t pitch_found = fvec_get_sample(pitch, 0);
   outmsg("%f %f\n",(blocks)
       *hop_size/(float)samplerate, pitch_found);
@@ -70 +70 @@
   if (pitch_unit != NULL)
     aubio_pitch_set_unit (o, pitch_unit);
+
   pitch = new_fvec (1);
 

examples/aubiotrack.c

@@ -29 +29 @@
 fvec_t * tempo_out;
 smpl_t is_beat = 0;
-smpl_t is_onset = 0;
 uint_t is_silence = 0.;
 
 void process_block(fvec_t * ibuf, fvec_t *obuf) {
   aubio_tempo_do (tempo, ibuf, tempo_out);
-  is_beat = fvec_read_sample (tempo_out, 0);
-  is_onset = fvec_read_sample (tempo_out, 1);
+  is_beat = fvec_get_sample (tempo_out, 0);
   if (silence_threshold != -90.)
     is_silence = aubio_silence_detection(ibuf, silence_threshold);
@@ -54 +52 @@
     outmsg("%f\n", aubio_tempo_get_last_s(tempo) );
   }
-  //if ( is_onset )
-  //  outmsg(" \t \t%f\n",(blocks)*hop_size/(float)samplerate);
 }
 

examples/jackio.c

@@ -253 +253 @@
   for (j=0;j<(unsigned)nframes;j++) {
     /* put synthnew in output */
-    output[0][j] = fvec_read_sample(dev->obuf, dev->pos);
+    output[0][j] = fvec_get_sample(dev->obuf, dev->pos);
     /* write input to datanew */
-    fvec_write_sample(dev->ibuf, input[0][j], dev->pos);
+    fvec_set_sample(dev->ibuf, input[0][j], dev->pos);
     /*time for fft*/
     if (dev->pos == (int)(dev->hop_size) - 1) {

src/fvec.c

@@ -37 +37 @@
 }
 
-void fvec_write_sample(fvec_t *s, smpl_t data, uint_t position) {
+void fvec_set_sample(fvec_t *s, smpl_t data, uint_t position) {
   s->data[position] = data;
 }
 
-smpl_t fvec_read_sample(fvec_t *s, uint_t position) {
+smpl_t fvec_get_sample(fvec_t *s, uint_t position) {
   return s->data[position];
 }
@@ -59 +59 @@
 }
 
-void fvec_set(fvec_t *s, smpl_t val) {
+void fvec_set_all (fvec_t *s, smpl_t val) {
   uint_t j;
   for (j=0; j< s->length; j++) {
@@ -70 +70 @@
   memset(s->data, 0, s->length * sizeof(smpl_t));
 #else
-  fvec_set(s, 0.);
+  fvec_set_all (s, 0.);
 #endif
 }
 
 void fvec_ones(fvec_t *s) {
-  fvec_set(s, 1.);
+  fvec_set_all (s, 1.);
 }
 

src/fvec.h

@@ -76 +76 @@
 */
 fvec_t * new_fvec(uint_t length);
+
 /** fvec_t buffer deletion function
 
@@ -82 +83 @@
 */
 void del_fvec(fvec_t *s);
+
 /** read sample value in a buffer
 
@@ -92 +94 @@
 
 */
-smpl_t fvec_read_sample(fvec_t *s, uint_t position);
+smpl_t fvec_get_sample(fvec_t *s, uint_t position);
+
 /** write sample value in a buffer
 
@@ -104 +107 @@
 
 */
-void  fvec_write_sample(fvec_t *s, smpl_t data, uint_t position);
+void  fvec_set_sample(fvec_t *s, smpl_t data, uint_t position);
 
 /** read data from a buffer
@@ -130 +133 @@
 
 */
-void fvec_set(fvec_t *s, smpl_t val);
+void fvec_set_all (fvec_t *s, smpl_t val);
 
 /** set all elements to zero 

tests/src/spectral/test-phasevoc-jack.c

@@ -75 +75 @@
     for (i=0;i<channels;i++) {
       /* write input to datanew */
-      fvec_write_sample(in[i], input[i][j], pos);
+      fvec_set_sample(in[i], input[i][j], pos);
       /* put synthnew in output */
-      output[i][j] = fvec_read_sample(out[i], pos);
+      output[i][j] = fvec_get_sample(out[i], pos);
     }
     /*time for fft*/

tests/src/spectral/test-phasevoc.c

@@ -15 +15 @@
 
   // fill input with some data
-  fvec_set (in, 1.);
+  fvec_set_all (in, 1.);
   fvec_print (in);