Changeset a0fd4e4

Timestamp:

Apr 2, 2005, 3:29:23 PM (19 years ago)

Author:

Paul Brossier <piem@altern.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:

cf7c76a

Parents:

e50b695

Message:

merge aubionotes and aubionotesmedian

add make_audio_plot to gnuplot.py
adds autocorrelation to mathutils
adds Makefile.in to junk files

Files:

• examples/Makefile.am (modified) (2 diffs)
• examples/aubionotes.c (modified) (10 diffs)
• examples/aubionotesmedian.c (deleted)
• examples/utils.h (modified) (1 diff)
• python/aubio/gnuplot.py (modified) (3 diffs)
• src/mathutils.c (modified) (1 diff)
• src/mathutils.h (modified) (1 diff)

examples/Makefile.am

@@ -9 +9 @@
 bin_PROGRAMS = \
         aubioonset \
-        aubionotesmedian \
         aubionotes
         
@@ -17 +16 @@
 aubioonset_SOURCES = aubioonset.c utils.c
 aubionotes_SOURCES = aubionotes.c utils.c
-aubionotesmedian_SOURCES = aubionotesmedian.c utils.c

examples/aubionotes.c

@@ -22 +22 @@
 #include <getopt.h>
 #include <unistd.h>
-#include <math.h> // how do i do a floorf with a mask again ?
+#include <math.h>
 #include "aubio.h"
 #include "aubioext.h"
@@ -35 +35 @@
 int usedoubled = 1;
 int usemidi = 1;
+int median = 0;
 
 /* energy,specdiff,hfc,complexdomain,phase */
 aubio_onsetdetection_type type_onset  = hfc;
-aubio_onsetdetection_type type_onset2 = hfc;
+aubio_onsetdetection_type type_onset2 = complexdomain;
 smpl_t threshold                      = 0.3;
 smpl_t threshold2                     = -90.;
@@ -61 +62 @@
 
 /* pitch objects */
-int curnote                = 0;
 smpl_t pitch               = 0.;
 aubio_pitchdetection_t * pitchdet;
-int bufpos = 0;
-smpl_t curlevel = 0;
+
+fvec_t * note_buffer = NULL;
+fvec_t * note_buffer2 = NULL;
+uint_t medianfiltlen = 6;
+smpl_t curlevel = 0.;
 smpl_t maxonset = 0.;
 
@@ -101 +104 @@
 }
 
