Changeset b31f262

Timestamp:

Jun 14, 2005, 1:07:08 AM (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:

1397c6e

Parents:

0ce9acc3

Message:

add Kullback Liebler onset detection function and its modified version

Files:

• python/aubio/aubioclass.py (modified) (1 diff)
• python/aubio/gnuplot.py (modified) (1 diff)
• src/onsetdetection.c (modified) (5 diffs)
• src/onsetdetection.h (modified) (2 diffs)

python/aubio/aubioclass.py

@@ -77 +77 @@
         self.myfft    = cvec(bufsize,channels)
         self.pv       = pvoc(bufsize,hopsize,channels)
-        if mode in [complexdomain,hfc,phase,energy,specdiff]  :
-                self.myod     = onsetdetection(mode,bufsize,channels)
-                self.myonset  = fvec(1,channels)
-        else: 
+        if mode in ['dual'] :
                 self.myod     = onsetdetection(hfc,bufsize,channels)
                 self.myod2    = onsetdetection(complexdomain,bufsize,channels)
                 self.myonset  = fvec(1,channels)
                 self.myonset2 = fvec(1,channels)
+        else: 
+                self.myod     = onsetdetection(mode,bufsize,channels)
+                self.myonset  = fvec(1,channels)
         self.mode     = mode
         self.pp       = peakpick(float(threshold))

python/aubio/gnuplot.py

@@ -151 +151 @@
         from aubio.onsetcompare import onset_roc
 
+        if len(onsets) == 0: onsets = [0.];
+
         # onset detection function 
         downtime = (hopsize/samplerate)*numarray.arange(len(ofunc))

src/onsetdetection.c

@@ -68 +68 @@
 
 /* Complex Domain Method onset detection function */
-/* moved to /2 032402 */
 void aubio_onsetdetection_complex (aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset) {
         uint_t i, j;
@@ -128 +127 @@
 
 /* Spectral difference method onset detection function */
-/* moved to /2 032402 */
 void aubio_onsetdetection_specdiff(aubio_onsetdetection_t *o,
                 cvec_t * fftgrain, fvec_t * onset){
@@ -157 +155 @@
 }
 
+/* Kullback Liebler onset detection function
+ * note we use ln(1+Xn/(Xn-1+0.0001)) to avoid 
+ * negative (1.+) and infinite values (+1.e-10) */
+void aubio_onsetdetection_kl(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset){
+        uint_t i,j;
+        for (i=0;i<fftgrain->channels;i++) {
+                onset->data[i][0] = 0.;
+                for (j=0;j<fftgrain->length;j++) {
+                        onset->data[i][0] += fftgrain->norm[i][j]
+                                *LOG(1.+fftgrain->norm[i][j]/(o->oldmag->data[i][j]+1.e-10));
+                        o->oldmag->data[i][j] = fftgrain->norm[i][j];
+                }
+                if (isnan(onset->data[i][0])) onset->data[i][0] = 0.;
+        }
+}
+
+/* Modified Kullback Liebler onset detection function
+ * note we use ln(1+Xn/(Xn-1+0.0001)) to avoid 
+ * negative (1.+) and infinite values (+1.e-10) */
+void aubio_onsetdetection_mkl(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset){
+        uint_t i,j;
+        for (i=0;i<fftgrain->channels;i++) {
+                onset->data[i][0] = 0.;
+                for (j=0;j<fftgrain->length;j++) {
+                        onset->data[i][0] += LOG(1.+fftgrain->norm[i][j]/(o->oldmag->data[i][j]+1.e-10));
+                        o->oldmag->data[i][j] = fftgrain->norm[i][j];
+                }
+                if (isnan(onset->data[i][0])) onset->data[i][0] = 0.;
+        }
+}
+
 /* Generic function pointing to the choosen one */
 void 
@@ -205 +234 @@
                         o->threshold = 0.1;
                         break;
+                case kl:
+                        o->oldmag = new_fvec(rsize,channels);
+                        break;
+                case mkl:
+                        o->oldmag = new_fvec(rsize,channels);
+                        break;
                 default:
                         break;
@@ -228 +263 @@
                 case specdiff:
                         o->funcpointer = aubio_onsetdetection_specdiff;
+                        break;
+                case kl:
+                        o->funcpointer = aubio_onsetdetection_kl;
+                        break;
+                case mkl:
+                        o->funcpointer = aubio_onsetdetection_mkl;
                         break;
                 default:

src/onsetdetection.h

@@ -54 +54 @@
         hfc,            /**< high frequency content */
         complexdomain,  /**< complex domain */        
-        phase           /**< phase fast */            
+        phase,          /**< phase fast */            
+        kl,             /**< Kullback Liebler (Hainsworth et al.,  Onset detection in musical audio signals) */
+        mkl             /**< modified Kullback Liebler (Hainsworth et al.,  Onset detection in musical audio signals) */
 } aubio_onsetdetection_type;
 
@@ -99 +101 @@
  */
 void aubio_onsetdetection_specdiff(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
+/** Kullback-Liebler onset detection function */
+void aubio_onsetdetection_kl(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
+/** Modified Kullback-Liebler onset detection function */
+void aubio_onsetdetection_mkl(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
 /** Generic function pointing to the choosen one */
 void aubio_onsetdetection(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);