Changes in src/spectral/specdesc.c [c23e591:2763582]

File:

• src/spectral/specdesc.c (modified) (7 diffs)

src/spectral/specdesc.c

@@ -31 +31 @@
 void aubio_specdesc_complex(aubio_specdesc_t *o, const cvec_t * fftgrain, fvec_t * onset);
 void aubio_specdesc_phase(aubio_specdesc_t *o, const cvec_t * fftgrain, fvec_t * onset);
-void aubio_specdesc_wphase(aubio_specdesc_t *o, const cvec_t * fftgrain, fvec_t * onset);
 void aubio_specdesc_specdiff(aubio_specdesc_t *o, const cvec_t * fftgrain, fvec_t * onset);
 void aubio_specdesc_kl(aubio_specdesc_t *o, const cvec_t * fftgrain, fvec_t * onset);
@@ -59 +58 @@
         aubio_onset_complex,        /**< complex domain */        
         aubio_onset_phase,          /**< phase fast */            
-        aubio_onset_wphase,         /**< weighted phase */
         aubio_onset_kl,             /**< Kullback Liebler */
         aubio_onset_mkl,            /**< modified Kullback Liebler */
@@ -160 +158 @@
   onset->data[0] = aubio_hist_mean(o->histog);  
   //onset->data[0] = fvec_mean(o->dev1);
-}
-
-/* weighted phase */
-void
-aubio_specdesc_wphase(aubio_specdesc_t *o,
-    const cvec_t *fftgrain, fvec_t *onset) {
-  uint_t i;
-  aubio_specdesc_phase(o, fftgrain, onset);
-  for (i = 0; i < fftgrain->length; i++) {
-    o->dev1->data[i] *= fftgrain->norm[i];
-  }
-  /* apply o->histogram */
-  aubio_hist_dyn_notnull(o->histog,o->dev1);
-  /* weight it */
-  aubio_hist_weight(o->histog);
-  /* its mean is the result */
-  onset->data[0] = aubio_hist_mean(o->histog);
 }
 
@@ -270 +251 @@
   else if (strcmp (onset_mode, "phase") == 0)
       onset_type = aubio_onset_phase;
-  else if (strcmp (onset_mode, "wphase") == 0)
-      onset_type = aubio_onset_wphase;
   else if (strcmp (onset_mode, "mkl") == 0)
       onset_type = aubio_onset_mkl;
@@ -313 +292 @@
       break;
     case aubio_onset_phase:
-    case aubio_onset_wphase:
       o->dev1   = new_fvec(rsize);
       o->theta1 = new_fvec(rsize);
@@ -348 +326 @@
       o->funcpointer = aubio_specdesc_phase;
       break;
-    case aubio_onset_wphase:
-      o->funcpointer = aubio_specdesc_wphase;
-      break;
     case aubio_onset_specdiff:
       o->funcpointer = aubio_specdesc_specdiff;
@@ -404 +379 @@
       break;
     case aubio_onset_phase:
-    case aubio_onset_wphase:
       del_fvec(o->dev1);
       del_fvec(o->theta1);