+
+/** append new note candidate to the note_buffer and return filtered value. we
+ * need to copy the input array as vec_median destroy its input data.*/
+
+void note_append(fvec_t * note_buffer, smpl_t curnote); 
+void note_append(fvec_t * note_buffer, smpl_t curnote) {
+  uint_t i = 0;
+  for (i = 0; i < note_buffer->length - 1; i++) { 
+      note_buffer->data[0][i] = note_buffer->data[0][i+1];
+  }
+  note_buffer->data[0][note_buffer->length - 1] = curnote;
+  return;
+}
+
+uint_t get_note(fvec_t *note_buffer, fvec_t *note_buffer2);
+uint_t get_note(fvec_t *note_buffer, fvec_t *note_buffer2){
+  uint_t i = 0;
+  for (i = 0; i < note_buffer->length; i++) { 
+      note_buffer2->data[0][i] = note_buffer->data[0][i];
+  }
+  return vec_median(note_buffer2);
+}
+
+
+smpl_t curnote = 0.;
+smpl_t newnote = 0.;
+uint_t isready = 0;
+
 int aubio_process(float **input, float **output, int nframes);
 int aubio_process(float **input, float **output, int nframes) {
@@ -126 +157 @@
       
       pitch = aubio_pitchdetection(pitchdet,ibuf);
+      if(median){
+      newnote = (FLOOR)(bintomidi(pitch,samplerate,buffer_size*4)+.5);
+      note_append(note_buffer, newnote);
+      }
 
       /* curlevel is negatif or 1 if silence */
@@ -133 +168 @@
         if (curlevel == 1.) {
           isonset=0;
+          if (median) isready = 0;
           /* send note off */
           send_noteon(mdriver,curnote,0);
         } else {
+          if (median) {
+                  isready = 1;
+          } else {
           /* kill old note */
           send_noteon(mdriver,curnote,0);
@@ -147 +186 @@
             send_noteon(mdriver,curnote,127+(int)FLOOR(curlevel));
           }
+          }
+          
           for (pos = 0; pos < overlap_size; pos++){
             obuf->data[0][pos] = woodblock->data[0][pos];
@@ -152 +193 @@
         }
       } else {
+              if (median) {
+//        if (curlevel != 1) {
+//          if (bufpos == note_buffer->length)
+//            curnote = aubio_getnote(note_buffer);
+//        }
+//
+        if (isready > 0)
+            isready++;
+        if (isready == note_buffer->length)
+        {
+            //outmsg("%d, %f\n", isready, curnote);
+            send_noteon(mdriver,curnote,0);
+        /* kill old note */
+            newnote = get_note(note_buffer, note_buffer2);
+            curnote = newnote;
+        /* get and send new one */
+        /*if (curnote<45){
+          send_noteon(mdriver,curnote,0);
+        } else {*/
+            if (curnote>45){
+                send_noteon(mdriver,curnote,127+(int)FLOOR(curlevel));
+            }
+        }
+        } // if median
         for (pos = 0; pos < overlap_size; pos++)
           obuf->data[0][pos] = 0.;
@@ -188 +253 @@
   fftgrain    = new_cvec(buffer_size, channels);
 
-  pitchdet = new_aubio_pitchdetection(buffer_size*4, overlap_size, channels, samplerate, mcomb, freq);
-  //pitchdet = new_aubio_pitchdetection(buffer_size*2, overlap_size, channels, samplerate, yin, freq);
+  aubio_pitchdetection_type mode = yin; // mcomb
+  pitchdet = new_aubio_pitchdetection(buffer_size*4, overlap_size, channels, samplerate, mode, freq);
   
+if (median) {
+  note_buffer = new_fvec(medianfiltlen, 1);
+  note_buffer2= new_fvec(medianfiltlen, 1);
+}
   /* read the output sound once */
   file_read(onsetfile, overlap_size, woodblock);
@@ -262 +331 @@
   del_aubio_pitchdetection(pitchdet);
   del_fvec(onset);
+  if (median) {
+  del_fvec(note_buffer);
+  del_fvec(note_buffer2);
+  }
 
   debug("End of program.\n");

examples/utils.h

@@ -25 +25 @@
 extern int usejack;
 extern int usedoubled;
+extern int median;
 extern const char * output_filename;
 extern const char * input_filename;

python/aubio/gnuplot.py

@@ -109 +109 @@
                         data.append(myvec.get(curpos,i))
                         curpos+=1
-        # FIXME again for the last frame
-        curpos = 0
-        while (curpos < readsize):
-                data.append(myvec.get(curpos,i))
-                curpos+=1
         time = arange(len(data))*framestep
         return time,data
 
-def plot_audio(filenames, fileout=None, start=0, end=None, noaxis=None, task=audio_to_array):
+def plot_audio(filenames, fileout=None, start=0, end=None, noaxis=None):
         g = Gnuplot.Gnuplot(debug=1, persist=1)
         d = []
@@ -125 +120 @@
         g.gnuplot('set multiplot;')
         while (len(filenames)):
-                b,a = task(filenames.pop(0))
-                d.append(Gnuplot.Data(b,a))
+                d.append(plot_audio_make(filenames.pop(0)))
                 if not noaxis and todraw==1:
                         g.xlabel('Time (s)')
@@ -141 +135 @@
                 g.hardcopy(fileout, enhanced=1, color=0)
 
+def make_audio_plot(time,data,maxpoints=10000):
+        """ create gnuplot plot from an audio file """
+        import numarray
+        length = len(time)
+        downsample = length/maxpoints
+        if downsample == 0: downsample = 1
+        x = numarray.array(time).resize(length)[0:-1:downsample]
+        y = numarray.array(data).resize(length)[0:-1:downsample]
+        return Gnuplot.Data(x,y,with='lines')

src/mathutils.c

@@ -401 +401 @@
       return loudness;
 }
+
+void aubio_autocorr(fvec_t * input, fvec_t * output){
+        uint_t i = 0, j = 0, length = input->length;
+        smpl_t * data = input->data[0];
+        smpl_t * acf = output->data[0];
+        smpl_t tmp =0.;
+        for(i=0;i<length;i++){
+                for(j=i;j<length;j++){
+                        tmp += data[j-i]*data[j]; 
+                }
+                acf[i] = tmp/(length-i);
+                tmp = 0.0;
+        }
+}
+

src/mathutils.h

@@ -236 +236 @@
 uint_t aubio_silence_detection(fvec_t * ibuf, smpl_t threshold);
 smpl_t aubio_level_detection(fvec_t * ibuf, smpl_t threshold);
+/** 
+ * calculate normalised autocorrelation function
+ */
+void aubio_autocorr(fvec_t * input, fvec_t * output);
 
 #ifdef __cplusplus