Changeset 8b884ef

Timestamp:

Apr 9, 2013, 7:49:36 PM (12 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:

483b883

Parents:

dee4164

Message:

src/onset/: rename get_last_onset to get_last

Files:

• python/demos/demo_onset.py (modified) (1 diff)
• python/demos/demo_onset_plot.py (modified) (1 diff)
• src/onset/onset.c (modified) (2 diffs)
• src/onset/onset.h (modified) (3 diffs)

python/demos/demo_onset.py

@@ -29 +29 @@
     samples, read = s()
     if o(samples):
-        print "%f" % o.get_last_onset_s()
-        onsets.append(o.get_last_onset())
+        print "%f" % o.get_last_s()
+        onsets.append(o.get_last())
     total_frames += read
     if read < hop_s: break

python/demos/demo_onset_plot.py

@@ -34 +34 @@
 while True:
     samples, read = s()
-    is_onset = o(samples)
-    if is_onset:
-        this_onset = o.get_last_onset()
-        print "%f" % (this_onset / float(samplerate))
-        onsets.append(this_onset)
+    if o(samples):
+        print "%f" % (o.get_last_s())
+        onsets.append(o.get_last())
     # keep some data to plot it later
     new_maxes = (abs(samples.reshape(hop_s/downsample, downsample))).max(axis=0)

src/onset/onset.c

@@ -59 +59 @@
       isonset  = 0;
     } else {
-      uint_t new_onset = o->total_frames + isonset * o->hop_size;
+      uint_t new_onset = o->total_frames + (uint_t)ROUND(isonset * o->hop_size);
       if (o->last_onset + o->minioi < new_onset) {
         //AUBIO_DBG ("accepted detection, marking as onset\n");
@@ -81 +81 @@
 }
 
-smpl_t aubio_onset_get_last_onset (aubio_onset_t *o)
+uint_t aubio_onset_get_last (aubio_onset_t *o)
 {
   return o->last_onset - o->delay;
 }
 
-smpl_t aubio_onset_get_last_onset_s (aubio_onset_t *o)
+smpl_t aubio_onset_get_last_s (aubio_onset_t *o)
 {
-  return aubio_onset_get_last_onset (o) / (smpl_t) (o->samplerate);
+  return aubio_onset_get_last (o) / (smpl_t) (o->samplerate);
 }
 
-smpl_t aubio_onset_get_last_onset_ms (aubio_onset_t *o)
+smpl_t aubio_onset_get_last_ms (aubio_onset_t *o)
 {
-  return aubio_onset_get_last_onset_s (o) / 1000.;
+  return aubio_onset_get_last_s (o) / 1000.;
 }
 

src/onset/onset.h

@@ -92 +92 @@
 
 */
-smpl_t aubio_onset_get_last_onset (aubio_onset_t *o);
+uint_t aubio_onset_get_last (aubio_onset_t *o);
 
 /** get the time of the latest onset detected, in seconds
@@ -99 +99 @@
 
 */
-smpl_t aubio_onset_get_last_onset_s (aubio_onset_t *o);
+smpl_t aubio_onset_get_last_s (aubio_onset_t *o);
 
 /** get the time of the latest onset detected, in milliseconds
@@ -106 +106 @@
 
 */
-smpl_t aubio_onset_get_last_onset_ms (aubio_onset_t *o);
+smpl_t aubio_onset_get_last_ms (aubio_onset_t *o);
 
 /** set onset detection silence threshold