Changeset f761f06 for src

Timestamp:

Oct 2, 2018, 2:56:52 PM (6 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

Children:

6bba139

Parents:

c7155e9

Message:

src/notes/notes.c: emit note-off earlier (see #203)

• emit note-off when the level drops by a given threshold after onset
• default drop threshold is set to 10dB

File:

• src/notes/notes.c (modified) (7 diffs)

src/notes/notes.c

@@ -26 +26 @@
 
 #define AUBIO_DEFAULT_NOTES_SILENCE -70.
+#define AUBIO_DEFAULT_NOTES_LEVEL_DROP 10.
 // increase to 10. for .1  cent precision
 //      or to 100. for .01 cent precision
@@ -57 +58 @@
 
   uint_t isready;
+
+  smpl_t last_onset_level;
+  smpl_t level_delta_db;
 };
 
@@ -101 +105 @@
   aubio_notes_set_silence(o, AUBIO_DEFAULT_NOTES_SILENCE);
   aubio_notes_set_minioi_ms (o, AUBIO_DEFAULT_NOTES_MINIOI_MS);
+
+  o->last_onset_level = AUBIO_DEFAULT_NOTES_SILENCE;
+  o->level_delta_db = AUBIO_DEFAULT_NOTES_LEVEL_DROP;
 
   return o;
@@ -185 +192 @@
       //notes->data[0] = o->curnote;
       //notes->data[1] = 0.;
+      //AUBIO_WRN("notes: sending note-off at onset, not enough level\n");
       notes->data[2] = o->curnote;
     } else {
@@ -192 +200 @@
         /* kill old note */
         //send_noteon(o->curnote,0, o->samplerate);
+        //AUBIO_WRN("notes: sending note-off at onset, new onset detected\n");
         notes->data[2] = o->curnote;
         /* get and send new one */
@@ -199 +208 @@
         o->curnote = new_pitch;
       }
+      o->last_onset_level = curlevel;
     }
   } else {
-    if (o->median) {
+    if (curlevel < o->last_onset_level - o->level_delta_db)
+    {
+      // send note off
+      //AUBIO_WRN("notes: sending note-off, release detected\n");
+      notes->data[0] = 0;
+      notes->data[1] = 0;
+      notes->data[2] = o->curnote;
+      // reset last_onset_level to silence_threshold
+      o->last_onset_level = o->silence_threshold;
+      o->curnote = 0;
+    }
+    else if (o->median)
+    {
       if (o->isready > 0)
         o->isready++;
@@ -208 +230 @@
         /* kill old note */
         //send_noteon(curnote,0);
-        notes->data[2] = o->curnote;
+        if (o->curnote != 0)
+        {
+          //AUBIO_WRN("notes: sending note-off, new note detected\n");
+          notes->data[2] = o->curnote;
+        }
         o->newnote = aubio_notes_get_latest_note(o);
         o->curnote = o->newnote;