Changeset 483b883

Timestamp:

Apr 9, 2013, 7:54:52 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:

9c9202f

Parents:

8b884ef

Message:

src/tempo/tempo.c: add get_last functions

Location:

src/tempo

Files:

• tempo.c (modified) (3 diffs)
• tempo.h (modified) (1 diff)

src/tempo/tempo.c

@@ -46 +46 @@
   uint_t step;                   /** dfframe hopsize */ 
   uint_t samplerate;             /** sampling rate of the signal */ 
+  uint_t hop_size;               /** get hop_size */
+  uint_t total_frames;           /** total frames since beginning */
+  uint_t last_beat;              /** time of latest detected beat, in samples */
+  uint_t delay;                  /** delay to remove to last beat, in samples */
 };
 
@@ -86 +90 @@
       /* test for silence */
       if (aubio_silence_detection(input, o->silence)==1) {
-        tempo->data[1] = 0; /* unset onset */
+        //tempo->data[0] = 0; /* unset onset */
+      } else {
+        o->last_beat = o->total_frames + (uint_t)ROUND(tempo->data[0] * o->hop_size);
       }
     }
   }
+  o->total_frames += o->hop_size;
+  return;
+}
+
+uint_t aubio_tempo_get_last (aubio_tempo_t *o)
+{
+  return o->last_beat - o->delay;
+}
+
+smpl_t aubio_tempo_get_last_s (aubio_tempo_t *o)
+{
+  return aubio_tempo_get_last (o) / (smpl_t) (o->samplerate);
+}
+
+smpl_t aubio_tempo_get_last_ms (aubio_tempo_t *o)
+{
+  return aubio_tempo_get_last_s (o) / 1000.;
+}
+
+uint_t aubio_tempo_set_delay(aubio_tempo_t * o, uint_t delay) {
+  o->delay = delay;
+  return AUBIO_OK;
+}
+
+uint_t aubio_tempo_get_delay(aubio_tempo_t * o) {
+  return o->delay;
 }
 
@@ -115 +147 @@
   o->silence = -90.;
   o->blockpos = 0;
+  o->total_frames = 0;
+  o->last_beat = 0;
+  o->delay = 0;
+  o->hop_size = hop_size;
   o->dfframe  = new_fvec(o->winlen);
   o->fftgrain = new_cvec(buf_size);

src/tempo/tempo.h

@@ -61 +61 @@
 void aubio_tempo_do (aubio_tempo_t *o, fvec_t * input, fvec_t * tempo);
 
+/** get the time of the latest beat detected, in samples
+
+  \param o tempo detection object as returned by ::new_aubio_tempo
+
+*/
+uint_t aubio_tempo_get_last (aubio_tempo_t *o);
+
+/** get the time of the latest beat detected, in seconds
+
+  \param o tempo detection object as returned by ::new_aubio_tempo
+
+*/
+smpl_t aubio_tempo_get_last_s (aubio_tempo_t *o);
+
+/** get the time of the latest beat detected, in milliseconds
+
+  \param o tempo detection object as returned by ::new_aubio_tempo
+
+*/
+smpl_t aubio_tempo_get_last_ms (aubio_tempo_t *o);
+
 /** set tempo detection silence threshold